1
0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-11-24 11:52:34 +01:00

Merge branch 'master' of git://github.com/almandin/BookStack into almandin-master

This commit is contained in:
Dan Brown 2019-10-17 14:09:07 +01:00
commit 5a887e31da
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 3 additions and 2 deletions

View File

@ -1,6 +1,6 @@
<div class="form-group">
<label for="email">{{ trans('auth.email') }}</label>
@include('form.text', ['name' => 'email', 'tabindex' => 1])
@include('form.text', ['name' => 'email', 'tabindex' => 1, 'focus' => 1])
</div>
<div class="form-group">

View File

@ -1,4 +1,5 @@
<input type="text" id="{{ $name }}" name="{{ $name }}"
@if(isset($focus)) autofocus @endif
@if($errors->has($name)) class="text-neg" @endif
@if(isset($placeholder)) placeholder="{{$placeholder}}" @endif
@if(isset($disabled) && $disabled) disabled="disabled" @endif
@ -6,4 +7,4 @@
@if(isset($model) || old($name)) value="{{ old($name) ? old($name) : $model->$name}}" @endif>
@if($errors->has($name))
<div class="text-neg text-small">{{ $errors->first($name) }}</div>
@endif
@endif