Push updates to login page, mostly UI enhancements.
This commit is contained in:
Dane Everitt
parent
c7c2c1a45e
commit
6f52f4a614
13 changed files with 420 additions and 433 deletions
|
|
@ -10,49 +10,55 @@
|
|||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="login-box-body">
|
||||
@if (count($errors) > 0)
|
||||
<div class="callout callout-danger">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
@lang('auth.auth_error')<br><br>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@foreach (Alert::getMessages() as $type => $messages)
|
||||
@foreach ($messages as $message)
|
||||
<div class="callout callout-{{ $type }} alert-dismissable" role="alert">
|
||||
<div class="row">
|
||||
<div class="col-sm-offset-3 col-xs-offset-1 col-sm-6 col-xs-10">
|
||||
@if (count($errors) > 0)
|
||||
<div class="alert alert-danger">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
{!! $message !!}
|
||||
@lang('auth.auth_error')<br><br>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@foreach (Alert::getMessages() as $type => $messages)
|
||||
@foreach ($messages as $message)
|
||||
<div class="callout callout-{{ $type }} alert-dismissable" role="alert">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
{!! $message !!}
|
||||
</div>
|
||||
@endforeach
|
||||
@endforeach
|
||||
@endforeach
|
||||
<p class="login-box-msg">@lang('auth.authentication_required')</p>
|
||||
<form id="loginForm" action="{{ route('auth.login') }}" method="POST">
|
||||
<div class="form-group has-feedback">
|
||||
<input name="user" class="form-control" value="{{ old('user') }}" placeholder="@lang('strings.user_identifier')">
|
||||
<span class="fa fa-envelope form-control-feedback"></span>
|
||||
</div>
|
||||
<div class="form-group has-feedback">
|
||||
<input type="password" name="password" class="form-control" placeholder="@lang('strings.password')">
|
||||
<span class="fa fa-lock form-control-feedback"></span>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-8">
|
||||
<div class="form-group has-feedback">
|
||||
<input type="checkbox" name="remember" id="remember" /> <label for="remember" class="weight-300">@lang('auth.remember_me')</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-offset-3 col-xs-offset-1 col-sm-6 col-xs-10 pterodactyl-login-box">
|
||||
<form id="loginForm" action="{{ route('auth.login') }}" method="POST">
|
||||
<div class="form-group has-feedback">
|
||||
<div class="pterodactyl-login-input">
|
||||
<input type="text" name="user" class="form-control input-lg" value="{{ old('user') }}" required placeholder="@lang('strings.user_identifier')" autofocus>
|
||||
<span class="fa fa-envelope form-control-feedback fa-lg"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-xs-4">
|
||||
{!! csrf_field() !!}
|
||||
<button type="submit" class="btn btn-primary btn-block btn-flat g-recaptcha" @if(config('recaptcha.enabled')) data-sitekey="{{ config('recaptcha.website_key') }}" data-callback='onSubmit' @endif>@lang('auth.sign_in')</button>
|
||||
<div class="form-group has-feedback">
|
||||
<div class="pterodactyl-login-input">
|
||||
<input type="password" name="password" class="form-control input-lg" required placeholder="@lang('strings.password')">
|
||||
<span class="fa fa-lock form-control-feedback fa-lg"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<a href="{{ route('auth.password') }}">@lang('auth.forgot_password')</a><br>
|
||||
<div class="row">
|
||||
<div class="col-xs-4">
|
||||
<a href="{{ route('auth.password') }}"><button type="button" class="btn pterodactyl-login-button--left"><i class="fa fa-life-ring"></i></button></a>
|
||||
</div>
|
||||
<div class="col-xs-offset-4 col-xs-4">
|
||||
{!! csrf_field() !!}
|
||||
<button type="submit" class="btn btn-block g-recaptcha pterodactyl-login-button--main" @if(config('recaptcha.enabled')) data-sitekey="{{ config('recaptcha.website_key') }}" data-callback='onSubmit' @endif>@lang('auth.sign_in')</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
|
|
|
|||
|
|
@ -10,44 +10,51 @@
|
|||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="login-box-body">
|
||||
@if (count($errors) > 0)
|
||||
<div class="callout callout-danger">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
@lang('auth.auth_error')<br><br>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
@if (session('status'))
|
||||
<div class="callout callout-success">
|
||||
@lang('auth.email_sent')
|
||||
</div>
|
||||
@endif
|
||||
<p class="login-box-msg">@lang('auth.request_reset_text')</p>
|
||||
<form id="resetForm" action="{{ route('auth.password') }}" method="POST">
|
||||
<div class="form-group has-feedback">
|
||||
<input type="email" name="email" class="form-control" value="{{ old('email') }}" autofocus placeholder="@lang('strings.email')">
|
||||
<span class="fa fa-envelope form-control-feedback"></span>
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block text-red small">
|
||||
{{ $errors->first('email') }}
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-4">
|
||||
<a href="{{ route('auth.login') }}"><button type="button" class="btn btn-clear btn-block btn-flat">@lang('strings.login')</button></a>
|
||||
<div class="row">
|
||||
<div class="col-sm-offset-3 col-xs-offset-1 col-sm-6 col-xs-10">
|
||||
@if (count($errors) > 0)
|
||||
<div class="alert alert-danger">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
@lang('auth.auth_error')<br><br>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-xs-8">
|
||||
{!! csrf_field() !!}
|
||||
<button type="submit" class="btn btn-primary btn-block btn-flat g-recaptcha" @if(config('recaptcha.enabled')) data-sitekey="{{ config('recaptcha.website_key') }}" data-callback='onSubmit' @endif>@lang('auth.request_reset')</button>
|
||||
@endif
|
||||
@if (session('status'))
|
||||
<div class="alert alert-success">
|
||||
@lang('auth.email_sent')
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-offset-3 col-xs-offset-1 col-sm-6 col-xs-10 pterodactyl-login-box">
|
||||
<form id="resetForm" action="{{ route('auth.password') }}" method="POST">
|
||||
<div class="form-group has-feedback">
|
||||
<div class="pterodactyl-login-input">
|
||||
<input type="email" name="email" class="form-control input-lg" value="{{ old('email') }}" required placeholder="@lang('strings.email')" autofocus>
|
||||
<span class="fa fa-envelope form-control-feedback fa-lg"></span>
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block text-red small">
|
||||
{{ $errors->first('email') }}
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-4">
|
||||
<a href="{{ route('auth.login') }}"><button type="button" class="btn pterodactyl-login-button--left"><i class="fa fa-user-circle"></i></button></a>
|
||||
</div>
|
||||
<div class="col-xs-offset-4 col-xs-4">
|
||||
{!! csrf_field() !!}
|
||||
<button type="submit" class="btn btn-block g-recaptcha pterodactyl-login-button--main" @if(config('recaptcha.enabled')) data-sitekey="{{ config('recaptcha.website_key') }}" data-callback='onSubmit' @endif>@lang('auth.request_reset')</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
|
|
|
|||
|
|
@ -10,63 +10,70 @@
|
|||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="login-box-body">
|
||||
@if (count($errors) > 0)
|
||||
<div class="callout callout-danger">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
@lang('auth.auth_error')<br><br>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
<div class="row">
|
||||
<div class="col-sm-offset-3 col-xs-offset-1 col-sm-6 col-xs-10">
|
||||
@if (count($errors) > 0)
|
||||
<div class="alert alert-danger">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">×</span></button>
|
||||
@lang('auth.auth_error')<br><br>
|
||||
<ul>
|
||||
@foreach ($errors->all() as $error)
|
||||
<li>{{ $error }}</li>
|
||||
@endforeach
|
||||
</ul>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endif
|
||||
<p class="login-box-msg">@lang('auth.reset_password_text')</p>
|
||||
<form id="resetForm" action="{{ route('auth.reset.post') }}" method="POST">
|
||||
<div class="form-group">
|
||||
<label for="email" class="control-label">@lang('strings.email')</label>
|
||||
<div>
|
||||
<input type="text" class="form-control" name="email" id="email" value="{{ $email or old('email') }}" required autofocus placeholder="@lang('strings.email')" />
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block text-red small">
|
||||
{{ $errors->first('email') }}
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-offset-3 col-xs-offset-1 col-sm-6 col-xs-10 pterodactyl-login-box">
|
||||
<form id="resetForm" action="{{ route('auth.reset.post') }}" method="POST">
|
||||
<div class="form-group has-feedback">
|
||||
<div class="pterodactyl-login-input">
|
||||
<input type="email" name="email" class="form-control input-lg" value="{{ $email or old('email') }}" required autofocus placeholder="@lang('strings.email')">
|
||||
<span class="fa fa-envelope form-control-feedback fa-lg"></span>
|
||||
@if ($errors->has('email'))
|
||||
<span class="help-block text-red small">
|
||||
{{ $errors->first('email') }}
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group has-feedback">
|
||||
<div class="pterodactyl-login-input">
|
||||
<input type="password" name="password" class="form-control input-lg" id="password" required placeholder="@lang('strings.password')">
|
||||
<span class="fa fa-lock form-control-feedback fa-lg"></span>
|
||||
@if ($errors->has('password'))
|
||||
<span class="help-block text-red small">
|
||||
{{ $errors->first('password') }}
|
||||
</span>
|
||||
@endif
|
||||
<p class="small" style="color: #fff;">@lang('auth.password_requirements')</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group has-feedback">
|
||||
<div class="pterodactyl-login-input">
|
||||
<input type="password" name="password_confirmation" class="form-control input-lg" id="password_confirmation" required placeholder="@lang('strings.confirm_password')">
|
||||
<span class="fa fa-lock form-control-feedback fa-lg"></span>
|
||||
@if ($errors->has('password_confirmation'))
|
||||
<span class="help-block text-red small">
|
||||
{{ $errors->first('password_confirmation') }}
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-4">
|
||||
<a href="{{ route('auth.login') }}"><button type="button" class="btn pterodactyl-login-button--left"><i class="fa fa-user-circle"></i></button></a>
|
||||
</div>
|
||||
<div class="col-xs-offset-1 col-xs-7">
|
||||
{!! csrf_field() !!}
|
||||
<button type="submit" class="btn btn-block g-recaptcha pterodactyl-login-button--main" @if(config('recaptcha.enabled')) data-sitekey="{{ config('recaptcha.website_key') }}" data-callback='onSubmit' @endif>@lang('auth.reset_password')</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="password" class="control-label">@lang('strings.password')</label>
|
||||
<div>
|
||||
<input type="password" class="form-control" name="password" id="password" required placeholder="@lang('strings.password')" />
|
||||
@if ($errors->has('password'))
|
||||
<span class="help-block text-red small">
|
||||
{{ $errors->first('password') }}
|
||||
</span>
|
||||
@endif
|
||||
<p class="text-muted"><small>@lang('auth.password_requirements')</small></p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="password" class="control-label">@lang('strings.confirm_password')</label>
|
||||
<div>
|
||||
<input type="password" class="form-control" name="password_confirmation" id="password_confirmation" required placeholder="@lang('strings.confirm_password')" />
|
||||
@if ($errors->has('password_confirmation'))
|
||||
<span class="help-block text-red small">
|
||||
{{ $errors->first('password_confirmation') }}
|
||||
</span>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
{!! csrf_field() !!}
|
||||
<input type="hidden" name="token" value="{{ $token }}">
|
||||
<button type="submit" class="btn btn-primary btn-block btn-flat g-recaptcha" @if(config('recaptcha.enabled')) data-sitekey="{{ config('recaptcha.website_key') }}" data-callback='onSubmit' @endif>@lang('auth.reset_password')</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
@section('scripts')
|
||||
|
|
|
|||
|
|
@ -20,22 +20,23 @@
|
|||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="login-box-body">
|
||||
<form action="{{ route('auth.totp') }}" method="POST">
|
||||
<div class="form-group has-feedback">
|
||||
<input type="number" name="2fa_token" class="form-control input-lg text-center" placeholder="@lang('strings.2fa_token')" autofocus>
|
||||
<span class="fa fa-shield form-control-feedback"></span>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12">
|
||||
{!! csrf_field() !!}
|
||||
<input type="hidden" name="verify_token" value="{{ $verify_key }}" />
|
||||
@if($remember)
|
||||
<input type="checkbox" name="remember" checked style="display:none;"/>
|
||||
@endif
|
||||
<button type="submit" class="btn btn-primary btn-block btn-flat">@lang('strings.submit')</button>
|
||||
<div class="row">
|
||||
<div class="col-sm-offset-3 col-xs-offset-1 col-sm-6 col-xs-10 pterodactyl-login-box">
|
||||
<form id="totpForm" action="{{ route('auth.totp') }}" method="POST">
|
||||
<div class="form-group has-feedback">
|
||||
<div class="pterodactyl-login-input">
|
||||
<input type="number" name="2fa_token" class="form-control input-lg" required placeholder="@lang('strings.2fa_token')" autofocus>
|
||||
<span class="fa fa-shield form-control-feedback fa-lg"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
<div class="row">
|
||||
<div class="col-xs-offset-8 col-xs-4">
|
||||
{!! csrf_field() !!}
|
||||
<input type="hidden" name="verify_token" value="{{ $verify_key }}" />
|
||||
<button type="submit" class="btn btn-primary btn-block btn-flat pterodactyl-login-button--main">@lang('strings.submit')</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
@endsection
|
||||
|
|
|
|||
|
|
@ -34,14 +34,16 @@
|
|||
@show
|
||||
</head>
|
||||
<body id="particles-js" class="hold-transition login-page">
|
||||
<div class="login-box">
|
||||
<div class="login-logo">
|
||||
{{ Settings::get('company', 'Pterodactyl') }}
|
||||
<div class="container">
|
||||
<div id="login-position-elements">
|
||||
<div class="login-logo">
|
||||
{{ Settings::get('company', 'Pterodactyl') }}
|
||||
</div>
|
||||
@yield('content')
|
||||
<p class="small login-copyright text-center">
|
||||
Copyright © 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/" target="_blank">Pterodactyl Software</a>.<br />
|
||||
</p>
|
||||
</div>
|
||||
@yield('content')
|
||||
<p class="small login-copyright text-center">
|
||||
Copyright © 2015 - {{ date('Y') }} <a href="https://pterodactyl.io/" target="_blank">Pterodactyl Software</a>.<br />
|
||||
</p>
|
||||
</div>
|
||||
<div class="login-corner-info small">
|
||||
<strong><i class="fa fa-fw {{ $appIsGit ? 'fa-git-square' : 'fa-code-fork' }}"></i></strong> {{ $appVersion }}<br />
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue