diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php index 12c3a3fb735e..ece591cb407c 100644 --- a/resources/views/custom_fields/fields/edit.blade.php +++ b/resources/views/custom_fields/fields/edit.blade.php @@ -46,7 +46,7 @@ {{ trans('admin/custom_fields/general.field_name') }}
- {{ Form::text('name', old('name', $field->name), array('class' => 'form-control', 'aria-label'=>'name')) }} + {!! $errors->first('name', '') !!}
@@ -98,7 +98,7 @@ {{ trans('admin/custom_fields/general.field_custom_format') }}
- {{ Form::text('custom_format', old('custom_format', (($field->format!='') && (stripos($field->format,'regex')===0)) ? $field->format : ''), array('class' => 'form-control', 'id' => 'custom_format','aria-label'=>'custom_format', 'placeholder'=>'regex:/^[0-9]{15}$/')) }} +

{!! trans('admin/custom_fields/general.field_custom_format_help') !!}

{!! $errors->first('custom_format', '') !!} @@ -112,7 +112,7 @@ {{ trans('admin/custom_fields/general.help_text') }}
- {{ Form::text('help_text', old('help_text', $field->help_text), array('class' => 'form-control', 'aria-label'=>'help_text')) }} +

{{ trans('admin/custom_fields/general.help_text_description') }}

