github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-30 12:38:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'v0.26'

Browse Source
This commit is contained in:
Dan Brown
2019-08-06 21:50:56 +01:00
parent 0b1ece664d f417675b1d
commit 421dd93ffd
9 changed files with 89 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
resources/views/form/text.blade.php
View File

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

2
resources/views/users/form.blade.php
View File

@ -19,7 +19,7 @@
<div>
@if($authMethod !== 'ldap' || userCan('users-manage'))
<label for="email">{{ trans('auth.email') }}</label>
@include('form.text', ['name' => 'email'])
@include('form.text', ['name' => 'email', 'disabled' => !userCan('users-manage')])
@endif
</div>
</div>