malhuda/developer
1
0
Fork 0
mirror of https://github.com/easy-wi/developer.git synced 2025-02-20 11:23:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Log-out loop fix (#1284)

Browse Source 
Social auth integration (#1285)
This commit is contained in:
AEon-Jan 2020-08-02 16:00:35 +02:00
parent df5c6d89d7
commit 94fd8334a8
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
template/New/admin/admin_header.tpl
View File

@ -1,7 +1,5 @@
<!DOCTYPE html>
<html dir="ltr" lang="<?php echo $user_language;?>">
<head>
<html dir="ltr" lang="<?php echo $user_language;?>"><head>
<?php if(isset($header)) echo $header; ?>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -10,6 +8,7 @@
<meta name="author" content="">
<title><?php if(isset($ewCfg['title'])) echo $ewCfg['title']; ?></title>
<link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon']) and !empty($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
<link href="css/admin.css" rel="stylesheet">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
@ -17,7 +16,6 @@
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/04f8aba366.js" crossorigin="anonymous"></script>
<link href="css/ftnaws.min.css" rel="stylesheet" type="text/css">
<link href="css/custom.css" rel="stylesheet" type="text/css">
<!-- jQuery -->
<script src="js/default/jquery.min.js" type="text/javascript"></script>
@ -443,9 +441,10 @@
<button id="sidebarToggleTop" class="btn btn-link d-md-none rounded-circle mr-3">
<i class="fa fa-bars" aria-hidden="false"></i>
</button>
<?php if(isset($easywitweets) && $easywitweets) { ?>
<a href="https://twitter.com/easy_wi?ref_src=twsrc%5Etfw" class="twitter-follow-button" data-show-count="false">Follow @easy_wi</a>
<script async src="https://platform.twitter.com/widgets.js" charset="utf-8"></script>
<?php } ?>
<!-- Topbar Navbar -->
<ul class="navbar-nav ml-auto">

16
template/New/standalone/login.tpl
View File

@ -10,13 +10,13 @@
<meta name="author" content="">
<title>Login Page</title>
<link rel="shortcut icon" type="image/x-icon" href="<?php echo (isset($rSA['favicon']) and !empty($rSA['favicon'])) ? $rSA['favicon'] : 'images/favicon.ico';?>" />
<link href="css/admin.css" rel="stylesheet">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
<script src="https://kit.fontawesome.com/04f8aba366.js" crossorigin="anonymous"></script>
<link href="css/ftnaws.min.css" rel="stylesheet" type="text/css">
<link href="css/custom.css" rel="stylesheet" type="text/css">
<!-- jQuery -->
<script src="js/default/jquery.min.js" type="text/javascript"></script>
@ -67,13 +67,25 @@
</div><hr><?php } ?>
<button type="submit" class="btn btn-primary btn-block btn-flat">Login</button><br>
</form>
<?php if(count($serviceProviders)>0){ ?>
<?php foreach($serviceProviders as $k=>$css){ ?>
<a href="login.php?serviceProvider=<?php echo $k;?>" class="btn btn-secondary btn-block btn-flat btn-social btn-<?php echo $css;?>"><i class="fa fa-<?php echo $css;?>"></i> Sign in using <?php echo $k;?></a>
<?php } ?>
<?php } ?>
<br>
<a href="login.php?w=pr" class="btn btn-secondary btn-block btn-flat ">
<span class="icon text-white-50">
<i class="fas fa-arrow-right"></i>
</span>
<span class="text">password recovery</span>
</a></div>
</a>
</div>
<footer class="sticky-footer bg-white">
<div class="container my-auto">
<div class="copyright text-center my-auto">