simplified login form, show password recovery always, some camp theme tweaks
This commit is contained in:
msquare
parent
3fed76876c
commit
eefae43a47
|
|
@ -170,23 +170,23 @@ THE SOFTWARE.
|
||||||
|
|
||||||
@btn-primary-color: @btn-default-color;
|
@btn-primary-color: @btn-default-color;
|
||||||
@btn-primary-bg: @brand-primary;
|
@btn-primary-bg: @brand-primary;
|
||||||
@btn-primary-border: darken(@btn-default-bg, 10%);
|
@btn-primary-border: darken(@btn-primary-bg, 10%);
|
||||||
|
|
||||||
@btn-success-color: @btn-default-color;
|
@btn-success-color: @btn-default-color;
|
||||||
@btn-success-bg: @brand-success;
|
@btn-success-bg: @brand-success;
|
||||||
@btn-success-border: darken(@btn-default-bg, 10%);
|
@btn-success-border: darken(@btn-success-bg, 10%);
|
||||||
|
|
||||||
@btn-info-color: @btn-default-color;
|
@btn-info-color: @btn-default-color;
|
||||||
@btn-info-bg: @brand-info;
|
@btn-info-bg: @brand-info;
|
||||||
@btn-info-border: darken(@btn-default-bg, 10%);
|
@btn-info-border: darken(@btn-info-bg, 10%);
|
||||||
|
|
||||||
@btn-warning-color: @btn-default-color;
|
@btn-warning-color: @btn-default-color;
|
||||||
@btn-warning-bg: @brand-warning;
|
@btn-warning-bg: @brand-warning;
|
||||||
@btn-warning-border: darken(@btn-default-bg, 10%);
|
@btn-warning-border: darken(@btn-warning-bg, 10%);
|
||||||
|
|
||||||
@btn-danger-color: @btn-default-color;
|
@btn-danger-color: @btn-default-color;
|
||||||
@btn-danger-bg: @brand-danger;
|
@btn-danger-bg: @brand-danger;
|
||||||
@btn-danger-border: darken(@btn-default-bg, 10%);
|
@btn-danger-border: darken(@btn-danger-bg, 10%);
|
||||||
|
|
||||||
@btn-link-disabled-color: @gray-light;
|
@btn-link-disabled-color: @gray-light;
|
||||||
|
|
||||||
|
|
@ -196,9 +196,9 @@ THE SOFTWARE.
|
||||||
//##
|
//##
|
||||||
|
|
||||||
//** `<input>` background color
|
//** `<input>` background color
|
||||||
@input-bg: @gray-darker;
|
@input-bg: #000;
|
||||||
//** `<input disabled>` background color
|
//** `<input disabled>` background color
|
||||||
@input-bg-disabled: @gray-dark;
|
@input-bg-disabled: @gray-darker;
|
||||||
|
|
||||||
//** Text color for `<input>`s
|
//** Text color for `<input>`s
|
||||||
@input-color: @text-color;
|
@input-color: @text-color;
|
||||||
|
|
@ -223,7 +223,7 @@ THE SOFTWARE.
|
||||||
@legend-border-color: @gray-dark;
|
@legend-border-color: @gray-dark;
|
||||||
|
|
||||||
//** Background color for textual input addons
|
//** Background color for textual input addons
|
||||||
@input-group-addon-bg: @gray-lighter;
|
@input-group-addon-bg: @gray-light;
|
||||||
//** Border color for textual input addons
|
//** Border color for textual input addons
|
||||||
@input-group-addon-border-color: @input-border;
|
@input-group-addon-border-color: @input-border;
|
||||||
|
|
||||||
|
|
@ -980,10 +980,6 @@ table,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-group-addon {
|
|
||||||
background-color: @btn-default-bg;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Navs =======================================================================
|
// Navs =======================================================================
|
||||||
|
|
||||||
.nav-tabs,
|
.nav-tabs,
|
||||||
|
|
@ -1074,3 +1070,11 @@ h1 {
|
||||||
.panel-title {
|
.panel-title {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.input-group-addon {
|
||||||
|
color: #000;
|
||||||
|
|
||||||
|
.icon-icon_angel {
|
||||||
|
background-color: #000;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -170,23 +170,23 @@ THE SOFTWARE.
|
||||||
|
|
||||||
@btn-primary-color: @btn-default-color;
|
@btn-primary-color: @btn-default-color;
|
||||||
@btn-primary-bg: @brand-primary;
|
@btn-primary-bg: @brand-primary;
|
||||||
@btn-primary-border: darken(@btn-default-bg, 10%);
|
@btn-primary-border: darken(@btn-primary-bg, 10%);
|
||||||
|
|
||||||
@btn-success-color: @btn-default-color;
|
@btn-success-color: @btn-default-color;
|
||||||
@btn-success-bg: @brand-success;
|
@btn-success-bg: @brand-success;
|
||||||
@btn-success-border: darken(@btn-default-bg, 10%);
|
@btn-success-border: darken(@btn-success-bg, 10%);
|
||||||
|
|
||||||
@btn-info-color: @btn-default-color;
|
@btn-info-color: @btn-default-color;
|
||||||
@btn-info-bg: @brand-info;
|
@btn-info-bg: @brand-info;
|
||||||
@btn-info-border: darken(@btn-default-bg, 10%);
|
@btn-info-border: darken(@btn-info-bg, 10%);
|
||||||
|
|
||||||
@btn-warning-color: @btn-default-color;
|
@btn-warning-color: @btn-default-color;
|
||||||
@btn-warning-bg: @brand-warning;
|
@btn-warning-bg: @brand-warning;
|
||||||
@btn-warning-border: darken(@btn-default-bg, 10%);
|
@btn-warning-border: darken(@btn-warning-bg, 10%);
|
||||||
|
|
||||||
@btn-danger-color: @btn-default-color;
|
@btn-danger-color: @btn-default-color;
|
||||||
@btn-danger-bg: @brand-danger;
|
@btn-danger-bg: @brand-danger;
|
||||||
@btn-danger-border: darken(@btn-default-bg, 10%);
|
@btn-danger-border: darken(@btn-danger-bg, 10%);
|
||||||
|
|
||||||
@btn-link-disabled-color: @gray-light;
|
@btn-link-disabled-color: @gray-light;
|
||||||
|
|
||||||
|
|
@ -196,9 +196,9 @@ THE SOFTWARE.
|
||||||
//##
|
//##
|
||||||
|
|
||||||
//** `<input>` background color
|
//** `<input>` background color
|
||||||
@input-bg: @gray-darker;
|
@input-bg: #000;
|
||||||
//** `<input disabled>` background color
|
//** `<input disabled>` background color
|
||||||
@input-bg-disabled: @gray-dark;
|
@input-bg-disabled: @gray-darker;
|
||||||
|
|
||||||
//** Text color for `<input>`s
|
//** Text color for `<input>`s
|
||||||
@input-color: @text-color;
|
@input-color: @text-color;
|
||||||
|
|
@ -223,7 +223,7 @@ THE SOFTWARE.
|
||||||
@legend-border-color: @gray-dark;
|
@legend-border-color: @gray-dark;
|
||||||
|
|
||||||
//** Background color for textual input addons
|
//** Background color for textual input addons
|
||||||
@input-group-addon-bg: @gray-lighter;
|
@input-group-addon-bg: @gray-light;
|
||||||
//** Border color for textual input addons
|
//** Border color for textual input addons
|
||||||
@input-group-addon-border-color: @input-border;
|
@input-group-addon-border-color: @input-border;
|
||||||
|
|
||||||
|
|
@ -980,10 +980,6 @@ table,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-group-addon {
|
|
||||||
background-color: @btn-default-bg;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Navs =======================================================================
|
// Navs =======================================================================
|
||||||
|
|
||||||
.nav-tabs,
|
.nav-tabs,
|
||||||
|
|
@ -1074,3 +1070,11 @@ h1 {
|
||||||
.panel-title {
|
.panel-title {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.input-group-addon {
|
||||||
|
color: #000;
|
||||||
|
|
||||||
|
.icon-icon_angel {
|
||||||
|
background-color: #000;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -170,23 +170,23 @@ THE SOFTWARE.
|
||||||
|
|
||||||
@btn-primary-color: @btn-default-color;
|
@btn-primary-color: @btn-default-color;
|
||||||
@btn-primary-bg: @brand-primary;
|
@btn-primary-bg: @brand-primary;
|
||||||
@btn-primary-border: darken(@btn-default-bg, 10%);
|
@btn-primary-border: darken(@btn-primary-bg, 10%);
|
||||||
|
|
||||||
@btn-success-color: @btn-default-color;
|
@btn-success-color: @btn-default-color;
|
||||||
@btn-success-bg: @brand-success;
|
@btn-success-bg: @brand-success;
|
||||||
@btn-success-border: darken(@btn-default-bg, 10%);
|
@btn-success-border: darken(@btn-success-bg, 10%);
|
||||||
|
|
||||||
@btn-info-color: @btn-default-color;
|
@btn-info-color: @btn-default-color;
|
||||||
@btn-info-bg: @brand-info;
|
@btn-info-bg: @brand-info;
|
||||||
@btn-info-border: darken(@btn-default-bg, 10%);
|
@btn-info-border: darken(@btn-info-bg, 10%);
|
||||||
|
|
||||||
@btn-warning-color: @btn-default-color;
|
@btn-warning-color: @btn-default-color;
|
||||||
@btn-warning-bg: @brand-warning;
|
@btn-warning-bg: @brand-warning;
|
||||||
@btn-warning-border: darken(@btn-default-bg, 10%);
|
@btn-warning-border: darken(@btn-warning-bg, 10%);
|
||||||
|
|
||||||
@btn-danger-color: @btn-default-color;
|
@btn-danger-color: @btn-default-color;
|
||||||
@btn-danger-bg: @brand-danger;
|
@btn-danger-bg: @brand-danger;
|
||||||
@btn-danger-border: darken(@btn-default-bg, 10%);
|
@btn-danger-border: darken(@btn-danger-bg, 10%);
|
||||||
|
|
||||||
@btn-link-disabled-color: @gray-light;
|
@btn-link-disabled-color: @gray-light;
|
||||||
|
|
||||||
|
|
@ -196,9 +196,9 @@ THE SOFTWARE.
|
||||||
//##
|
//##
|
||||||
|
|
||||||
//** `<input>` background color
|
//** `<input>` background color
|
||||||
@input-bg: @gray-darker;
|
@input-bg: #000;
|
||||||
//** `<input disabled>` background color
|
//** `<input disabled>` background color
|
||||||
@input-bg-disabled: @gray-dark;
|
@input-bg-disabled: @gray-darker;
|
||||||
|
|
||||||
//** Text color for `<input>`s
|
//** Text color for `<input>`s
|
||||||
@input-color: @text-color;
|
@input-color: @text-color;
|
||||||
|
|
@ -223,7 +223,7 @@ THE SOFTWARE.
|
||||||
@legend-border-color: @gray-dark;
|
@legend-border-color: @gray-dark;
|
||||||
|
|
||||||
//** Background color for textual input addons
|
//** Background color for textual input addons
|
||||||
@input-group-addon-bg: @gray-lighter;
|
@input-group-addon-bg: @gray-light;
|
||||||
//** Border color for textual input addons
|
//** Border color for textual input addons
|
||||||
@input-group-addon-border-color: @input-border;
|
@input-group-addon-border-color: @input-border;
|
||||||
|
|
||||||
|
|
@ -980,10 +980,6 @@ table,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.input-group-addon {
|
|
||||||
background-color: @btn-default-bg;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Navs =======================================================================
|
// Navs =======================================================================
|
||||||
|
|
||||||
.nav-tabs,
|
.nav-tabs,
|
||||||
|
|
@ -1074,3 +1070,11 @@ h1 {
|
||||||
.panel-title {
|
.panel-title {
|
||||||
color: #fff;
|
color: #fff;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.input-group-addon {
|
||||||
|
color: #000;
|
||||||
|
|
||||||
|
.icon-icon_angel {
|
||||||
|
background-color: #000;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -31,9 +31,6 @@
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4">
|
<div class="col-sm-6 col-sm-offset-3 col-md-4 col-md-offset-4">
|
||||||
<div class="panel panel-primary first">
|
<div class="panel panel-primary first">
|
||||||
|
|
||||||
<div class="panel-heading">{{ m.angel }} {{ __('Login') }}</div>
|
|
||||||
|
|
||||||
<div class="panel-body">
|
<div class="panel-body">
|
||||||
{% for message in errors|default([]) %}
|
{% for message in errors|default([]) %}
|
||||||
{{ m.alert(__(message), 'danger') }}
|
{{ m.alert(__(message), 'danger') }}
|
||||||
|
|
@ -42,36 +39,34 @@
|
||||||
<form action="" enctype="multipart/form-data" method="post">
|
<form action="" enctype="multipart/form-data" method="post">
|
||||||
{{ csrf() }}
|
{{ csrf() }}
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<input class="form-control" id="form_nick"
|
<div class="input-group">
|
||||||
type="text" name="login" value="" placeholder="{{ __('Nick') }}">
|
<span class="input-group-addon">{{ m.angel }}</span>
|
||||||
</div>
|
<input class="form-control input-lg" id="form_nick"
|
||||||
|
type="text" name="login" value="" placeholder="{{ __('Nick') }}">
|
||||||
<div class="form-group">
|
|
||||||
<input class="form-control" id="form_password"
|
|
||||||
type="password" name="password" value="" placeholder="{{ __('Password') }}">
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="form-group">
|
|
||||||
<div class="btn-group">
|
|
||||||
<button class="btn btn-primary" type="submit" name="submit">
|
|
||||||
{{ __('Login') }}
|
|
||||||
</button>
|
|
||||||
|
|
||||||
{% if show_password_recovery|default(false) %}
|
|
||||||
<a href="{{ url('user-password-recovery') }}" class="btn btn-default ">
|
|
||||||
{{ __('I forgot my password') }}
|
|
||||||
</a>
|
|
||||||
{% endif %}
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<div class="input-group">
|
||||||
|
<span class="input-group-addon">{{ m.glyphicon('lock') }}</span>
|
||||||
|
<input class="form-control input-lg" id="form_password"
|
||||||
|
type="password" name="password" value="" placeholder="{{ __('Password') }}">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="form-group">
|
||||||
|
<button class="btn btn-primary btn-lg btn-block" type="submit" name="submit">
|
||||||
|
{{ __('Login') }}
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="text-center">
|
||||||
|
<a href="{{ url('user-password-recovery') }}" class="">
|
||||||
|
{{ __('I forgot my password') }}
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="panel-footer">
|
|
||||||
{{ m.glyphicon('info-sign') }} {{ __('Please note: You have to activate cookies!') }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -100,5 +95,6 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
{{ m.glyphicon('info-sign') }} {{ __('Please note: You have to activate cookies!') }}
|
||||||
</div>
|
</div>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
|
||||||
|
|
@ -59,17 +59,16 @@ class AuthController extends BaseController
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param bool $showRecovery
|
|
||||||
* @return Response
|
* @return Response
|
||||||
*/
|
*/
|
||||||
protected function showLogin($showRecovery = false): Response
|
protected function showLogin(): Response
|
||||||
{
|
{
|
||||||
$errors = Collection::make(Arr::flatten($this->session->get('errors', [])));
|
$errors = Collection::make(Arr::flatten($this->session->get('errors', [])));
|
||||||
$this->session->remove('errors');
|
$this->session->remove('errors');
|
||||||
|
|
||||||
return $this->response->withView(
|
return $this->response->withView(
|
||||||
'pages/login',
|
'pages/login',
|
||||||
['errors' => $errors, 'show_password_recovery' => $showRecovery]
|
['errors' => $errors]
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -91,7 +90,7 @@ class AuthController extends BaseController
|
||||||
if (!$user instanceof User) {
|
if (!$user instanceof User) {
|
||||||
$this->session->set('errors', $this->session->get('errors', []) + ['auth.not-found']);
|
$this->session->set('errors', $this->session->get('errors', []) + ['auth.not-found']);
|
||||||
|
|
||||||
return $this->showLogin(true);
|
return $this->showLogin();
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->session->invalidate();
|
$this->session->invalidate();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue