mirror of
https://github.com/BookStackApp/BookStack.git
synced 2025-06-06 10:44:33 +08:00
Added files missed in previous commit
This commit is contained in:
Dan Brown
@ -1,19 +1,30 @@
|
||||
<div class="form-group">
|
||||
<label for="username">{{ trans('auth.username') }}</label>
|
||||
@include('form.text', ['name' => 'username', 'autofocus' => true])
|
||||
</div>
|
||||
<form action="{{ url('/login') }}" method="POST" id="login-form" class="mt-l">
|
||||
{!! csrf_field() !!}
|
||||
|
||||
@if(session('request-email', false) === true)
|
||||
<div class="form-group">
|
||||
<label for="email">{{ trans('auth.email') }}</label>
|
||||
@include('form.text', ['name' => 'email'])
|
||||
<span class="text-neg">
|
||||
{{ trans('auth.ldap_email_hint') }}
|
||||
</span>
|
||||
<div class="stretch-inputs">
|
||||
<div class="form-group">
|
||||
<label for="username">{{ trans('auth.username') }}</label>
|
||||
@include('form.text', ['name' => 'username', 'autofocus' => true])
|
||||
</div>
|
||||
|
||||
@if(session('request-email', false) === true)
|
||||
<div class="form-group">
|
||||
<label for="email">{{ trans('auth.email') }}</label>
|
||||
@include('form.text', ['name' => 'email'])
|
||||
<span class="text-neg">{{ trans('auth.ldap_email_hint') }}</span>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="form-group">
|
||||
<label for="password">{{ trans('auth.password') }}</label>
|
||||
@include('form.password', ['name' => 'password'])
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="form-group">
|
||||
<label for="password">{{ trans('auth.password') }}</label>
|
||||
@include('form.password', ['name' => 'password'])
|
||||
</div>
|
||||
<div class="grid half collapse-xs gap-xl v-center">
|
||||
<div class="text-right">
|
||||
<button class="button">{{ Str::title(trans('auth.log_in')) }}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
@ -1,30 +1,11 @@
|
||||
<form action="{{ url('/login') }}" method="POST" id="login-form" class="mt-l">
|
||||
<form action="{{ url('/saml2/login') }}" method="POST" id="login-form" class="mt-l">
|
||||
{!! csrf_field() !!}
|
||||
|
||||
<div class="stretch-inputs">
|
||||
<div class="form-group">
|
||||
<label for="username">{{ trans('auth.username') }}</label>
|
||||
@include('form.text', ['name' => 'username', 'autofocus' => true])
|
||||
</div>
|
||||
|
||||
@if(session('request-email', false) === true)
|
||||
<div class="form-group">
|
||||
<label for="email">{{ trans('auth.email') }}</label>
|
||||
@include('form.text', ['name' => 'email'])
|
||||
<span class="text-neg">{{ trans('auth.ldap_email_hint') }}</span>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
<div class="form-group">
|
||||
<label for="password">{{ trans('auth.password') }}</label>
|
||||
@include('form.password', ['name' => 'password'])
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="grid half collapse-xs gap-xl v-center">
|
||||
<div class="text-right">
|
||||
<button class="button">{{ Str::title(trans('auth.log_in')) }}</button>
|
||||
</div>
|
||||
<div>
|
||||
<button id="saml-login" class="button outline block svg">
|
||||
@icon('saml2')
|
||||
{{ trans('auth.log_in_with', ['socialDriver' => config('saml2.name')]) }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
@ -1,12 +1,36 @@
|
||||
<div class="form-group">
|
||||
<label for="email">{{ trans('auth.email') }}</label>
|
||||
@include('form.text', ['name' => 'email', 'autofocus' => true])
|
||||
</div>
|
||||
<form action="{{ url('/login') }}" method="POST" id="login-form" class="mt-l">
|
||||
{!! csrf_field() !!}
|
||||
|
||||
<div class="stretch-inputs">
|
||||
<div class="form-group">
|
||||
<label for="email">{{ trans('auth.email') }}</label>
|
||||
@include('form.text', ['name' => 'email', 'autofocus' => true])
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="password">{{ trans('auth.password') }}</label>
|
||||
@include('form.password', ['name' => 'password'])
|
||||
<div class="small mt-s">
|
||||
<a href="{{ url('/password/email') }}">{{ trans('auth.forgot_password') }}</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="grid half collapse-xs gap-xl v-center">
|
||||
<div class="text-left ml-xxs">
|
||||
@include('components.custom-checkbox', [
|
||||
'name' => 'remember',
|
||||
'checked' => false,
|
||||
'value' => 'on',
|
||||
'label' => trans('auth.remember_me'),
|
||||
])
|
||||
</div>
|
||||
|
||||
<div class="text-right">
|
||||
<button class="button">{{ Str::title(trans('auth.log_in')) }}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
|
||||
<div class="form-group">
|
||||
<label for="password">{{ trans('auth.password') }}</label>
|
||||
@include('form.password', ['name' => 'password'])
|
||||
<span class="block small mt-s">
|
||||
<a href="{{ url('/password/email') }}">{{ trans('auth.forgot_password') }}</a>
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@ -9,29 +9,7 @@
|
||||
<div class="card content-wrap auto-height">
|
||||
<h1 class="list-heading">{{ Str::title(trans('auth.log_in')) }}</h1>
|
||||
|
||||
<form action="{{ url('/login') }}" method="POST" id="login-form" class="mt-l">
|
||||
{!! csrf_field() !!}
|
||||
|
||||
<div class="stretch-inputs">
|
||||
@include('auth.forms.login.' . $authMethod)
|
||||
</div>
|
||||
|
||||
<div class="grid half collapse-xs gap-xl v-center">
|
||||
<div class="text-left ml-xxs">
|
||||
@include('components.custom-checkbox', [
|
||||
'name' => 'remember',
|
||||
'checked' => false,
|
||||
'value' => 'on',
|
||||
'label' => trans('auth.remember_me'),
|
||||
])
|
||||
</div>
|
||||
|
||||
<div class="text-right">
|
||||
<button class="button">{{ Str::title(trans('auth.log_in')) }}</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
@include('auth.forms.login.' . $authMethod)
|
||||
|
||||
@if(count($socialDrivers) > 0)
|
||||
<hr class="my-l">
|
||||
@ -45,17 +23,7 @@
|
||||
@endforeach
|
||||
@endif
|
||||
|
||||
@if($samlEnabled)
|
||||
<hr class="my-l">
|
||||
<div>
|
||||
<a id="saml-login" class="button outline block svg" href="{{ url("/saml2/login") }}">
|
||||
@icon('saml2')
|
||||
{{ trans('auth.log_in_with', ['socialDriver' => config('saml2.name')]) }}
|
||||
</a>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@if(setting('registration-enabled') && config('auth.method') !== 'ldap')
|
||||
@if(setting('registration-enabled') && config('auth.method') === 'standard')
|
||||
<div class="text-center pb-s">
|
||||
<hr class="my-l">
|
||||
<a href="{{ url('/register') }}">{{ trans('auth.dont_have_account') }}</a>
|
||||
|
||||
@ -50,15 +50,6 @@
|
||||
@endforeach
|
||||
@endif
|
||||
|
||||
@if($samlEnabled)
|
||||
<hr class="my-l">
|
||||
<div>
|
||||
<a id="saml-login" class="button outline block svg" href="{{ url("/saml2/login") }}">
|
||||
@icon('saml2')
|
||||
{{ trans('auth.log_in_with', ['socialDriver' => config('saml2.name')]) }}
|
||||
</a>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
@stop
|
||||
|
||||
@ -42,7 +42,7 @@
|
||||
@endif
|
||||
|
||||
@if(!signedInUser())
|
||||
@if(setting('registration-enabled') && config('auth.method') !== 'ldap')
|
||||
@if(setting('registration-enabled') && config('auth.method') === 'standard')
|
||||
<a href="{{ url('/register') }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
|
||||
@endif
|
||||
<a href="{{ url('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
|
||||
@ -64,7 +64,11 @@
|
||||
<a href="{{ url("/settings/users/{$currentUser->id}") }}">@icon('edit'){{ trans('common.edit_profile') }}</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{{ url('/logout') }}">@icon('logout'){{ trans('auth.logout') }}</a>
|
||||
@if(config('auth.method') === 'saml2')
|
||||
<a href="{{ url('/saml2/logout') }}">@icon('logout'){{ trans('auth.logout') }}</a>
|
||||
@else
|
||||
<a href="{{ url('/logout') }}">@icon('logout'){{ trans('auth.logout') }}</a>
|
||||
@endif
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
@ -19,7 +19,7 @@
|
||||
@include('form.text', ['name' => 'description'])
|
||||
</div>
|
||||
|
||||
@if(config('auth.method') === 'ldap' || config('saml2.enabled') === true)
|
||||
@if(config('auth.method') === 'ldap' || config('auth.method') === 'saml2')
|
||||
<div class="form-group">
|
||||
<label for="name">{{ trans('settings.role_external_auth_id') }}</label>
|
||||
@include('form.text', ['name' => 'external_auth_id'])
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@if(($authMethod === 'ldap' || config('saml2.enabled') === true) && userCan('users-manage'))
|
||||
@if(($authMethod === 'ldap' || $authMethod === 'saml2') && userCan('users-manage'))
|
||||
<div class="grid half gap-xl v-center">
|
||||
<div>
|
||||
<label class="setting-list-label">{{ trans('settings.users_external_auth_id') }}</label>
|
||||
|
||||
Reference in New Issue
Block a user