{!! $errors->first('help_text', '') !!}
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php index b73ae708c669..ae19bd499015 100644 --- a/resources/views/custom_fields/fieldsets/view.blade.php +++ b/resources/views/custom_fields/fieldsets/view.blade.php @@ -103,7 +103,7 @@
diff --git a/resources/views/partials/forms/edit/address.blade.php b/resources/views/partials/forms/edit/address.blade.php index 0412287a92ec..21b5c5d4a7db 100644 --- a/resources/views/partials/forms/edit/address.blade.php +++ b/resources/views/partials/forms/edit/address.blade.php @@ -1,7 +1,7 @@
{{ Form::label('address', trans('general.address'), array('class' => 'col-md-3 control-label')) }}
- {{Form::text('address', old('address', $item->address), array('class' => 'form-control', 'aria-label'=>'address', 'maxlength'=>'191')) }} + {!! $errors->first('address', '') !!}
@@ -9,7 +9,7 @@
- {{Form::text('address2', old('address2', $item->address2), array('class' => 'form-control', 'aria-label'=>'address2', 'maxlength'=>'191')) }} + {!! $errors->first('address2', '') !!}
@@ -17,7 +17,7 @@
{{ Form::label('city', trans('general.city'), array('class' => 'col-md-3 control-label')) }}
- {{Form::text('city', old('city', $item->city), array('class' => 'form-control', 'aria-label'=>'city', 'maxlength'=>'191')) }} + {!! $errors->first('city', '') !!}
@@ -25,7 +25,7 @@
{{ Form::label('state', trans('general.state'), array('class' => 'col-md-3 control-label')) }}
- {{Form::text('state', old('state', $item->state), array('class' => 'form-control', 'aria-label'=>'state', 'maxlength'=>'191')) }} + {!! $errors->first('state', '') !!}
@@ -43,7 +43,7 @@
{{ Form::label('zip', trans('general.zip'), array('class' => 'col-md-3 control-label', 'maxlength'=>'10')) }}
- {{Form::text('zip', old('zip', $item->zip), array('class' => 'form-control')) }} + {!! $errors->first('zip', '') !!}
diff --git a/resources/views/partials/forms/edit/phone.blade.php b/resources/views/partials/forms/edit/phone.blade.php index 1a9d407a1506..334bd22950b7 100644 --- a/resources/views/partials/forms/edit/phone.blade.php +++ b/resources/views/partials/forms/edit/phone.blade.php @@ -1,7 +1,7 @@
{{ Form::label('phone', trans('admin/suppliers/table.phone'), array('class' => 'col-md-3 control-label')) }}
- {{Form::text('phone', old('phone', $item->phone), array('class' => 'form-control', 'aria-label'=>'phone', 'maxlength'=>'191')) }} + {!! $errors->first('phone', '') !!}
diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php index fb614a2e81c9..c5d5c9e0e12e 100644 --- a/resources/views/settings/alerts.blade.php +++ b/resources/views/settings/alerts.blade.php @@ -98,7 +98,7 @@ {{ Form::label('alert_interval', trans('admin/settings/general.alert_interval')) }}
- {{ Form::text('alert_interval', old('alert_interval', $setting->alert_interval), array('class' => 'form-control','placeholder' => '30', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} + {!! $errors->first('alert_interval', '') !!}
@@ -109,7 +109,7 @@ {{ Form::label('alert_threshold', trans('admin/settings/general.alert_inv_threshold')) }}
- {{ Form::text('alert_threshold', old('alert_threshold', $setting->alert_threshold), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} + {!! $errors->first('alert_threshold', '') !!}
@@ -121,7 +121,7 @@ {{ Form::label('audit_interval', trans('admin/settings/general.audit_interval')) }}
- {{ Form::text('audit_interval', old('audit_interval', $setting->audit_interval), array('class' => 'form-control','placeholder' => '12', 'maxlength'=>'3')) }} + {{ trans('general.months') }}
@@ -136,7 +136,7 @@ {{ Form::label('audit_warning_days', trans('admin/settings/general.audit_warning_days')) }}
- {{ Form::text('audit_warning_days', old('audit_warning_days', $setting->audit_warning_days), array('class' => 'form-control','placeholder' => '14', 'maxlength'=>'3')) }} + {{ trans('general.days') }}
@@ -151,7 +151,7 @@ {{ Form::label('due_checkin_days', trans('admin/settings/general.due_checkin_days')) }}
- {{ Form::text('due_checkin_days', old('due_checkin_days', $setting->due_checkin_days), array('class' => 'form-control','placeholder' => '14', 'maxlength'=>'3')) }} + {{ trans('general.days') }}
diff --git a/resources/views/settings/asset_tags.blade.php b/resources/views/settings/asset_tags.blade.php index 020d97a7561a..621306724eb7 100644 --- a/resources/views/settings/asset_tags.blade.php +++ b/resources/views/settings/asset_tags.blade.php @@ -58,7 +58,7 @@ {{ Form::label('next_auto_tag_base', trans('admin/settings/general.next_auto_tag_base')) }}
- {{ Form::text('next_auto_tag_base', old('next_auto_tag_base', $setting->next_auto_tag_base), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'next_auto_tag_base')) }} + {!! $errors->first('next_auto_tag_base', '') !!}
@@ -71,10 +71,10 @@
@if ($setting->auto_increment_assets == 1) - {{ Form::text('auto_increment_prefix', old('auto_increment_prefix', $setting->auto_increment_prefix), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'auto_increment_prefix')) }} + {!! $errors->first('auto_increment_prefix', '') !!} @else - {{ Form::text('auto_increment_prefix', old('auto_increment_prefix', $setting->auto_increment_prefix), array('class' => 'form-control', 'disabled'=>'disabled', 'style'=>'width: 150px;', 'aria-label'=>'auto_increment_prefix')) }} + @endif
@@ -85,7 +85,7 @@ {{ Form::label('zerofill_count', trans('admin/settings/general.zerofill_count')) }}
- {{ Form::text('zerofill_count', old('zerofill_count', $setting->zerofill_count), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'zerofill_count')) }} + {!! $errors->first('zerofill_count', '') !!}
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php index c586917ef534..ab1c6e5e43d7 100644 --- a/resources/views/settings/branding.blade.php +++ b/resources/views/settings/branding.blade.php @@ -49,11 +49,10 @@
@if (config('app.lock_passwords')===true) - {{ Form::text('site_name', old('site_name', $setting->site_name), array('class' => 'form-control', 'disabled'=>'disabled','placeholder' => 'Snipe-IT Asset Management')) }} +

{{ trans('general.feature_disabled') }}

@else - {{ Form::text('site_name', - old('site_name', $setting->site_name), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management', 'required' => 'required')) }} + @endif {!! $errors->first('site_name', '') !!}
@@ -192,7 +191,7 @@
- {{ Form::text('header_color', old('header_color', $setting->header_color), array('class' => 'form-control', 'style' => 'width: 100px;','placeholder' => '#FF0000', 'aria-label'=>'header_color')) }} +
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php index 1de5d4035d85..b8a32f868544 100644 --- a/resources/views/settings/general.blade.php +++ b/resources/views/settings/general.blade.php @@ -80,7 +80,7 @@ {{ Form::label('email_domain', trans('general.email_domain')) }}
- {{ Form::text('email_domain', old('email_domain', $setting->email_domain), array('class' => 'form-control','placeholder' => 'example.com')) }} + {{ trans('general.email_domain_help') }} {!! $errors->first('email_domain', '') !!}
@@ -185,7 +185,7 @@ {{ Form::label('per_page', trans('admin/settings/general.per_page')) }}
- {{ Form::text('per_page', old('per_page', $setting->per_page), array('class' => 'form-control','placeholder' => '5', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} + {!! $errors->first('per_page', '') !!}
@@ -196,7 +196,7 @@ {{ Form::label('thumbnail_max_h', trans('admin/settings/general.thumbnail_max_h')) }}
- {{ Form::text('thumbnail_max_h', old('thumbnail_max_h', $setting->thumbnail_max_h), array('class' => 'form-control','placeholder' => '50', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} +

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

{!! $errors->first('thumbnail_max_h', '') !!}
@@ -388,9 +388,9 @@
@if (config('app.lock_passwords')) - {{ Form::text('privacy_policy_link', old('privacy_policy_link', $setting->privacy_policy_link), array('class' => 'form-control disabled', 'disabled' => 'disabled')) }} + @else - {{ Form::text('privacy_policy_link', old('privacy_policy_link', $setting->privacy_policy_link), array('class' => 'form-control')) }} + @endif diff --git a/resources/views/settings/google.blade.php b/resources/views/settings/google.blade.php index 83e88b936f13..83b9501560c5 100644 --- a/resources/views/settings/google.blade.php +++ b/resources/views/settings/google.blade.php @@ -68,7 +68,15 @@ {{ Form::label('google_client_id', 'Client ID') }}
- {{ Form::text('google_client_id', old('google_client_id', $setting->google_client_id), ['class' => 'form-control','placeholder' => trans('general.example') .'000000000000-XXXXXXXXXXX.apps.googleusercontent.com', (config('app.lock_passwords')===true) ? 'disabled': '']) }} + {!! $errors->first('google_client_id', '') !!} @if (config('app.lock_passwords')===true)

{{ trans('general.feature_disabled') }}

@@ -84,9 +92,9 @@
@if (config('app.lock_passwords')===true) - {{ Form::text('google_client_secret', 'XXXXXXXXXXXXXXXXXXXXXXX', ['class' => 'form-control', 'disabled']) }} + @else - {{ Form::text('google_client_secret', old('google_client_secret', $setting->google_client_secret), ['class' => 'form-control','placeholder' => trans('general.example') .'XXXXXXXXXXXX']) }} + @endif {!! $errors->first('google_client_secret', '') !!} diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index fa8c5dc858b2..6b52bbdad114 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -109,7 +109,7 @@ class="table table-striped snipe-table" {{ Form::label('label2_title', trans('admin/settings/general.label2_title'), ['class'=>'control-label']) }}
- {{ Form::text('label2_title', old('label2_title', $setting->label2_title), [ 'class'=>'form-control', 'placeholder'=>$setting->qr_text, 'aria-label'=>'label2_title' ]) }} + {!! $errors->first('label2_title', '') !!}

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

@@ -233,20 +233,28 @@ class="table table-striped snipe-table"

@if ($setting->qr_code == 1) - {{ Form::text('qr_text', old('qr_text', $setting->qr_text), array( - 'class' => 'form-control', - 'placeholder' => 'Property of Your Company', - 'rel' => 'txtTooltip', - 'title' =>'Extra text that you would like to display on your labels.', - 'data-toggle' =>'tooltip', - 'data-placement'=>'top' - )) }} + @else - {{ Form::text('qr_text', old('qr_text', $setting->qr_text), array( - 'class' => 'form-control', - 'disabled' => 'disabled', - 'placeholder' => 'Property of Your Company' - )) }} +

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

@endif {!! $errors->first('qr_text', '') !!} @@ -351,7 +359,7 @@ class="table table-striped snipe-table" {{ Form::label('labels_per_page', trans('admin/settings/general.labels_per_page'), ['class'=>'control-label']) }}
- {{ Form::text('labels_per_page', old('labels_per_page', $setting->labels_per_page), ['class' => 'form-control','style' => 'width: 100px;', 'aria-label'=>'labels_per_page']) }} + {!! $errors->first('labels_per_page', '') !!}
@@ -362,7 +370,7 @@ class="table table-striped snipe-table"
- {{ Form::text('labels_fontsize', old('labels_fontsize', $setting->labels_fontsize), ['class' => 'form-control', 'aria-label'=>'labels_fontsize']) }} +
{{ trans('admin/settings/general.text_pt') }}
@@ -377,13 +385,13 @@ class="table table-striped snipe-table"
- {{ Form::text('labels_width', old('labels_width', $setting->labels_width), ['class' => 'form-control', 'aria-label'=>'labels_width']) }} +
{{ trans('admin/settings/general.width_w') }}
- {{ Form::text('labels_height', old('labels_height', $setting->labels_height), ['class' => 'form-control', 'aria-label'=>'labels_height']) }} +
{{ trans('admin/settings/general.height_h') }}
@@ -399,13 +407,13 @@ class="table table-striped snipe-table"
- {{ Form::text('labels_display_sgutter', old('labels_display_sgutter', $setting->labels_display_sgutter), ['class' => 'form-control', 'aria-label'=>'labels_display_sgutter']) }} +
{{ trans('admin/settings/general.horizontal') }}
- {{ Form::text('labels_display_bgutter', old('labels_display_bgutter', $setting->labels_display_bgutter), ['class' => 'form-control', 'aria-label'=>'labels_display_bgutter']) }} +
{{ trans('admin/settings/general.vertical') }}
@@ -421,21 +429,21 @@ class="table table-striped snipe-table"
- {{ Form::text('labels_pmargin_top', old('labels_pmargin_top', $setting->labels_pmargin_top), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_top']) }} +
{{ trans('admin/settings/general.top') }}
- {{ Form::text('labels_pmargin_right', old('labels_pmargin_right', $setting->labels_pmargin_right), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_right']) }} +
{{ trans('admin/settings/general.right') }}
- {{ Form::text('labels_pmargin_bottom', old('labels_pmargin_bottom', $setting->labels_pmargin_bottom), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_bottom']) }} +
{{ trans('admin/settings/general.bottom') }}
- {{ Form::text('labels_pmargin_left', old('labels_pmargin_left', $setting->labels_pmargin_left), ['class' => 'form-control', 'aria-label'=>'labels_pmargin_left']) }} +
{{ trans('admin/settings/general.left') }}
@@ -452,13 +460,13 @@ class="table table-striped snipe-table"
- {{ Form::text('labels_pagewidth', old('labels_pagewidth', $setting->labels_pagewidth), ['class' => 'form-control', 'aria-label'=>'labels_pagewidth']) }} +
{{ trans('admin/settings/general.width_w') }}
- {{ Form::text('labels_pageheight', old('labels_pageheight', $setting->labels_pageheight), ['class' => 'form-control', 'aria-label'=>'labels_pageheight']) }} +
{{ trans('admin/settings/general.height_h') }}
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php index 86a091252f23..f2c57c9c890d 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 d8f3e436e30e..db7a28735318 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 86ad28fc5068..19089065c5eb 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) diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php index 9349023fc814..81c40bb3077e 100644 --- a/resources/views/settings/saml.blade.php +++ b/resources/views/settings/saml.blade.php @@ -70,15 +70,15 @@ {{ Form::label('saml_sp_entitiyid', trans('admin/settings/general.saml_sp_entityid')) }} - {{ Form::text('saml_sp_entitiyid', config('app.url'), ['class' => 'form-control', 'readonly']) }} +
{{ Form::label('saml_sp_acs_url', trans('admin/settings/general.saml_sp_acs_url')) }} - {{ Form::text('saml_sp_acs_url', route('saml.acs'), ['class' => 'form-control', 'readonly']) }} +
{{ Form::label('saml_sp_sls_url', trans('admin/settings/general.saml_sp_sls_url')) }} - {{ Form::text('saml_sp_sls_url', route('saml.sls'), ['class' => 'form-control', 'readonly']) }} +
@if (!empty($setting->saml_sp_x509cert)) @@ -88,7 +88,7 @@ @endif {{ Form::label('saml_sp_metadata_url', trans('admin/settings/general.saml_sp_metadata_url')) }} - {{ Form::text('saml_sp_metadata_url', route('saml.metadata'), ['class' => 'form-control', 'readonly']) }} +

{{ trans('admin/settings/general.saml_download') }} @@ -123,7 +123,7 @@ {{ Form::label('saml_attr_mapping_username', trans('admin/settings/general.saml_attr_mapping_username')) }}

- {{ Form::text('saml_attr_mapping_username', old('saml_attr_mapping_username', $setting->saml_attr_mapping_username), ['class' => 'form-control','placeholder' => '', $setting->demoMode]) }} +

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

{!! $errors->first('saml_attr_mapping_username', '') !!}
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php index a51c86fccbd5..a3277a679a0d 100644 --- a/resources/views/settings/security.blade.php +++ b/resources/views/settings/security.blade.php @@ -62,7 +62,7 @@ {{ Form::label('pwd_secure_min', trans('admin/settings/general.pwd_secure_min')) }}
- {{ Form::text('pwd_secure_min', old('pwd_secure_min', $setting->pwd_secure_min), array('class' => 'form-control', 'style'=>'width: 50px;')) }} + {!! $errors->first('pwd_secure_min', '') !!}

@@ -139,14 +139,14 @@

{{ Form::label('login_remote_user_header_name', trans('admin/settings/general.login_remote_user_header_name_text')) }} - {{ Form::text('login_remote_user_header_name', old('login_remote_user_header_name', $setting->login_remote_user_header_name),array('class' => 'form-control')) }} + {!! $errors->first('login_remote_user_header_name', ':message') !!}

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

{{ Form::label('login_remote_user_custom_logout_url', trans('admin/settings/general.login_remote_user_custom_logout_url_text')) }} - {{ Form::text('login_remote_user_custom_logout_url', old('login_remote_user_custom_logout_url', $setting->login_remote_user_custom_logout_url),array('class' => 'form-control', 'aria-label'=>'login_remote_user_custom_logout_url')) }} + {!! $errors->first('login_remote_user_custom_logout_url', '') !!}

diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php index 18da69513e4d..ec23e926eabd 100644 --- a/resources/views/setup/user.blade.php +++ b/resources/views/setup/user.blade.php @@ -21,7 +21,7 @@ - {{ Form::text('site_name', old('site_name'), array('class' => 'form-control','placeholder' => 'Snipe-IT Asset Management', 'required' => true)) }} + {!! $errors->first('site_name', '') !!}

@@ -41,7 +41,7 @@
{{ Form::label('default_currency', trans('admin/settings/general.default_currency')) }} - {{ Form::text('default_currency', old('default_currency'), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }} + {!! $errors->first('default_currency', '') !!}
@@ -72,14 +72,14 @@
{{ Form::label('auto_increment_prefix', trans('admin/settings/general.auto_increment_prefix')) }} - {{ Form::text('auto_increment_prefix', old('auto_increment_prefix'), array('class' => 'form-control')) }} + {!! $errors->first('auto_increment_prefix', '') !!}
{{ Form::label('zerofill_count', trans('admin/settings/general.zerofill_count')) }} - {{ Form::text('zerofill_count', old('zerofill_count', 5), array('class' => 'form-control')) }} + {!! $errors->first('zerofill_count', '') !!}
@@ -90,7 +90,7 @@
{{ Form::label('email_domain', trans('general.email_domain')) }} - {{ Form::text('email_domain', old('email_domain'), array('class' => 'form-control','placeholder' => 'example.com','required' => true)) }} + {{ trans('general.email_domain_help') }} {!! $errors->first('email_domain', '') !!} @@ -109,14 +109,14 @@
{{ Form::label('first_name', trans('general.first_name'), 'required') }} - {{ Form::text('first_name', old('first_name'), array('class' => 'form-control','placeholder' => 'Jane', 'required' => true)) }} + {!! $errors->first('first_name', '') !!}
{{ Form::label('last_name', trans('general.last_name')) }} - {{ Form::text('last_name', old('last_name'), array('class' => 'form-control','placeholder' => 'Smith', 'required' => true)) }} + {!! $errors->first('last_name', '') !!}
@@ -132,7 +132,7 @@
{{ Form::label('username', trans('admin/users/table.username')) }} - {{ Form::text('username', old('username'), array('class' => 'form-control','placeholder' => 'jsmith', 'required' => true)) }} + {!! $errors->first('username', '') !!}
diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php index af69f35de81e..950b084ccf8c 100755 --- a/resources/views/statuslabels/edit.blade.php +++ b/resources/views/statuslabels/edit.blade.php @@ -37,7 +37,7 @@ {{ Form::label('color', trans('admin/statuslabels/table.color'), ['class' => 'col-md-3 control-label']) }}
- {{ Form::text('color', old('color', $item->color), array('class' => 'form-control col-md-10', 'maxlength'=>'20')) }} +
{!! $errors->first('color', '') !!} diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php index 50341be92687..4f0ae6a96266 100755 --- a/resources/views/suppliers/edit.blade.php +++ b/resources/views/suppliers/edit.blade.php @@ -16,7 +16,7 @@
{{ Form::label('contact', trans('admin/suppliers/table.contact'), array('class' => 'col-md-3 control-label')) }}
- {{Form::text('contact', old('contact', $item->contact), array('class' => 'form-control')) }} + {!! $errors->first('contact', '') !!}
@@ -28,7 +28,7 @@
{{ Form::label('url', trans('general.url'), array('class' => 'col-md-3 control-label')) }}
- {{Form::text('url', old('url', $item->url), array('class' => 'form-control')) }} + {!! $errors->first('url', '') !!}