*leaving march with a bug

This commit is contained in:
Pachira 2016-03-31 22:07:54 +02:00
parent b6f341d550
commit 7df1ebc6d4
6 changed files with 7 additions and 7 deletions

View file

@ -3,7 +3,7 @@
{% block title %}Login{% endblock %}
{% block content %}
{% if config('require_activation') %}
{% if config('lock_authentication') %}
<h1 class="stylised" style="line-height: 1.8em; text-align: center;">Logging in is disabled for security checkups! Try again later.</h1>
{% else %}
<div class="loginPage">

View file

@ -3,7 +3,7 @@
{% block title %}Reactivate account{% endblock %}
{% block content %}
{% if config('require_activation') %}
{% if config('lock_authentication') %}
<h1 class="stylised" style="line-height: 1.8em; text-align: center;">Reactivation is disabled for security checkups! Try again later.</h1>
{% else %}
<div class="loginPage">

View file

@ -3,7 +3,7 @@
{% block title %}Register{% endblock %}
{% block content %}
{% if config('require_activation') or config('disable_registration') %}
{% if config('lock_authentication') or config('disable_registration') %}
<div class="loginPage">
<div class="registerForm" id="registerWarn" style="display: block;">
<div class="centreAlign">

View file

@ -3,7 +3,7 @@
{% block title %}Reset Password{% endblock %}
{% block content %}
{% if config('require_activation') %}
{% if config('lock_authentication') %}
<h1 class="stylised" style="line-height: 1.8em; text-align: center;">Resetting password is disabled because of security checkups!</h1>
{% else %}
<div class="loginPage">

View file

@ -11,7 +11,7 @@
</div>
</div>
{% else %}
{% if config('require_activation') %}
{% if config('lock_authentication') %}
<div class="head">Whoops!</div>
You caught the site at the wrong moment! Right now registration <i>and</i> logging in is disabled for unspecified reasons. Sorry for the inconvenience but please try again later!
<div class="indexSidePanelLinks">

View file

@ -103,8 +103,8 @@
<a class="menu-item fa-cogs" href="{{ route('settings.index') }}" title="Settings"></a>
<a class="menu-item fa-sign-out" href="{{ route('auth.logout') }}?s={{ session_id() }}" title="Logout" id="headerLogoutLink"></a>
{% else %}
{% if config('require_activation') %}
<div class="menu-item fa-lock" style="padding-left: 10px; padding-right: 10px;" title="Authentication is locked"></div>
{% if config('lock_authentication') %}
<a class="menu-item fa-lock" style="cursor: default;" title="Authentication is locked"></a>
{% else %}
<a class="menu-item fa-magic" href="{{ route('auth.register') }}" title="Register"></a>
<a class="menu-item fa-sign-in" href="{{ route('auth.login') }}" title="Login"></a>