From c17c011488861014169a53c7d2cd7ed086a7d1e0 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 8 Jan 2025 09:47:20 -0800 Subject: [PATCH 01/67] checks if template is null, adds return types for validation methods --- app/Models/Labels/Label.php | 10 +++++----- app/View/Label.php | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/Models/Labels/Label.php b/app/Models/Labels/Label.php index bf03236d00..87e5f3bee1 100644 --- a/app/Models/Labels/Label.php +++ b/app/Models/Labels/Label.php @@ -411,14 +411,14 @@ abstract class Label /** * Checks the template is internally valid */ - public final function validate() { + public final function validate() : void { $this->validateUnits(); $this->validateSize(); $this->validateMargins(); $this->validateSupport(); } - private function validateUnits() { + private function validateUnits() : void { $validUnits = [ 'pt', 'mm', 'cm', 'in' ]; $unit = $this->getUnit(); if (!in_array(strtolower($unit), $validUnits)) { @@ -430,7 +430,7 @@ abstract class Label } } - private function validateSize() { + private function validateSize() : void { $width = $this->getWidth(); if (!is_numeric($width) || is_string($width)) { throw new \UnexpectedValueException(trans('admin/labels/message.invalid_return_type', [ @@ -450,7 +450,7 @@ abstract class Label } } - private function validateMargins() { + private function validateMargins() : void { $marginTop = $this->getMarginTop(); if (!is_numeric($marginTop) || is_string($marginTop)) { throw new \UnexpectedValueException(trans('admin/labels/message.invalid_return_type', [ @@ -488,7 +488,7 @@ abstract class Label } } - private function validateSupport() { + private function validateSupport() : void{ $support1D = $this->getSupport1DBarcode(); if (!is_bool($support1D)) { throw new \UnexpectedValueException(trans('admin/labels/message.invalid_return_type', [ diff --git a/app/View/Label.php b/app/View/Label.php index c28b8a9594..a7c6641a51 100644 --- a/app/View/Label.php +++ b/app/View/Label.php @@ -49,6 +49,10 @@ class Label implements View ->with('count', $this->data->get('count')); } + if ($template === null) { + throw new \UnexpectedValueException('Template is null.'); + } + $template->validate(); $pdf = new TCPDF( From ce7a8ad808d6d2e2a902756df2f98545644c5fc1 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 8 Jan 2025 09:48:45 -0800 Subject: [PATCH 02/67] add a space --- app/Models/Labels/Label.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/Labels/Label.php b/app/Models/Labels/Label.php index 87e5f3bee1..2405da5401 100644 --- a/app/Models/Labels/Label.php +++ b/app/Models/Labels/Label.php @@ -488,7 +488,7 @@ abstract class Label } } - private function validateSupport() : void{ + private function validateSupport() : void { $support1D = $this->getSupport1DBarcode(); if (!is_bool($support1D)) { throw new \UnexpectedValueException(trans('admin/labels/message.invalid_return_type', [ From f4e69679ca0a7e7cd87dd785bc47aeef1e7b51d1 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 8 Jan 2025 12:13:31 -0800 Subject: [PATCH 03/67] add a try catch around template validation --- app/View/Label.php | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/app/View/Label.php b/app/View/Label.php index a7c6641a51..e3f0ba7248 100644 --- a/app/View/Label.php +++ b/app/View/Label.php @@ -38,7 +38,6 @@ class Label implements View $settings = $this->data->get('settings'); $assets = $this->data->get('assets'); $offset = $this->data->get('offset'); - $template = LabelModel::find($settings->label2_template); // If disabled, pass to legacy view if ((!$settings->label2_enable)) { @@ -49,11 +48,24 @@ class Label implements View ->with('count', $this->data->get('count')); } - if ($template === null) { - throw new \UnexpectedValueException('Template is null.'); + try { + $template = LabelModel::find($settings->label2_template); + + if ($template === null) { + throw new \UnexpectedValueException('Template is null.'); + } + + $template->validate(); + } catch (\UnexpectedValueException $e) { + + \Log::error('Validation failed: ' . $e->getMessage()); + + } catch (\Throwable $e) { + + \Log::error('An unexpected error occurred: ' . $e->getMessage()); + } - $template->validate(); $pdf = new TCPDF( $template->getOrientation(), From 0118504cd3c15fedf49f2d04c93897e5adf078d5 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 8 Jan 2025 15:32:23 -0800 Subject: [PATCH 04/67] adds redirect to render and save if template is null --- app/Http/Controllers/SettingsController.php | 5 ++++ app/View/Label.php | 29 ++++++++++--------- .../lang/en-US/admin/settings/message.php | 3 ++ resources/views/settings/labels.blade.php | 3 -- 4 files changed, 24 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index b89a221faa..603cc7455c 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -798,7 +798,12 @@ class SettingsController extends Controller $setting->labels_display_model = 0; } + if ($setting->save()) { + if ($setting->label2_template === null) { + return redirect()->route('settings.labels.index')->with('error', trans('admin/settings/message.labels.null_template')); + } + return redirect()->route('settings.labels.index') ->with('success', trans('admin/settings/message.update.success')); } diff --git a/app/View/Label.php b/app/View/Label.php index e3f0ba7248..4faa6ed97e 100644 --- a/app/View/Label.php +++ b/app/View/Label.php @@ -7,6 +7,7 @@ use App\Models\Labels\Label as LabelModel; use App\Models\Labels\Sheet; use Illuminate\Contracts\View\View; use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Storage; use Illuminate\Support\Traits\Macroable; use TCPDF; @@ -39,6 +40,7 @@ class Label implements View $assets = $this->data->get('assets'); $offset = $this->data->get('offset'); + // If disabled, pass to legacy view if ((!$settings->label2_enable)) { return view('hardware/labels') @@ -51,21 +53,22 @@ class Label implements View try { $template = LabelModel::find($settings->label2_template); - if ($template === null) { - throw new \UnexpectedValueException('Template is null.'); - } - - $template->validate(); - } catch (\UnexpectedValueException $e) { - - \Log::error('Validation failed: ' . $e->getMessage()); - - } catch (\Throwable $e) { - - \Log::error('An unexpected error occurred: ' . $e->getMessage()); - + if ($template === null) { + return redirect()->route('settings.labels.index')->with('error', trans('admin/settings/message.labels.null_template')); } + $template->validate(); + } catch (\UnexpectedValueException $e) { + + \Log::error('Validation failed: ' . $e->getMessage()); + + } catch (\Throwable $e) { + + \Log::error('An unexpected error occurred: ' . $e->getMessage()); + + } + + $template->validate(); $pdf = new TCPDF( $template->getOrientation(), diff --git a/resources/lang/en-US/admin/settings/message.php b/resources/lang/en-US/admin/settings/message.php index c91575144e..727b27b021 100644 --- a/resources/lang/en-US/admin/settings/message.php +++ b/resources/lang/en-US/admin/settings/message.php @@ -36,6 +36,9 @@ return [ 'testing_authentication' => 'Testing LDAP Authentication...', 'authentication_success' => 'User authenticated against LDAP successfully!' ], + 'labels' => [ + 'null_template' => 'Label template not found, Please select a template.', + ], 'webhook' => [ 'sending' => 'Sending :app test message...', 'success' => 'Your :webhook_name Integration works!', diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 4c01c2177d..4e17a77b37 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -26,7 +26,6 @@
-

@@ -35,8 +34,6 @@

- -
From 3ac08774183f3385d9dad6adceb53382bb04f887 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 14 Jan 2025 09:50:43 -0800 Subject: [PATCH 05/67] remove try/catch, add rules for template --- app/Http/Controllers/SettingsController.php | 4 ---- app/Http/Requests/StoreLabelSettings.php | 1 + app/View/Label.php | 12 ------------ 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.php index 603cc7455c..e963baaf5c 100755 --- a/app/Http/Controllers/SettingsController.php +++ b/app/Http/Controllers/SettingsController.php @@ -798,11 +798,7 @@ class SettingsController extends Controller $setting->labels_display_model = 0; } - if ($setting->save()) { - if ($setting->label2_template === null) { - return redirect()->route('settings.labels.index')->with('error', trans('admin/settings/message.labels.null_template')); - } return redirect()->route('settings.labels.index') ->with('success', trans('admin/settings/message.update.success')); diff --git a/app/Http/Requests/StoreLabelSettings.php b/app/Http/Requests/StoreLabelSettings.php index a203d2702d..e11ead8baf 100644 --- a/app/Http/Requests/StoreLabelSettings.php +++ b/app/Http/Requests/StoreLabelSettings.php @@ -36,6 +36,7 @@ class StoreLabelSettings extends FormRequest 'labels_pagewidth' => 'numeric|nullable', 'labels_pageheight' => 'numeric|nullable', 'qr_text' => 'max:31|nullable', + 'label2_template' => 'required|string', ]; } } diff --git a/app/View/Label.php b/app/View/Label.php index 4faa6ed97e..27406937dc 100644 --- a/app/View/Label.php +++ b/app/View/Label.php @@ -50,7 +50,6 @@ class Label implements View ->with('count', $this->data->get('count')); } - try { $template = LabelModel::find($settings->label2_template); if ($template === null) { @@ -58,17 +57,6 @@ class Label implements View } $template->validate(); - } catch (\UnexpectedValueException $e) { - - \Log::error('Validation failed: ' . $e->getMessage()); - - } catch (\Throwable $e) { - - \Log::error('An unexpected error occurred: ' . $e->getMessage()); - - } - - $template->validate(); $pdf = new TCPDF( $template->getOrientation(), From 69d255f584bee46f147c4d74f99fd7ab51e70a41 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Tue, 14 Jan 2025 12:07:59 -0800 Subject: [PATCH 06/67] adds validation rules for label names --- app/Http/Requests/StoreLabelSettings.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/Http/Requests/StoreLabelSettings.php b/app/Http/Requests/StoreLabelSettings.php index e11ead8baf..6a39418a67 100644 --- a/app/Http/Requests/StoreLabelSettings.php +++ b/app/Http/Requests/StoreLabelSettings.php @@ -2,8 +2,11 @@ namespace App\Http\Requests; + +use App\Models\Labels\Label; use Illuminate\Foundation\Http\FormRequest; use Illuminate\Support\Facades\Gate; +use Illuminate\Validation\Rule; class StoreLabelSettings extends FormRequest { @@ -22,6 +25,10 @@ class StoreLabelSettings extends FormRequest */ public function rules(): array { + $names = Label::find()?->map(function ($label) { + return $label->getName(); + })->values()->toArray(); + return [ 'labels_per_page' => 'numeric', 'labels_width' => 'numeric', @@ -36,7 +43,10 @@ class StoreLabelSettings extends FormRequest 'labels_pagewidth' => 'numeric|nullable', 'labels_pageheight' => 'numeric|nullable', 'qr_text' => 'max:31|nullable', - 'label2_template' => 'required|string', + 'label2_template' => [ + 'required', + Rule::in($names), + ], ]; } } From 1cb72e3e9c4bfd7e6e5dfbc71562f5ce414357b1 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 15 Jan 2025 11:53:22 -0800 Subject: [PATCH 07/67] Replace Form::text in certain views --- resources/views/partials/forms/edit/address.blade.php | 10 +++++----- resources/views/suppliers/edit.blade.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/views/partials/forms/edit/address.blade.php b/resources/views/partials/forms/edit/address.blade.php index 0412287a92..21b5c5d4a7 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/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php index 50341be926..4f0ae6a962 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', '') !!}
From 017948c3bbb70a78ce52474cb5807247bb13b701 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 15 Jan 2025 12:07:33 -0800 Subject: [PATCH 08/67] Replace Form::text in certain views --- resources/views/settings/alerts.blade.php | 10 +++++----- resources/views/settings/security.blade.php | 6 +++--- resources/views/statuslabels/edit.blade.php | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php index ddca5c8158..e66a05eef4 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/security.blade.php b/resources/views/settings/security.blade.php index a51c86fccb..a3277a679a 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/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php index af69f35de8..950b084ccf 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', '') !!} From bec9511df111122f0ce0218247f8879b79729736 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 15 Jan 2025 12:10:05 -0800 Subject: [PATCH 09/67] Add more spacing for input values to be displayed --- resources/views/settings/alerts.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php index e66a05eef4..c5d5c9e0e1 100644 --- a/resources/views/settings/alerts.blade.php +++ b/resources/views/settings/alerts.blade.php @@ -120,7 +120,7 @@
{{ Form::label('audit_interval', trans('admin/settings/general.audit_interval')) }}
-
+
{{ trans('general.months') }}
@@ -135,7 +135,7 @@
{{ Form::label('audit_warning_days', trans('admin/settings/general.audit_warning_days')) }}
-
+
{{ trans('general.days') }}
@@ -150,7 +150,7 @@
{{ Form::label('due_checkin_days', trans('admin/settings/general.due_checkin_days')) }}
-
+
{{ trans('general.days') }}
From 5ccaf2c23e26409f7efaa91f4a126286314da367 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 15 Jan 2025 12:23:43 -0800 Subject: [PATCH 10/67] Replace Form::text in certain views --- resources/views/custom_fields/fields/edit.blade.php | 6 +++--- resources/views/custom_fields/fieldsets/view.blade.php | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php index 12c3a3fb73..ece591cb40 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 b73ae708c6..ae19bd4990 100644 --- a/resources/views/custom_fields/fieldsets/view.blade.php +++ b/resources/views/custom_fields/fieldsets/view.blade.php @@ -103,7 +103,7 @@
From 0ef20c524fcaeb5051ac1b5bd0ad3c2bafe26ad1 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 15 Jan 2025 13:01:32 -0800 Subject: [PATCH 11/67] Replace Form::text in certain views --- resources/views/partials/forms/edit/phone.blade.php | 2 +- resources/views/settings/asset_tags.blade.php | 8 ++++---- resources/views/settings/branding.blade.php | 7 +++---- resources/views/settings/general.blade.php | 10 +++++----- resources/views/settings/google.blade.php | 1 + 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/views/partials/forms/edit/phone.blade.php b/resources/views/partials/forms/edit/phone.blade.php index 1a9d407a15..334bd22950 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/asset_tags.blade.php b/resources/views/settings/asset_tags.blade.php index 020d97a756..621306724e 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 c586917ef5..ab1c6e5e43 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 1de5d4035d..b8a32f8685 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 83e88b936f..c6c9bcb425 100644 --- a/resources/views/settings/google.blade.php +++ b/resources/views/settings/google.blade.php @@ -69,6 +69,7 @@
{{ 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') }}

From 8e790fdc4740dd4b3378b32d2e92c3d27939ac99 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 15 Jan 2025 13:37:00 -0800 Subject: [PATCH 12/67] Replace Form::text in certain views --- resources/views/settings/google.blade.php | 15 ++++-- resources/views/settings/labels.blade.php | 60 +++++++++++++---------- 2 files changed, 45 insertions(+), 30 deletions(-) diff --git a/resources/views/settings/google.blade.php b/resources/views/settings/google.blade.php index c6c9bcb425..83b9501560 100644 --- a/resources/views/settings/google.blade.php +++ b/resources/views/settings/google.blade.php @@ -68,8 +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') }}

@@ -85,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 fa8c5dc858..6b52bbdad1 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', '') !!}

{!! 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', '') !!} @@ -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', '') !!}
@@ -362,7 +370,7 @@
- {{ 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 @@
- {{ 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 @@
- {{ 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 @@
- {{ 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 @@
- {{ 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') }}
From c2789005818ab0dfbd89c92c86e74b519cc07704 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 15 Jan 2025 15:58:33 -0800 Subject: [PATCH 13/67] Replace Form::text in certain views --- resources/views/settings/ldap.blade.php | 26 +++++++++---------- .../views/settings/localization.blade.php | 11 +++++++- resources/views/settings/purge-form.blade.php | 4 +-- 3 files changed, 25 insertions(+), 16 deletions(-) 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) From 68988524d6733f6c8043437cd1ac60dadeb3566c Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 15 Jan 2025 16:31:16 -0800 Subject: [PATCH 14/67] Replace Form::text in certain views --- resources/views/settings/saml.blade.php | 10 +++++----- resources/views/setup/user.blade.php | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php index 9349023fc8..81c40bb307 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/setup/user.blade.php b/resources/views/setup/user.blade.php index b35060b01f..3c6e5cd66a 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', '') !!}
From 79a4c8387955e4c20b20aad6de60a1bfe665d127 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 16 Jan 2025 13:23:16 -0800 Subject: [PATCH 15/67] add spaces --- resources/views/settings/labels.blade.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php index 4e17a77b37..488fce1ee7 100644 --- a/resources/views/settings/labels.blade.php +++ b/resources/views/settings/labels.blade.php @@ -26,6 +26,7 @@
+

@@ -34,6 +35,7 @@

+
From 0eb34cb979edfe5f0eca927a4dc6f0f41994ea32 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 16 Jan 2025 13:24:32 -0800 Subject: [PATCH 16/67] adds period to translation --- resources/lang/en-US/admin/settings/message.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/lang/en-US/admin/settings/message.php b/resources/lang/en-US/admin/settings/message.php index 727b27b021..c0cd209793 100644 --- a/resources/lang/en-US/admin/settings/message.php +++ b/resources/lang/en-US/admin/settings/message.php @@ -37,7 +37,7 @@ return [ 'authentication_success' => 'User authenticated against LDAP successfully!' ], 'labels' => [ - 'null_template' => 'Label template not found, Please select a template.', + 'null_template' => 'Label template not found. Please select a template.', ], 'webhook' => [ 'sending' => 'Sending :app test message...', From c3310a0772cf1d7c1a9dc0c7f9017e28fe245cc3 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 5 Feb 2025 10:38:16 -0800 Subject: [PATCH 17/67] adds translations to LDAP settings page --- resources/lang/en-US/admin/settings/general.php | 4 ++++ resources/views/settings/ldap.blade.php | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index 97567df8df..23ce32fe73 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -330,6 +330,10 @@ return [ 'purge_help' => 'Purge Deleted Records', 'ldap_extension_warning' => 'It does not look like the LDAP extension is installed or enabled on this server. You can still save your settings, but you will need to enable the LDAP extension for PHP before LDAP syncing or login will work.', 'ldap_ad' => 'LDAP/AD', + 'ldap_test_label' => 'Test LDAP Sync', + 'ldap_test_login' => ' Test LDAP Login', + 'ldap_username_placeholder' => 'LDAP Username', + 'ldap_password_placeholder' => 'LDAP Password', 'employee_number' => 'Employee Number', 'create_admin_user' => 'Create a User ::', 'create_admin_success' => 'Success! Your admin user has been added!', diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php index 86a091252f..6a07ce26a0 100644 --- a/resources/views/settings/ldap.blade.php +++ b/resources/views/settings/ldap.blade.php @@ -733,7 +733,7 @@
- {{ Form::label('test_ldap_sync', 'Test LDAP Sync') }} +
{{ trans('admin/settings/general.ldap_test_sync') }} @@ -757,15 +757,15 @@
- {{ Form::label('test_ldap_login', 'Test LDAP Login') }} +
- +
- +
{{ trans('admin/settings/general.ldap_test') }} From f2981cf12ba91ec8fd17f70d94e9ea9cb0dca5c1 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 5 Feb 2025 10:55:05 -0800 Subject: [PATCH 18/67] adds translations to label settings --- resources/lang/en-US/general.php | 3 +++ .../label2-field-definitions.blade.php | 26 +++++++++---------- .../views/partials/label2-preview.blade.php | 2 +- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index 77670b5a7e..ef6cc47cd7 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -92,6 +92,7 @@ return [ 'customize_report' => 'Customize Report', 'custom_report' => 'Custom Asset Report', 'dashboard' => 'Dashboard', + 'data_source' => 'Data Source', 'days' => 'days', 'days_to_next_audit' => 'Days to Next Audit', 'date' => 'Date', @@ -217,6 +218,8 @@ return [ 'no' => 'No', 'notes' => 'Notes', 'note_added' => 'Note Added', + 'options' => 'Options', + 'preview' => 'Preview', 'add_note' => 'Add Note', 'note_edited' => 'Note Edited', 'edit_note' => 'Edit Note', diff --git a/resources/views/partials/label2-field-definitions.blade.php b/resources/views/partials/label2-field-definitions.blade.php index efae291d2e..bcb979d01e 100644 --- a/resources/views/partials/label2-field-definitions.blade.php +++ b/resources/views/partials/label2-field-definitions.blade.php @@ -258,7 +258,7 @@
-

Fields

+

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