Admin fixes

-login/logout error fix
-debugging code removed
This commit is contained in:
Lee
2020-04-02 18:44:15 +01:00
parent 9e0ad271f6
commit cddd915adf
8 changed files with 16 additions and 25 deletions

View File

@@ -9,18 +9,9 @@
*/
defined('MYAAC') or die('Direct access not allowed!');
$title = 'Login';
$logout = '';
if ($action == 'logout') {
$logout = "You have been logged out!";
}
if (isset($errors)) {
foreach ($errors as $error) {
error($error);
}
}
$twig->display('admin.login.html.twig', array(
'logout' => $logout,
'logout' => ($action == 'logout' ? 'You have been logged out!' : ''),
'account' => USE_ACCOUNT_NAME ? 'Name' : 'Number',
));
'errors' => isset($errors)? $errors : ''
));

View File

@@ -1,10 +1,16 @@
<div class="login-page">
<div class="login-box">
<div class="login-logo"><b>My</b>AAC</div>
{% if errors %}
<div class="alert alert-danger"><strong>Errors:</strong><br/>
{% for error in errors %}
<li>{{ error|raw }}</li>
{% endfor %}
</div>
{% endif %}
{% if logout %}
<div class="toast bg-success fade show">
<div class="toast-header"><strong class="mr-auto">Status</strong></div>
<div class="toast-body">{{ logout }}</div>
<div class="alert alert-success"><strong>Status:</strong><br/>
{{ logout }}
</div>
{% endif %}
@@ -44,4 +50,4 @@
</div>
</div>
</div>
</div>
</div>