mirror of
https://github.com/BookStackApp/BookStack.git
synced 2025-08-09 10:22:51 +03:00
Merge branch 'fix/registraion-form-validation' of git://github.com/cw1998/BookStack into cw1998-fix/registraion-form-validation
This commit is contained in:
@@ -6,5 +6,10 @@
|
||||
<div class="form-group">
|
||||
<label for="password">{{ trans('auth.password') }}</label>
|
||||
@include('form.password', ['name' => 'password', 'tabindex' => 1])
|
||||
<span class="block small mt-s"><a href="{{ baseUrl('/password/email') }}">{{ trans('auth.forgot_password') }}</a></span>
|
||||
</div>
|
||||
<span class="block small mt-s">
|
||||
<a href="{{ baseUrl('/password/email') }}">{{ trans('auth.forgot_password') }}</a>
|
||||
@if(setting('registration-enabled', false))
|
||||
• <a href="{{ baseUrl('/register') }}">{{ trans('auth.sign_up') }}</a>
|
||||
@endif
|
||||
</span>
|
||||
</div>
|
||||
|
@@ -9,7 +9,7 @@
|
||||
<div class="card content-wrap">
|
||||
<h1 class="list-heading">{{ title_case(trans('auth.log_in')) }}</h1>
|
||||
|
||||
<form action="{{ baseUrl("/login") }}" method="POST" id="login-form" class="mt-l">
|
||||
<form action="{{ baseUrl('/login') }}" method="POST" id="login-form" class="mt-l">
|
||||
{!! csrf_field() !!}
|
||||
|
||||
<div class="stretch-inputs">
|
||||
|
@@ -41,7 +41,7 @@
|
||||
|
||||
@if(!signedInUser())
|
||||
@if(setting('registration-enabled', false))
|
||||
<a href="{{ baseUrl("/register") }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
|
||||
<a href="{{ baseUrl('/register') }}">@icon('new-user') {{ trans('auth.sign_up') }}</a>
|
||||
@endif
|
||||
<a href="{{ baseUrl('/login') }}">@icon('login') {{ trans('auth.log_in') }}</a>
|
||||
@endif
|
||||
|
Reference in New Issue
Block a user