From a26279e0b9db5c4bafaf4748744b999239ad69f9 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 23 Apr 2025 12:38:58 -0700 Subject: [PATCH 01/10] adds custom field link color correction to all dark modes --- resources/assets/less/skins/skin-blue-dark.less | 13 +++++++++++-- resources/assets/less/skins/skin-green-dark.less | 11 ++++++++++- resources/assets/less/skins/skin-orange-dark.less | 11 ++++++++++- resources/assets/less/skins/skin-purple-dark.less | 12 ++++++++++++ resources/assets/less/skins/skin-red-dark.less | 11 ++++++++++- resources/assets/less/skins/skin-yellow-dark.less | 12 ++++++++++++ 6 files changed, 65 insertions(+), 5 deletions(-) diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less index e10b111e4..375e181ab 100644 --- a/resources/assets/less/skins/skin-blue-dark.less +++ b/resources/assets/less/skins/skin-blue-dark.less @@ -380,7 +380,7 @@ input[type=text], input[type=search] { background-color: var(--back-sub); } .table-striped>tbody>tr:nth-of-type(even){ - background-color: var(--back-sub-alt); + background-color: var(--back-main); } #webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header { color: var(--text-main); @@ -404,7 +404,16 @@ a { } } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets']{ background-color: transparent; diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less index 02b6fda11..87c61b817 100644 --- a/resources/assets/less/skins/skin-green-dark.less +++ b/resources/assets/less/skins/skin-green-dark.less @@ -391,7 +391,16 @@ a { } } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets']{ background-color: transparent; diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less index 4e0badac8..51d868600 100644 --- a/resources/assets/less/skins/skin-orange-dark.less +++ b/resources/assets/less/skins/skin-orange-dark.less @@ -389,7 +389,16 @@ input[type=text], input[type=search] { border-bottom: #000; } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets']{ background-color: transparent; diff --git a/resources/assets/less/skins/skin-purple-dark.less b/resources/assets/less/skins/skin-purple-dark.less index 272bade83..cdeb471a4 100644 --- a/resources/assets/less/skins/skin-purple-dark.less +++ b/resources/assets/less/skins/skin-purple-dark.less @@ -414,6 +414,18 @@ a { display: table; } +#customFieldsTable a[href*='/models'] { + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--back-sub); + color: var(--visited-link); +} .row-striped .row:nth-of-type(odd) div { background-color: var(--back-sub); diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index 6c6e1b44f..c5d3c3e57 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -409,7 +409,16 @@ a { } } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--back-sub); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets']{ background-color: transparent; diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less index 7fb8a03bb..7f790ef7e 100644 --- a/resources/assets/less/skins/skin-yellow-dark.less +++ b/resources/assets/less/skins/skin-yellow-dark.less @@ -383,6 +383,18 @@ tr th div.th-inner { .box-header.with-border { border-bottom: #000; } +#customFieldsTable a[href*='/models'] { + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); +} .row-striped { vertical-align: top; From 25fdde180710bbcafc2dd8c029c018792a03026c Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Wed, 23 Apr 2025 14:16:28 -0700 Subject: [PATCH 02/10] Handle null category --- app/Listeners/CheckoutableListener.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php index 2bf93afc9..75c2806a2 100644 --- a/app/Listeners/CheckoutableListener.php +++ b/app/Listeners/CheckoutableListener.php @@ -397,7 +397,7 @@ class CheckoutableListener default => null, }; - if (!$category->checkin_email) { + if (!$category?->checkin_email) { return true; } return false; From 89a52b7551029811b07e9ce98591cf54d503e0dd Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 29 Apr 2025 18:09:32 +0100 Subject: [PATCH 03/10] Fixed fieldset display if custom fields are not available Signed-off-by: snipe --- app/Models/CustomField.php | 39 ++++++++++++++++++- app/Models/CustomFieldset.php | 14 +++++++ resources/views/hardware/audit.blade.php | 12 +++--- resources/views/hardware/checkin.blade.php | 2 +- resources/views/hardware/checkout.blade.php | 2 +- .../views/models/custom_fields_form.blade.php | 19 ++++----- .../partials/forms/edit/warranty.blade.php | 2 +- 7 files changed, 68 insertions(+), 22 deletions(-) diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php index 4954e2f17..a852e42b6 100644 --- a/app/Models/CustomField.php +++ b/app/Models/CustomField.php @@ -183,7 +183,44 @@ class CustomField extends Model { return $this->belongsToMany(\App\Models\CustomFieldset::class); } - + + public function displayFieldInCheckinForm() + { + if ($this->display_checkin == '1') { + return true; + } + return false; + } + + public function displayFieldInCheckoutForm() + { + if ($this->display_checkout == '1') { + return true; + } + return false; + } + + public function displayFieldInAuditForm() + { + if ($this->display_audit == '1') { + return true; + } + return false; + } + + public function displayFieldInCurrentForm($form_type = null) + { + switch ($form_type) { + case 'audit': + return $this->displayFieldInAuditForm(); + case 'checkin': + return $this->displayFieldInCheckinForm(); + case 'checkin': + return $this->displayFieldInCheckoutForm(); + } + } + + public function assetModels() { return $this->fieldset()->with('models')->get()->pluck('models')->flatten()->unique('id'); diff --git a/app/Models/CustomFieldset.php b/app/Models/CustomFieldset.php index d6bd7a1be..987eb3b7d 100644 --- a/app/Models/CustomFieldset.php +++ b/app/Models/CustomFieldset.php @@ -71,6 +71,20 @@ class CustomFieldset extends Model return $this->belongsTo(\App\Models\User::class); //WARNING - not all CustomFieldsets have a User!! } + public function displayAnyFieldsInForm($form_type = null) + { + switch ($form_type) { + case 'audit': + return $this->displayFieldInAuditForm(); + case 'checkin': + return $this->displayFieldInCheckinForm(); + case 'checkout': + return $this->displayFieldInCheckoutForm(); + default: + return true; + } + } + /** * Determine the validation rules we should apply based on the * custom field format diff --git a/resources/views/hardware/audit.blade.php b/resources/views/hardware/audit.blade.php index 72be0e833..d3560a9a0 100644 --- a/resources/views/hardware/audit.blade.php +++ b/resources/views/hardware/audit.blade.php @@ -115,12 +115,6 @@ - - @include("models/custom_fields_form", [ - 'model' => $asset->model, - 'show_display_checkout_fields' => 'true' - ]) -
@@ -136,6 +130,12 @@ @include ('partials.forms.edit.image-upload', ['help_text' => trans('general.audit_images_help')]) + + @include("models/custom_fields_form", [ + 'model' => $asset->model, + 'show_custom_fields_type' => 'audit' + ]) +
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php index 93f3197cb..2137c11ca 100755 --- a/resources/views/hardware/checkin.blade.php +++ b/resources/views/hardware/checkin.blade.php @@ -142,7 +142,7 @@ @include("models/custom_fields_form", [ 'model' => $asset->model, - 'show_display_checkin_fields' => 'true' + 'show_custom_fields_type' => 'checkin' ]) diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index b237a2d00..3aedbfd05 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -145,7 +145,7 @@ @include("models/custom_fields_form", [ 'model' => $asset->model, - 'show_display_checkout_fields' => 'true' + 'show_custom_fields_type' => 'checkout' ]) diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php index 27718bc77..929c5fbea 100644 --- a/resources/views/models/custom_fields_form.blade.php +++ b/resources/views/models/custom_fields_form.blade.php @@ -1,25 +1,21 @@ -@if (($model) && ($model->fieldset)) +@if (($model) && ($model->fieldset) && $model->fieldset->displayAnyFieldsInForm($show_custom_fields_type ?? ''))
+
{{ trans('admin/custom_fields/general.custom_fields') }} - @foreach($model->fieldset->fields AS $field) - @if ( - ((!isset($show_display_checkin_fields)) - || (($field->display_checkin == '1') - && ($show_display_checkin_fields =='true'))) && - ((!isset($show_display_checkout_fields)) - || (($field->display_checkout == '1') - && ($show_display_checkout_fields =='true'))) - ) + @foreach($model->fieldset->fields as $field) + @if (!isset($show_custom_fields_type) || ($field->displayFieldInCurrentForm($show_custom_fields_type))) +
@@ -105,9 +101,8 @@
@endif -
- @endif + @endif @endforeach
diff --git a/resources/views/partials/forms/edit/warranty.blade.php b/resources/views/partials/forms/edit/warranty.blade.php index eaa422228..de4beaf2f 100644 --- a/resources/views/partials/forms/edit/warranty.blade.php +++ b/resources/views/partials/forms/edit/warranty.blade.php @@ -2,7 +2,7 @@
-
+
{{ trans('admin/hardware/form.months') }}
From d1085a0f4682739f8d936f4dc0fcc82cab249928 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 29 Apr 2025 18:53:31 +0100 Subject: [PATCH 04/10] Move notes above custom fields Signed-off-by: snipe --- app/Models/CustomFieldset.php | 26 +++++++++++------- resources/views/hardware/checkin.blade.php | 29 +++++++++------------ resources/views/hardware/checkout.blade.php | 16 +++++++----- 3 files changed, 39 insertions(+), 32 deletions(-) diff --git a/app/Models/CustomFieldset.php b/app/Models/CustomFieldset.php index 987eb3b7d..c06f4dc0e 100644 --- a/app/Models/CustomFieldset.php +++ b/app/Models/CustomFieldset.php @@ -73,16 +73,24 @@ class CustomFieldset extends Model public function displayAnyFieldsInForm($form_type = null) { - switch ($form_type) { - case 'audit': - return $this->displayFieldInAuditForm(); - case 'checkin': - return $this->displayFieldInCheckinForm(); - case 'checkout': - return $this->displayFieldInCheckoutForm(); - default: - return true; + if ($this->fields) { + // \Log::error(print_r($this->fields, true)); + \Log::error($this->fields->where('display_audit', '1')->count()); + \Log::error($this->fields->where('display_checkin', '1')->count()); + \Log::error($this->fields->where('display_checkout', '1')->count()); + switch ($form_type) { + case 'audit': + return $this->fields->where('display_audit', '1')->count() > 0; + case 'checkin': + return $this->fields->where('display_checkin', '1')->count() > 0; + case 'checkout': + return $this->fields->where('display_checkout', '1')->count() > 0; + default: + return true; + } } + + return false; } /** diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php index 2137c11ca..4367d79b8 100755 --- a/resources/views/hardware/checkin.blade.php +++ b/resources/views/hardware/checkin.blade.php @@ -139,6 +139,19 @@
+ +
+ +
+ + {!! $errors->first('note', '') !!} +
+
+ + @include("models/custom_fields_form", [ 'model' => $asset->model, @@ -146,22 +159,6 @@ ]) - - - - - - -
- -
- - {!! $errors->first('note', '') !!} -
-
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php index 3aedbfd05..ac5c8022e 100755 --- a/resources/views/hardware/checkout.blade.php +++ b/resources/views/hardware/checkout.blade.php @@ -142,12 +142,6 @@ - - @include("models/custom_fields_form", [ - 'model' => $asset->model, - 'show_custom_fields_type' => 'checkout' - ]) -
+ + + @include("models/custom_fields_form", [ + 'model' => $asset->model, + 'show_custom_fields_type' => 'checkout' + ]) + + @if ($asset->requireAcceptance() || $asset->getEula() || ($snipeSettings->webhook_endpoint!=''))
From e717f1e7802a35e1f2fa32c0679223382e6ab542 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 29 Apr 2025 19:21:18 +0100 Subject: [PATCH 05/10] Removed logging Signed-off-by: snipe --- app/Models/CustomFieldset.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/Models/CustomFieldset.php b/app/Models/CustomFieldset.php index c06f4dc0e..bf0481768 100644 --- a/app/Models/CustomFieldset.php +++ b/app/Models/CustomFieldset.php @@ -74,10 +74,7 @@ class CustomFieldset extends Model public function displayAnyFieldsInForm($form_type = null) { if ($this->fields) { - // \Log::error(print_r($this->fields, true)); - \Log::error($this->fields->where('display_audit', '1')->count()); - \Log::error($this->fields->where('display_checkin', '1')->count()); - \Log::error($this->fields->where('display_checkout', '1')->count()); + switch ($form_type) { case 'audit': return $this->fields->where('display_audit', '1')->count() > 0; From f26e27d23e34f28d941f8096b4f28ff3171fc999 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 29 Apr 2025 19:21:50 +0100 Subject: [PATCH 06/10] Display in checkboxes not saving on custom [sc-29028] Signed-off-by: snipe --- app/Models/CustomField.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php index a852e42b6..44746142d 100644 --- a/app/Models/CustomField.php +++ b/app/Models/CustomField.php @@ -79,6 +79,9 @@ class CustomField extends Model 'auto_add_to_fieldsets', 'show_in_listview', 'show_in_email', + 'display_checkout', + 'display_checkin', + 'display_audit', 'show_in_requestable_list', ]; From 184a22828fa3d34b3784d4ed4707be9de5d6bef4 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 29 Apr 2025 19:22:10 +0100 Subject: [PATCH 07/10] Use input vs get Signed-off-by: snipe --- .../Controllers/CustomFieldsController.php | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/app/Http/Controllers/CustomFieldsController.php b/app/Http/Controllers/CustomFieldsController.php index 4c63179d5..b33b6ddd6 100644 --- a/app/Http/Controllers/CustomFieldsController.php +++ b/app/Http/Controllers/CustomFieldsController.php @@ -83,30 +83,30 @@ class CustomFieldsController extends Controller { $this->authorize('create', CustomField::class); - $show_in_email = $request->get("show_in_email", 0); - $display_in_user_view = $request->get("display_in_user_view", 0); + $show_in_email = $request->input("show_in_email", 0); + $display_in_user_view = $request->input("display_in_user_view", 0); // Override the display settings if the field is encrypted - if ($request->get("field_encrypted") == '1') { + if ($request->input("field_encrypted") == '1') { $show_in_email = '0'; $display_in_user_view = '0'; } - + $field = new CustomField([ - "name" => trim($request->get("name")), - "element" => $request->get("element"), - "help_text" => $request->get("help_text"), - "field_values" => $request->get("field_values"), - "field_encrypted" => $request->get("field_encrypted", 0), + "name" => trim($request->input("name")), + "element" => $request->input("element"), + "help_text" => $request->input("help_text"), + "field_values" => $request->input("field_values"), + "field_encrypted" => $request->input("field_encrypted", 0), "show_in_email" => $show_in_email, - "is_unique" => $request->get("is_unique", 0), + "is_unique" => $request->input("is_unique", 0), "display_in_user_view" => $display_in_user_view, - "auto_add_to_fieldsets" => $request->get("auto_add_to_fieldsets", 0), - "show_in_listview" => $request->get("show_in_listview", 0), - "show_in_requestable_list" => $request->get("show_in_requestable_list", 0), - "display_checkin" => $request->get("display_checkin", 0), - "display_checkout" => $request->get("display_checkout", 0), - "display_audit" => $request->get("display_audit", 0), + "auto_add_to_fieldsets" => $request->input("auto_add_to_fieldsets", 0), + "show_in_listview" => $request->input("show_in_listview", 0), + "show_in_requestable_list" => $request->input("show_in_requestable_list", 0), + "display_checkin" => $request->input("display_checkin", 0), + "display_checkout" => $request->input("display_checkout", 0), + "display_audit" => $request->input("display_audit", 0), "created_by" => auth()->id() ]); From 3e3bc0a3470ad7d2a81ac952eba5755da9a1c061 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 29 Apr 2025 20:01:22 +0100 Subject: [PATCH 08/10] Removed test tab Signed-off-by: snipe --- resources/views/account/view-assets.blade.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 68749ae2a..038aaae1c 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -702,9 +702,6 @@
-
-

fdlkgjljg

-
From c7835d2d1da6466ce7ff58179c897bfadba8a910 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 29 Apr 2025 20:08:34 +0100 Subject: [PATCH 09/10] Fixed copypasta Signed-off-by: snipe --- app/Models/CustomField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/CustomField.php b/app/Models/CustomField.php index 44746142d..b3742882a 100644 --- a/app/Models/CustomField.php +++ b/app/Models/CustomField.php @@ -218,7 +218,7 @@ class CustomField extends Model return $this->displayFieldInAuditForm(); case 'checkin': return $this->displayFieldInCheckinForm(); - case 'checkin': + case 'checkout': return $this->displayFieldInCheckoutForm(); } } From 8d4fc07f636095e34c0c15fb440b5e5ea1182c78 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 29 Apr 2025 20:37:47 +0100 Subject: [PATCH 10/10] Updated dev assets Signed-off-by: snipe --- public/css/dist/skins/_all-skins.css | 70 +++++++++++++++++-- public/css/dist/skins/_all-skins.min.css | 70 +++++++++++++++++-- public/css/dist/skins/skin-blue-dark.css | 13 +++- public/css/dist/skins/skin-blue-dark.min.css | 13 +++- public/css/dist/skins/skin-green-dark.css | 11 ++- public/css/dist/skins/skin-green-dark.min.css | 11 ++- public/css/dist/skins/skin-orange-dark.css | 11 ++- .../css/dist/skins/skin-orange-dark.min.css | 11 ++- public/css/dist/skins/skin-purple-dark.css | 12 ++++ .../css/dist/skins/skin-purple-dark.min.css | 12 ++++ public/css/dist/skins/skin-red-dark.css | 11 ++- public/css/dist/skins/skin-red-dark.min.css | 11 ++- public/css/dist/skins/skin-yellow-dark.css | 12 ++++ .../css/dist/skins/skin-yellow-dark.min.css | 12 ++++ public/mix-manifest.json | 28 ++++---- 15 files changed, 274 insertions(+), 34 deletions(-) diff --git a/public/css/dist/skins/_all-skins.css b/public/css/dist/skins/_all-skins.css index e2af07122..4d6faf465 100644 --- a/public/css/dist/skins/_all-skins.css +++ b/public/css/dist/skins/_all-skins.css @@ -1498,7 +1498,7 @@ input[type=search] { background-color: var(--back-sub); } .table-striped > tbody > tr:nth-of-type(even) { - background-color: var(--back-sub-alt); + background-color: var(--back-main); } #webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa, .box-body, @@ -1523,7 +1523,16 @@ a:visited { color: var(--visited-link); } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; @@ -2480,7 +2489,16 @@ a:visited { color: var(--visited-link); } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; @@ -3002,7 +3020,16 @@ input[type=search] { border-bottom: #000; } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; @@ -3749,6 +3776,18 @@ a:visited { box-sizing: border-box; display: table; } +#customFieldsTable a[href*='/models'] { + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--back-sub); + color: var(--visited-link); +} .row-striped .row:nth-of-type(odd) div { background-color: var(--back-sub); color: var(--text-main); @@ -4488,7 +4527,16 @@ a:visited { color: var(--nav-link); } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--back-sub); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; @@ -5410,6 +5458,18 @@ tr th div.th-inner { .box-header.with-border { border-bottom: #000; } +#customFieldsTable a[href*='/models'] { + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); +} .row-striped { vertical-align: top; line-height: 2.6; diff --git a/public/css/dist/skins/_all-skins.min.css b/public/css/dist/skins/_all-skins.min.css index e2af07122..4d6faf465 100644 --- a/public/css/dist/skins/_all-skins.min.css +++ b/public/css/dist/skins/_all-skins.min.css @@ -1498,7 +1498,7 @@ input[type=search] { background-color: var(--back-sub); } .table-striped > tbody > tr:nth-of-type(even) { - background-color: var(--back-sub-alt); + background-color: var(--back-main); } #webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa, .box-body, @@ -1523,7 +1523,16 @@ a:visited { color: var(--visited-link); } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; @@ -2480,7 +2489,16 @@ a:visited { color: var(--visited-link); } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; @@ -3002,7 +3020,16 @@ input[type=search] { border-bottom: #000; } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; @@ -3749,6 +3776,18 @@ a:visited { box-sizing: border-box; display: table; } +#customFieldsTable a[href*='/models'] { + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--back-sub); + color: var(--visited-link); +} .row-striped .row:nth-of-type(odd) div { background-color: var(--back-sub); color: var(--text-main); @@ -4488,7 +4527,16 @@ a:visited { color: var(--nav-link); } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--back-sub); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; @@ -5410,6 +5458,18 @@ tr th div.th-inner { .box-header.with-border { border-bottom: #000; } +#customFieldsTable a[href*='/models'] { + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); +} .row-striped { vertical-align: top; line-height: 2.6; diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css index 4290f090b..f1d73528a 100644 --- a/public/css/dist/skins/skin-blue-dark.css +++ b/public/css/dist/skins/skin-blue-dark.css @@ -467,7 +467,7 @@ input[type=search] { background-color: var(--back-sub); } .table-striped > tbody > tr:nth-of-type(even) { - background-color: var(--back-sub-alt); + background-color: var(--back-main); } #webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa, .box-body, @@ -492,7 +492,16 @@ a:visited { color: var(--visited-link); } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css index 4290f090b..f1d73528a 100644 --- a/public/css/dist/skins/skin-blue-dark.min.css +++ b/public/css/dist/skins/skin-blue-dark.min.css @@ -467,7 +467,7 @@ input[type=search] { background-color: var(--back-sub); } .table-striped > tbody > tr:nth-of-type(even) { - background-color: var(--back-sub-alt); + background-color: var(--back-main); } #webui > div > div > div > div > div > table > tbody > tr > td > a > i.fa, .box-body, @@ -492,7 +492,16 @@ a:visited { color: var(--visited-link); } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css index af11e5739..fd0990c84 100644 --- a/public/css/dist/skins/skin-green-dark.css +++ b/public/css/dist/skins/skin-green-dark.css @@ -479,7 +479,16 @@ a:visited { color: var(--visited-link); } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css index af11e5739..fd0990c84 100644 --- a/public/css/dist/skins/skin-green-dark.min.css +++ b/public/css/dist/skins/skin-green-dark.min.css @@ -479,7 +479,16 @@ a:visited { color: var(--visited-link); } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css index 58a0afd1f..a499800a2 100644 --- a/public/css/dist/skins/skin-orange-dark.css +++ b/public/css/dist/skins/skin-orange-dark.css @@ -480,7 +480,16 @@ input[type=search] { border-bottom: #000; } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css index 58a0afd1f..a499800a2 100644 --- a/public/css/dist/skins/skin-orange-dark.min.css +++ b/public/css/dist/skins/skin-orange-dark.min.css @@ -480,7 +480,16 @@ input[type=search] { border-bottom: #000; } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css index 0517db814..348d6b67c 100644 --- a/public/css/dist/skins/skin-purple-dark.css +++ b/public/css/dist/skins/skin-purple-dark.css @@ -500,6 +500,18 @@ a:visited { box-sizing: border-box; display: table; } +#customFieldsTable a[href*='/models'] { + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--back-sub); + color: var(--visited-link); +} .row-striped .row:nth-of-type(odd) div { background-color: var(--back-sub); color: var(--text-main); diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css index 0517db814..348d6b67c 100644 --- a/public/css/dist/skins/skin-purple-dark.min.css +++ b/public/css/dist/skins/skin-purple-dark.min.css @@ -500,6 +500,18 @@ a:visited { box-sizing: border-box; display: table; } +#customFieldsTable a[href*='/models'] { + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--back-sub); + color: var(--visited-link); +} .row-striped .row:nth-of-type(odd) div { background-color: var(--back-sub); color: var(--text-main); diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css index 2b87b2b92..fea82c2f0 100644 --- a/public/css/dist/skins/skin-red-dark.css +++ b/public/css/dist/skins/skin-red-dark.css @@ -498,7 +498,16 @@ a:visited { color: var(--nav-link); } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--back-sub); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css index 2b87b2b92..fea82c2f0 100644 --- a/public/css/dist/skins/skin-red-dark.min.css +++ b/public/css/dist/skins/skin-red-dark.min.css @@ -498,7 +498,16 @@ a:visited { color: var(--nav-link); } #customFieldsTable a[href*='/models'] { - color: var(--back-sub); + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--back-sub); + color: var(--visited-link); } #customFieldsTable a[href*='/fieldsets'] { background-color: transparent; diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css index 119afcd4f..6d627a856 100644 --- a/public/css/dist/skins/skin-yellow-dark.css +++ b/public/css/dist/skins/skin-yellow-dark.css @@ -456,6 +456,18 @@ tr th div.th-inner { .box-header.with-border { border-bottom: #000; } +#customFieldsTable a[href*='/models'] { + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); +} .row-striped { vertical-align: top; line-height: 2.6; diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css index 119afcd4f..6d627a856 100644 --- a/public/css/dist/skins/skin-yellow-dark.min.css +++ b/public/css/dist/skins/skin-yellow-dark.min.css @@ -456,6 +456,18 @@ tr th div.th-inner { .box-header.with-border { border-bottom: #000; } +#customFieldsTable a[href*='/models'] { + background-color: var(--back-sub-alt); + color: var(--link); +} +#customFieldsTable a[href*='/models']:hover { + background-color: var(--text-sub); + color: var(--button-hover); +} +#customFieldsTable a[href*='/models']:visited { + background-color: var(--background); + color: var(--visited-link); +} .row-striped { vertical-align: top; line-height: 2.6; diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 11b2bcd7a..ecff1c4c3 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,23 +1,23 @@ { "/js/build/app.js": "/js/build/app.js?id=19253af36b58ed3fb6770c7bb944f079", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=06c13e817cc022028b3f4a33c0ca303a", - "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=79aa889a1a6691013be6c342ca7391cd", + "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=3955411f214d1aa011fd509b6c81fbea", "/css/build/overrides.css": "/css/build/overrides.css?id=2bfc7b71d951c5ac026dbc034f7373b1", "/css/build/app.css": "/css/build/app.css?id=4b4c2f1225d59efa7a22b76f7bbe39d8", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=4ea0068716c1bb2434d87a16d51b98c9", "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690", - "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=ea22079836a432d7f46a5d390c445e13", + "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=5bbc74fa36ad7e85114e95c99f244421", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=05cc02539441b717012c4efc3303192f", + "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=b70f0d0cf76a643b3fbf47a1dfdb1529", "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=6fe68325d5356197672c27bc77cedcb4", - "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=fca90dff303e17dc2991ca395c7f7fa8", + "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=25f255bc860b5472b201ef700fd638a8", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", - "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=71b7731f7ae692eada36b9b08a2e04a9", + "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=07e257b423e6a8f984e1d9bf0bb04fe0", "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", - "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=bb302302d9566adf783a2b7dc31e840c", + "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=bb648ddce4bc923ac79205a78882248d", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=a82b065847bf3cd5d713c04ee8dc86c6", - "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=6ea836d8126de101081c49abbdb89417", + "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=e4facb3da382b3c6f040f7d0b738643d", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", "/css/dist/all.css": "/css/dist/all.css?id=12e96a25d0dc3ee39e9d3ce97044fbbf", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", @@ -92,21 +92,21 @@ "/css/webfonts/fa-v4compatibility.woff2": "/css/webfonts/fa-v4compatibility.woff2?id=331c85bd61ffa93af09273d1bc2add5a", "/js/dist/bootstrap-table-locale-all.min.js": "/js/dist/bootstrap-table-locale-all.min.js?id=5e93ef0a1889bed3f92a705dc1e92c9b", "/js/dist/bootstrap-table-en-US.min.js": "/js/dist/bootstrap-table-en-US.min.js?id=c0f21fb7e62d6f0a0153f1cdbf26782a", - "/css/dist/skins/_all-skins.min.css": "/css/dist/skins/_all-skins.min.css?id=79aa889a1a6691013be6c342ca7391cd", + "/css/dist/skins/_all-skins.min.css": "/css/dist/skins/_all-skins.min.css?id=3955411f214d1aa011fd509b6c81fbea", "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=06c13e817cc022028b3f4a33c0ca303a", "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=76482123f6c70e866d6b971ba91de7bb", - "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=6ea836d8126de101081c49abbdb89417", + "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=e4facb3da382b3c6f040f7d0b738643d", "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=a82b065847bf3cd5d713c04ee8dc86c6", "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=da6c7997d9de2f8329142399f0ce50da", - "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=bb302302d9566adf783a2b7dc31e840c", + "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=bb648ddce4bc923ac79205a78882248d", "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", - "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=71b7731f7ae692eada36b9b08a2e04a9", + "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=07e257b423e6a8f984e1d9bf0bb04fe0", "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", - "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=fca90dff303e17dc2991ca395c7f7fa8", + "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=25f255bc860b5472b201ef700fd638a8", "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=6fe68325d5356197672c27bc77cedcb4", - "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=05cc02539441b717012c4efc3303192f", + "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=b70f0d0cf76a643b3fbf47a1dfdb1529", "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=44bf834f2110504a793dadec132a5898", - "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=ea22079836a432d7f46a5d390c445e13", + "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=5bbc74fa36ad7e85114e95c99f244421", "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=7b315b9612b8fde8f9c5b0ddb6bba690", "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=54d676a6ea8677dd48f6c4b3041292cf", "/js/build/vendor.js": "/js/build/vendor.js?id=89dffa552c6e3abe3a2aac6c9c7b466b",