From 5c6757ecf6119bb332d8d9fccc1a546dd5c53498 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 5 Feb 2025 12:07:17 -0800 Subject: [PATCH 1/5] Migrate labels on quick checkin page --- resources/views/hardware/quickscan-checkin.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php index de892399cc..0fca07307a 100644 --- a/resources/views/hardware/quickscan-checkin.blade.php +++ b/resources/views/hardware/quickscan-checkin.blade.php @@ -31,7 +31,7 @@
- {{ Form::label('asset_tag', trans('general.asset_tag'), array('class' => 'col-md-3 control-label', 'id' => 'checkin_tag')) }} +
@@ -57,7 +57,7 @@
- {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }} +
{!! $errors->first('note', '') !!} From 478a5c0e1ab106fba9f13fe20c40fa054864c908 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 5 Feb 2025 12:12:43 -0800 Subject: [PATCH 2/5] Migrate labels on bulk audit pag --- resources/views/hardware/quickscan.blade.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.php index 867eeaa2b0..9daf656507 100644 --- a/resources/views/hardware/quickscan.blade.php +++ b/resources/views/hardware/quickscan.blade.php @@ -16,7 +16,7 @@ } - +
{{ Form::open(['method' => 'POST', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'audit-form' ]) }} @@ -29,7 +29,7 @@
- {{ Form::label('asset_tag', trans('general.asset_tag'), array('class' => 'col-md-3 control-label', 'id' => 'audit_tag')) }} +
@@ -60,7 +60,7 @@
- {{ Form::label('next_audit_date', trans('general.next_audit_date'), array('class' => 'col-md-3 control-label')) }} +
@@ -73,7 +73,7 @@
- {{ Form::label('note', trans('admin/hardware/form.notes'), array('class' => 'col-md-3 control-label')) }} +
{!! $errors->first('note', '') !!} @@ -101,7 +101,7 @@

{{ trans('general.bulkaudit_status') }} (0 {{ trans('general.assets_audited') }})

- + @@ -158,7 +158,7 @@ var audio = new Audio('{{ config('app.url') }}/sounds/success.mp3'); audio.play() @endif - + incrementOnSuccess(); } else { handleAuditFail(data); From d77547aecf11d9ac874f9944a898a4ef01c44734 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 5 Feb 2025 12:40:00 -0800 Subject: [PATCH 3/5] Migrate labels on slack component --- resources/views/livewire/slack-settings-form.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php index 76b3987229..48e0fb72ad 100644 --- a/resources/views/livewire/slack-settings-form.blade.php +++ b/resources/views/livewire/slack-settings-form.blade.php @@ -83,7 +83,7 @@
- {{ Form::label('webhook_endpoint', trans('admin/settings/general.webhook_endpoint',['app' => $webhook_name ])) }} +
@@ -100,7 +100,7 @@ @if($webhook_selected != 'microsoft' && $webhook_selected!= 'google')
- {{ Form::label('webhook_channel', trans('admin/settings/general.webhook_channel',['app' => $webhook_name ])) }} +
@@ -118,7 +118,7 @@ @if($webhook_selected != 'microsoft' && $webhook_selected != 'google')
- {{ Form::label('webhook_botname', trans('admin/settings/general.webhook_botname',['app' => $webhook_name ])) }} +
From 8b7c1a195cb970f2386d40b2c270a2c3edb5add3 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 5 Feb 2025 12:41:35 -0800 Subject: [PATCH 4/5] Migrate label on accessory select partial --- resources/views/partials/forms/edit/accessory-select.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/partials/forms/edit/accessory-select.blade.php b/resources/views/partials/forms/edit/accessory-select.blade.php index d34b6b2fe0..e047d16d2f 100644 --- a/resources/views/partials/forms/edit/accessory-select.blade.php +++ b/resources/views/partials/forms/edit/accessory-select.blade.php @@ -1,6 +1,6 @@
- {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }} +