diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php index 5b483f48a2..9d18050745 100644 --- a/resources/views/settings/ldap.blade.php +++ b/resources/views/settings/ldap.blade.php @@ -150,7 +150,7 @@ {{ Form::label('ad_domain', trans('admin/settings/general.ad_domain')) }}
- {{ Form::text('ad_domain', old('ad_domain', $setting->ad_domain), ['class' => 'form-control','placeholder' => trans('general.example') .'example.com']) }} +

{{ trans('admin/settings/general.ad_domain_help') }}

@error('ad_domain') @@ -221,7 +221,7 @@ {{ Form::label('ldap_server', trans('admin/settings/general.ldap_server')) }}
- {{ Form::text('ldap_server', old('ldap_server', $setting->ldap_server), ['class' => 'form-control','placeholder' => trans('general.example') .'ldap://ldap.example.com']) }} + @error('ldap_server') @@ -301,7 +301,7 @@ {{ Form::label('ldap_uname', trans('admin/settings/general.ldap_uname')) }}
- {{ Form::text('ldap_uname', old('ldap_uname', $setting->ldap_uname), ['class' => 'form-control','autocomplete' => 'off', 'placeholder' => trans('general.example') .'binduser@example.com']) }} + @error('ldap_uname') @@ -347,7 +347,7 @@ {{ Form::label('ldap_basedn', trans('admin/settings/general.ldap_basedn')) }}
- {{ Form::text('ldap_basedn', old('ldap_basedn', $setting->ldap_basedn), ['class' => 'form-control', 'placeholder' => trans('general.example') .'cn=users/authorized,dc=example,dc=com']) }} + @error('ldap_basedn') @@ -552,7 +552,7 @@ {{ Form::label('ldap_emp_num', trans('admin/settings/general.ldap_emp_num')) }}
- {{ Form::text('ldap_emp_num', old('ldap_emp_num', $setting->ldap_emp_num), ['class' => 'form-control','placeholder' => trans('general.example') .'employeenumber/employeeid']) }} + @error('ldap_emp_num') @@ -574,7 +574,7 @@ {{ Form::label('ldap_dept', trans('admin/settings/general.ldap_dept')) }}
- {{ Form::text('ldap_dept', old('ldap_dept', $setting->ldap_dept), ['class' => 'form-control','placeholder' => trans('general.example') .'department']) }} + @error('ldap_dept') @@ -597,7 +597,7 @@ {{ Form::label('ldap_dept', trans('admin/settings/general.ldap_manager')) }}
- {{ Form::text('ldap_manager', old('ldap_manager', $setting->ldap_manager), ['class' => 'form-control','placeholder' => trans('general.example') .'manager']) }} + @error('ldap_manager') @@ -620,7 +620,7 @@ {{ Form::label('ldap_email', trans('admin/settings/general.ldap_email')) }}
- {{ Form::text('ldap_email', old('ldap_email', $setting->ldap_email), ['class' => 'form-control','placeholder' => trans('general.example') .'mail']) }} + @error('ldap_email') @@ -643,7 +643,7 @@ {{ Form::label('ldap_phone', trans('admin/settings/general.ldap_phone')) }}
- {{ Form::text('ldap_phone', old('ldap_phone', $setting->ldap_phone_field), ['class' => 'form-control','placeholder' => trans('general.example') .'telephonenumber']) }} + @error('ldap_phone') @@ -666,7 +666,7 @@ {{ Form::label('ldap_jobtitle', trans('admin/settings/general.ldap_jobtitle')) }}
- {{ Form::text('ldap_jobtitle', old('ldap_jobtitle', $setting->ldap_jobtitle), ['class' => 'form-control','placeholder' => trans('general.example') .'title']) }} + @error('ldap_jobtitle') @@ -689,7 +689,7 @@ {{ Form::label('ldap_country', trans('admin/settings/general.ldap_country')) }}
- {{ Form::text('ldap_country', old('ldap_country', $setting->ldap_country), ['class' => 'form-control','placeholder' => trans('general.example') .'c']) }} + @error('ldap_country') @@ -711,7 +711,7 @@ {{ Form::label('ldap_location', trans('admin/settings/general.ldap_location')) }}
- {{ Form::text('ldap_location', old('ldap_location', $setting->ldap_location), ['class' => 'form-control','placeholder' => trans('general.example') .'physicaldeliveryofficename']) }} +

{!! trans('admin/settings/general.ldap_location_help') !!}

@error('ldap_location') @@ -794,7 +794,7 @@ {{ Form::label('custom_forgot_pass_url', trans('admin/settings/general.custom_forgot_pass_url')) }}
- {{ Form::text('custom_forgot_pass_url', old('custom_forgot_pass_url', $setting->custom_forgot_pass_url), ['class' => 'form-control','placeholder' => trans('general.example') .'https://my.ldapserver-forgotpass.com']) }} +

{{ trans('admin/settings/general.custom_forgot_pass_url_help') }}

@error('custom_forgot_pass_url') diff --git a/resources/views/settings/localization.blade.php b/resources/views/settings/localization.blade.php index d8f3e436e3..db7a287353 100644 --- a/resources/views/settings/localization.blade.php +++ b/resources/views/settings/localization.blade.php @@ -88,7 +88,16 @@ {{ Form::label('default_currency', trans('admin/settings/general.default_currency')) }}
- {{ Form::text('default_currency', old('default_currency', $setting->default_currency), array('class' => 'form-control select2-container','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px; display: inline-block; ')) }} + {!! Form::digit_separator('digit_separator', old('digit_separator', $setting->digit_separator), 'select2') !!} diff --git a/resources/views/settings/purge-form.blade.php b/resources/views/settings/purge-form.blade.php index 86ad28fc50..19089065c5 100644 --- a/resources/views/settings/purge-form.blade.php +++ b/resources/views/settings/purge-form.blade.php @@ -32,9 +32,9 @@
@if (config('app.lock_passwords')===true) - {{ Form::text('confirm_purge', old('confirm_purge'), array('class' => 'form-control', 'disabled'=>'true')) }} + @else - {{ Form::text('confirm_purge', old('confirm_purge'), array('class' => 'form-control')) }} + @endif @if (config('app.lock_passwords')===true)