diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index e20f24af79..0f80181ce6 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', ' :message') !!}
@@ -104,7 +104,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', '
:message') !!}
@@ -118,7 +118,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', '
:message') !!}
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
index 626b5b73a4..14d38b8cf1 100644
--- a/resources/views/custom_fields/fieldsets/view.blade.php
+++ b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -103,7 +103,7 @@
- {{ Form::text('order', $maxid, array('aria-label'=>'order', 'maxlength'=>'3', 'size'=>'3')) }}
+
diff --git a/resources/views/partials/forms/edit/address.blade.php b/resources/views/partials/forms/edit/address.blade.php
index 22c39da6a9..12214b956b 100644
--- a/resources/views/partials/forms/edit/address.blade.php
+++ b/resources/views/partials/forms/edit/address.blade.php
@@ -1,7 +1,7 @@
@@ -9,7 +9,7 @@
@@ -17,7 +17,7 @@
@@ -25,7 +25,7 @@
- {{ 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', ':message') !!}
@@ -109,7 +109,7 @@
- {{ 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', ':message') !!}
@@ -121,7 +121,7 @@
- {{ 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::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::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 e9a33fa21a..2f18cdfd57 100644
--- a/resources/views/settings/asset_tags.blade.php
+++ b/resources/views/settings/asset_tags.blade.php
@@ -58,7 +58,7 @@
- {{ 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', ':message') !!}
@@ -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', ':message') !!}
@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::text('zerofill_count', old('zerofill_count', $setting->zerofill_count), array('class' => 'form-control', 'style'=>'width: 150px;', 'aria-label'=>'zerofill_count')) }}
+
{!! $errors->first('zerofill_count', ':message') !!}
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index a4d753913b..8211481efd 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', '
:message') !!}
@@ -192,7 +191,7 @@
- {{ 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', ':message') !!}
@@ -196,7 +196,7 @@
- {{ 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', '
:message') !!}
@@ -389,9 +389,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 fc8e40e0c9..c864b013cb 100644
--- a/resources/views/settings/google.blade.php
+++ b/resources/views/settings/google.blade.php
@@ -68,7 +68,15 @@
- {{ 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', '
:message') !!}
@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', ':message') !!}
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 28967e7eda..68f87bf6fe 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -109,7 +109,7 @@
{{ 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', '
:message') !!}
{!! trans('admin/settings/general.label2_title_help') !!}
@@ -233,20 +233,28 @@
@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', '
:message') !!}
@@ -351,7 +359,7 @@
{{ 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', ':message') !!}
@@ -362,7 +370,7 @@
@@ -377,13 +385,13 @@
@@ -399,13 +407,13 @@
@@ -421,21 +429,21 @@
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 9f635bc3fd..72d4074e5e 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')
@@ -229,7 +229,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')
@@ -309,7 +309,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')
@@ -355,7 +355,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')
@@ -560,7 +560,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')
@@ -582,7 +582,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')
@@ -605,7 +605,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')
@@ -628,7 +628,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')
@@ -651,7 +651,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')
@@ -674,7 +674,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')
@@ -697,7 +697,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')
@@ -719,7 +719,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')
@@ -802,7 +802,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 f7459467c6..3e9f7eab2d 100644
--- a/resources/views/settings/localization.blade.php
+++ b/resources/views/settings/localization.blade.php
@@ -88,7 +88,16 @@
- {{ 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 2b3ebaea4c..94f55d9e7d 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 a3a116da78..f36cd2e51d 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -70,15 +70,15 @@
- {{ Form::text('saml_sp_entitiyid', config('app.url'), ['class' => 'form-control', 'readonly']) }}
+
- {{ Form::text('saml_sp_acs_url', route('saml.acs'), ['class' => 'form-control', 'readonly']) }}
+
- {{ Form::text('saml_sp_sls_url', route('saml.sls'), ['class' => 'form-control', 'readonly']) }}
+
@if (!empty($setting->saml_sp_x509cert))
@@ -93,7 +93,7 @@
@endif
- {{ Form::text('saml_sp_metadata_url', route('saml.metadata'), ['class' => 'form-control', 'readonly']) }}
+
{{ trans('admin/settings/general.saml_download') }}
@@ -133,7 +133,7 @@
- {{ 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', '
:message') !!}
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php
index 3e5410defc..205cca3842 100644
--- a/resources/views/settings/security.blade.php
+++ b/resources/views/settings/security.blade.php
@@ -62,7 +62,7 @@
- {{ 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', '
:message') !!}
@@ -139,14 +139,14 @@
- {{ 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::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', '
:message') !!}
diff --git a/resources/views/setup/user.blade.php b/resources/views/setup/user.blade.php
index 0af947f591..83c64833d5 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', ':message') !!}
@@ -41,7 +41,7 @@
- {{ Form::text('default_currency', old('default_currency'), array('class' => 'form-control','placeholder' => 'USD', 'maxlength'=>'3', 'style'=>'width: 60px;')) }}
+
{!! $errors->first('default_currency', ':message') !!}
@@ -72,14 +72,14 @@
- {{ Form::text('auto_increment_prefix', old('auto_increment_prefix'), array('class' => 'form-control')) }}
+
{!! $errors->first('auto_increment_prefix', ':message') !!}
- {{ Form::text('zerofill_count', old('zerofill_count', 5), array('class' => 'form-control')) }}
+
{!! $errors->first('zerofill_count', ':message') !!}
@@ -90,7 +90,7 @@
- {{ 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', '
:message') !!}
@@ -109,14 +109,14 @@
- {{ Form::text('first_name', old('first_name'), array('class' => 'form-control','placeholder' => 'Jane', 'required' => true)) }}
+
{!! $errors->first('first_name', ':message') !!}
- {{ Form::text('last_name', old('last_name'), array('class' => 'form-control','placeholder' => 'Smith', 'required' => true)) }}
+
{!! $errors->first('last_name', ':message') !!}
@@ -124,7 +124,7 @@
diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index 4eb7bddf30..0c93db184c 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -37,7 +37,7 @@
{!! $errors->first('color', '
:message') !!}
diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php
index 6fd8caee9c..ab00c83bbc 100755
--- a/resources/views/suppliers/edit.blade.php
+++ b/resources/views/suppliers/edit.blade.php
@@ -16,7 +16,7 @@
@@ -28,7 +28,7 @@