diff --git a/resources/views/blade/input/textarea.blade.php b/resources/views/blade/input/textarea.blade.php new file mode 100644 index 000000000000..85530e059984 --- /dev/null +++ b/resources/views/blade/input/textarea.blade.php @@ -0,0 +1,11 @@ +@props([ + 'value' => '', + 'cols' => 50, + 'rows' => 10, +]) + + diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php index 12c3a3fb735e..e20f24af799d 100644 --- a/resources/views/custom_fields/fields/edit.blade.php +++ b/resources/views/custom_fields/fields/edit.blade.php @@ -70,7 +70,13 @@ {{ trans('admin/custom_fields/general.field_values') }}
- {!! Form::textarea('field_values', old('name', $field->field_values), ['style' => 'width: 100%', 'rows' => 4, 'class' => 'form-control', 'aria-label'=>'field_values']) !!} + {!! $errors->first('field_values', '') !!}

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

diff --git a/resources/views/livewire/category-edit-form.blade.php b/resources/views/livewire/category-edit-form.blade.php index cb80eb45d3d8..82dbf57e85b6 100644 --- a/resources/views/livewire/category-edit-form.blade.php +++ b/resources/views/livewire/category-edit-form.blade.php @@ -3,7 +3,12 @@
- {{ Form::textarea('eula_text', null, ['wire:model.live' => 'eulaText', 'class' => 'form-control', 'aria-label'=>'eula_text', 'disabled' => $this->eulaTextDisabled]) }} +

{!! trans('admin/categories/general.eula_text_help') !!}

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

{!! $errors->first('eula_text', '') !!} diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php index c5816bf175f4..491eca2721d3 100644 --- a/resources/views/modals/upload-file.blade.php +++ b/resources/views/modals/upload-file.blade.php @@ -31,7 +31,13 @@
- {{ Form::textarea('notes', old('notes', old('notes')), ['class' => 'form-control','placeholder' => 'Notes (Optional)', 'rows'=>3, 'aria-label' => 'file']) }} +
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php index c586917ef534..6e0843dae544 100644 --- a/resources/views/settings/branding.blade.php +++ b/resources/views/settings/branding.blade.php @@ -233,11 +233,22 @@
@if (config('app.lock_passwords')===true) - {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS','disabled'=>'disabled', 'aria-label'=>'custom_css')) }} + {!! $errors->first('custom_css', '') !!}

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

@else - {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS', 'aria-label'=>'custom_css')) }} + {!! $errors->first('custom_css', '') !!} @endif

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

@@ -289,10 +300,21 @@
@if (config('app.lock_passwords')===true) - {{ Form::textarea('footer_text', old('footer_text', $setting->footer_text), array('class' => 'form-control', 'rows' => '4', 'placeholder' => 'Optional footer text','disabled'=>'disabled')) }} +

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

@else - {{ Form::textarea('footer_text', old('footer_text', $setting->footer_text), array('class' => 'form-control','rows' => '4','placeholder' => 'Optional footer text')) }} + @endif

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

{!! $errors->first('footer_text', '') !!} diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php index 1de5d4035d85..b5a7d46ba1b5 100644 --- a/resources/views/settings/general.blade.php +++ b/resources/views/settings/general.blade.php @@ -208,7 +208,11 @@ {{ Form::label('default_eula_text', trans('admin/settings/general.default_eula_text')) }}
- {{ Form::textarea('default_eula_text', old('default_eula_text', $setting->default_eula_text), array('class' => 'form-control','placeholder' => 'Add your default EULA text')) }} + {!! $errors->first('default_eula_text', '') !!}

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

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

diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php index 5b483f48a2ea..6727508fdf8b 100644 --- a/resources/views/settings/ldap.blade.php +++ b/resources/views/settings/ldap.blade.php @@ -174,7 +174,11 @@ {{ Form::label('ldap_client_tls_key', trans('admin/settings/general.ldap_client_tls_key')) }}
- {{ Form::textarea('ldap_client_tls_key', old('ldap_client_tls_key', $setting->ldap_client_tls_key), ['class' => 'form-control','placeholder' => trans('general.example') .'-----BEGIN RSA PRIVATE KEY-----'."\r\n1234567890\r\n-----END RSA PRIVATE KEY-----"]) }} + @error('ldap_client_tls_key') @@ -197,7 +201,11 @@ {{ Form::label('ldap_client_tls_cert', trans('admin/settings/general.ldap_client_tls_cert')) }}
- {{ Form::textarea('ldap_client_tls_cert', old('ldap_client_tls_cert', $setting->ldap_client_tls_cert), ['class' => 'form-control','placeholder' => trans('general.example') .'-----BEGIN CERTIFICATE-----'."\r\n1234567890\r\n-----END CERTIFICATE-----"]) }} +

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

@error('ldap_client_tls_cert') diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php index 9349023fc814..e30d8b6ae0d5 100644 --- a/resources/views/settings/saml.blade.php +++ b/resources/views/settings/saml.blade.php @@ -83,7 +83,12 @@ @if (!empty($setting->saml_sp_x509cert)) {{ Form::label('saml_sp_x509cert', trans('admin/settings/general.saml_sp_x509cert')) }} - {{ Form::textarea('saml_sp_x509cert', $setting->saml_sp_x509cert, ['class' => 'form-control', 'wrap' => 'off', 'readonly']) }} +
@endif @@ -106,7 +111,12 @@ {{ Form::label('saml_idp_metadata', trans('admin/settings/general.saml_idp_metadata')) }}
- {{ Form::textarea('saml_idp_metadata', old('saml_idp_metadata', $setting->saml_idp_metadata), ['class' => 'form-control','placeholder' => 'https://example.com/idp/metadata', 'wrap' => 'off', $setting->demoMode]) }} + {!! $errors->first('saml_idp_metadata', '') !!}
- {{ Form::textarea('saml_custom_settings', old('saml_custom_settings', $setting->saml_custom_settings), ['class' => 'form-control','placeholder' => 'example.option=false sp_x509cert=file:///... sp_private_key=file:///', 'wrap' => 'off', $setting->demoMode]) }} +

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

{!! $errors->first('saml_custom_settings', '') !!}