From e6d792bdf7beadc0b3fcca613e5246cde10f934e Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 14 Jun 2022 17:43:12 -0700 Subject: [PATCH 1/3] Tweaked CSS for smaller padlock Signed-off-by: snipe --- public/css/build/app.css | 4 +++- public/css/build/overrides.css | 4 +++- public/css/dist/all.css | 8 ++++++-- public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 4 +++- 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index 0daa9c8ae..afbeacb39 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -886,7 +886,9 @@ th.css-padlock > .th-inner::before { content: "\f023"; font-family: "Font Awesome 5 Free"; font-weight: 400; - padding-right: 2px; + padding-right: 4px; + font-weight: 300; + font-size: 12px; } /** Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons). diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index bfe636aeb..c7b111aac 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -519,7 +519,9 @@ th.css-padlock > .th-inner::before { content: "\f023"; font-family: "Font Awesome 5 Free"; font-weight: 400; - padding-right: 2px; + padding-right: 4px; + font-weight: 300; + font-size: 12px; } /** Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons). diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 556248bf1..14ee8be7e 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -20428,7 +20428,9 @@ th.css-padlock > .th-inner::before { content: "\f023"; font-family: "Font Awesome 5 Free"; font-weight: 400; - padding-right: 2px; + padding-right: 4px; + font-weight: 300; + font-size: 12px; } /** Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons). @@ -21487,7 +21489,9 @@ th.css-padlock > .th-inner::before { content: "\f023"; font-family: "Font Awesome 5 Free"; font-weight: 400; - padding-right: 2px; + padding-right: 4px; + font-weight: 300; + font-size: 12px; } /** Set the font-weight css property as 900 (For Solid), 400 (Regular or Brands), 300 (Light for pro icons). diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 72db704a2..dcf06f079 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,8 +1,8 @@ { "/js/build/app.js": "/js/build/app.js?id=8b75d505c1bee38e1557", "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f577ce74b0dc04d0ec2b", - "/css/build/overrides.css": "/css/build/overrides.css?id=4fc3a0e0a16964643e70", - "/css/build/app.css": "/css/build/app.css?id=a7cd7ad6e0e053ccf443", + "/css/build/overrides.css": "/css/build/overrides.css?id=2921802af70bd9f0c247", + "/css/build/app.css": "/css/build/app.css?id=6c9a6e04ac7d56ee6fdb", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=65ca7a34198fa16ba846", "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=0715caf11a30f0756768", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=c17de79571bc6dc42112", @@ -18,7 +18,7 @@ "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=407f83d58689706f303a", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=6a9d0ac448c28b88e5d6", "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c17879493dcd86dbb6c1", - "/css/dist/all.css": "/css/dist/all.css?id=6f5411354ef775df6745", + "/css/dist/all.css": "/css/dist/all.css?id=9a1a8d0959114dcf722a", "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212", "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index fc5a358e2..b8a629065 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -596,7 +596,9 @@ th.css-accessory > .th-inner::before th.css-padlock > .th-inner::before { content: "\f023"; font-family: "Font Awesome 5 Free"; font-weight: 400; - padding-right: 2px; + padding-right: 4px; + font-weight: 300; + font-size: 12px; } /** From 6059e9e119555306630c520d28b3186f5d365511 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 14 Jun 2022 17:49:00 -0700 Subject: [PATCH 2/3] Added fullscreen option to tables Signed-off-by: snipe --- resources/views/accessories/index.blade.php | 1 + resources/views/accessories/view.blade.php | 1 + resources/views/asset_maintenances/index.blade.php | 1 + resources/views/categories/index.blade.php | 1 + resources/views/companies/index.blade.php | 1 + resources/views/components/index.blade.php | 1 + resources/views/consumables/index.blade.php | 1 + resources/views/departments/index.blade.php | 1 + resources/views/groups/index.blade.php | 1 + resources/views/hardware/audit-due.blade.php | 1 + resources/views/hardware/audit-overdue.blade.php | 1 + resources/views/hardware/index.blade.php | 1 + resources/views/hardware/view.blade.php | 4 ++++ resources/views/kits/index.blade.php | 1 + resources/views/licenses/index.blade.php | 1 + resources/views/licenses/view.blade.php | 1 + resources/views/locations/index.blade.php | 1 + resources/views/manufacturers/index.blade.php | 1 + resources/views/manufacturers/view.blade.php | 2 +- resources/views/models/view.blade.php | 1 + resources/views/partials/bootstrap-table.blade.php | 1 + resources/views/statuslabels/index.blade.php | 1 + resources/views/statuslabels/view.blade.php | 1 + resources/views/suppliers/index.blade.php | 1 + resources/views/suppliers/view.blade.php | 4 ++++ resources/views/users/index.blade.php | 1 + resources/views/users/view.blade.php | 6 ++++++ 27 files changed, 38 insertions(+), 1 deletion(-) diff --git a/resources/views/accessories/index.blade.php b/resources/views/accessories/index.blade.php index 07ed93bbd..52e970e9f 100755 --- a/resources/views/accessories/index.blade.php +++ b/resources/views/accessories/index.blade.php @@ -30,6 +30,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-show-footer="true" diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php index d8cc0ccbd..7132e7ede 100644 --- a/resources/views/accessories/view.blade.php +++ b/resources/views/accessories/view.blade.php @@ -81,6 +81,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" diff --git a/resources/views/asset_maintenances/index.blade.php b/resources/views/asset_maintenances/index.blade.php index 97ec2b207..69d3c2643 100644 --- a/resources/views/asset_maintenances/index.blade.php +++ b/resources/views/asset_maintenances/index.blade.php @@ -28,6 +28,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-footer="true" data-show-export="true" data-show-refresh="true" diff --git a/resources/views/categories/index.blade.php b/resources/views/categories/index.blade.php index 32610f910..dd186d360 100755 --- a/resources/views/categories/index.blade.php +++ b/resources/views/categories/index.blade.php @@ -30,6 +30,7 @@ data-show-footer="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" diff --git a/resources/views/companies/index.blade.php b/resources/views/companies/index.blade.php index d7a55367b..fd5cb9c65 100644 --- a/resources/views/companies/index.blade.php +++ b/resources/views/companies/index.blade.php @@ -28,6 +28,7 @@ data-show-columns="true" data-show-export="true" data-show-refresh="true" + data-show-fullscreen="true" data-sort-order="asc" id="companiesTable" class="table table-striped snipe-table" diff --git a/resources/views/components/index.blade.php b/resources/views/components/index.blade.php index 203609dcf..e92d49a01 100644 --- a/resources/views/components/index.blade.php +++ b/resources/views/components/index.blade.php @@ -26,6 +26,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-footer="true" data-show-refresh="true" diff --git a/resources/views/consumables/index.blade.php b/resources/views/consumables/index.blade.php index 2605ae135..5bf82ccb9 100644 --- a/resources/views/consumables/index.blade.php +++ b/resources/views/consumables/index.blade.php @@ -29,6 +29,7 @@ data-side-pagination="server" data-show-columns="true" data-show-export="true" + data-show-fullscreen="true" data-show-footer="true" data-show-refresh="true" data-sort-order="asc" diff --git a/resources/views/departments/index.blade.php b/resources/views/departments/index.blade.php index 05d17dfe1..fcdd23600 100644 --- a/resources/views/departments/index.blade.php +++ b/resources/views/departments/index.blade.php @@ -25,6 +25,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" diff --git a/resources/views/groups/index.blade.php b/resources/views/groups/index.blade.php index e62baa03b..ffc193c7c 100755 --- a/resources/views/groups/index.blade.php +++ b/resources/views/groups/index.blade.php @@ -28,6 +28,7 @@ data-show-columns="true" data-show-export="true" data-show-refresh="true" + data-show-fullscreen="true" data-sort-order="asc" data-sort-name="name" id="groupsTable" diff --git a/resources/views/hardware/audit-due.blade.php b/resources/views/hardware/audit-due.blade.php index cbbeb2fee..0232facd7 100644 --- a/resources/views/hardware/audit-due.blade.php +++ b/resources/views/hardware/audit-due.blade.php @@ -38,6 +38,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-footer="true" data-show-refresh="true" diff --git a/resources/views/hardware/audit-overdue.blade.php b/resources/views/hardware/audit-overdue.blade.php index 38d7d7935..ddd477fb2 100644 --- a/resources/views/hardware/audit-overdue.blade.php +++ b/resources/views/hardware/audit-overdue.blade.php @@ -36,6 +36,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-footer="true" data-show-refresh="true" diff --git a/resources/views/hardware/index.blade.php b/resources/views/hardware/index.blade.php index 78abec91e..6c4cb6936 100755 --- a/resources/views/hardware/index.blade.php +++ b/resources/views/hardware/index.blade.php @@ -84,6 +84,7 @@ data-show-refresh="true" data-sort-order="asc" data-sort-name="name" + data-show-fullscreen="true" data-toolbar="#assetsBulkEditToolbar" data-bulk-button-id="#bulkAssetEditButton" data-bulk-form-id="#assetsBulkForm" diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 0e8ae166c..bd3a6fd6e 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -1002,6 +1002,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" @@ -1053,6 +1054,7 @@ data-side-pagination="server" data-toolbar="#maintenance-toolbar" data-show-columns="true" + data-show-fullscreen="true" data-show-refresh="true" data-show-export="true" data-export-options='{ @@ -1079,6 +1081,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-refresh="true" data-sort-order="desc" data-sort-name="created_at" @@ -1126,6 +1129,7 @@ data-side-pagination="client" data-sortable="true" data-show-columns="true" + data-show-fullscreen="true" data-show-refresh="true" data-sort-order="desc" data-sort-name="created_at" diff --git a/resources/views/kits/index.blade.php b/resources/views/kits/index.blade.php index 3c25c7b22..d72d31928 100644 --- a/resources/views/kits/index.blade.php +++ b/resources/views/kits/index.blade.php @@ -27,6 +27,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" diff --git a/resources/views/licenses/index.blade.php b/resources/views/licenses/index.blade.php index 500453f76..f503d9d1e 100755 --- a/resources/views/licenses/index.blade.php +++ b/resources/views/licenses/index.blade.php @@ -31,6 +31,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-footer="true" data-show-refresh="true" diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php index 0248bbc75..0caa91008 100755 --- a/resources/views/licenses/view.blade.php +++ b/resources/views/licenses/view.blade.php @@ -411,6 +411,7 @@ data-search="false" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" diff --git a/resources/views/locations/index.blade.php b/resources/views/locations/index.blade.php index 3502c5713..4133f1a2f 100755 --- a/resources/views/locations/index.blade.php +++ b/resources/views/locations/index.blade.php @@ -29,6 +29,7 @@ data-show-footer="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" diff --git a/resources/views/manufacturers/index.blade.php b/resources/views/manufacturers/index.blade.php index 6f00ffb97..1f9ca175a 100755 --- a/resources/views/manufacturers/index.blade.php +++ b/resources/views/manufacturers/index.blade.php @@ -40,6 +40,7 @@ data-show-footer="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" diff --git a/resources/views/manufacturers/view.blade.php b/resources/views/manufacturers/view.blade.php index d7725bc49..2df9ffda4 100644 --- a/resources/views/manufacturers/view.blade.php +++ b/resources/views/manufacturers/view.blade.php @@ -102,7 +102,7 @@ data-bulk-button-id="#bulkAssetEditButton" data-bulk-form-id="#assetsBulkForm" data-search="true" - data-show-footer="true" + data-show-fullscreen="true" data-side-pagination="server" data-show-columns="true" data-show-export="true" diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php index b52805d15..2724632b9 100755 --- a/resources/views/models/view.blade.php +++ b/resources/views/models/view.blade.php @@ -56,6 +56,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-toolbar="#assetsBulkEditToolbar" data-bulk-button-id="#bulkAssetEditButton" data-bulk-form-id="#assetsBulkForm" diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index d71fe3253..5f25be43a 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -84,6 +84,7 @@ advancedSearchIcon: 'fas fa-search-plus', paginationSwitchDown: 'fa-caret-square-o-down', paginationSwitchUp: 'fa-caret-square-o-up', + fullscreen: 'fa-expand', columns: 'fa-columns', refresh: 'fas fa-sync-alt', export: 'fa-download', diff --git a/resources/views/statuslabels/index.blade.php b/resources/views/statuslabels/index.blade.php index a74bfeda8..77858b4da 100755 --- a/resources/views/statuslabels/index.blade.php +++ b/resources/views/statuslabels/index.blade.php @@ -33,6 +33,7 @@ data-side-pagination="server" data-show-columns="true" data-show-export="true" + data-show-fullscreen="true" data-show-refresh="true" data-sort-order="asc" data-sort-name="name" diff --git a/resources/views/statuslabels/view.blade.php b/resources/views/statuslabels/view.blade.php index 3ddacd147..a15fc8edd 100644 --- a/resources/views/statuslabels/view.blade.php +++ b/resources/views/statuslabels/view.blade.php @@ -22,6 +22,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" diff --git a/resources/views/suppliers/index.blade.php b/resources/views/suppliers/index.blade.php index 26109af88..894a6f459 100755 --- a/resources/views/suppliers/index.blade.php +++ b/resources/views/suppliers/index.blade.php @@ -29,6 +29,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" diff --git a/resources/views/suppliers/view.blade.php b/resources/views/suppliers/view.blade.php index 2282d8926..2e8eecdd7 100755 --- a/resources/views/suppliers/view.blade.php +++ b/resources/views/suppliers/view.blade.php @@ -98,6 +98,7 @@ data-show-columns="true" data-show-export="true" data-show-refresh="true" + data-show-fullscreen="true" data-sort-order="asc" data-toolbar="#assetsBulkEditToolbar" data-bulk-button-id="#bulkAssetEditButton" @@ -128,6 +129,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" @@ -155,6 +157,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" @@ -182,6 +185,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index d6f869b81..db90d1fb1 100755 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -50,6 +50,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="asc" diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index 2e7a6274b..b214d935d 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -586,6 +586,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-footer="true" data-show-refresh="true" @@ -615,6 +616,7 @@ data-pagination="true" data-side-pagination="client" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-footer="true" data-show-refresh="true" @@ -680,6 +682,7 @@ data-pagination="true" data-side-pagination="client" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-footer="true" data-show-refresh="true" @@ -726,6 +729,7 @@ data-pagination="true" data-side-pagination="client" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-footer="true" data-show-refresh="true" @@ -771,6 +775,7 @@ data-pagination="true" data-side-pagination="client" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-footer="true" data-toolbar="#upload-toolbar" @@ -863,6 +868,7 @@ data-search="true" data-side-pagination="server" data-show-columns="true" + data-show-fullscreen="true" data-show-export="true" data-show-refresh="true" data-sort-order="desc" From 74bc06cc49634565875f801b7759a484080ee58d Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 15 Jun 2022 02:07:58 -0700 Subject: [PATCH 3/3] Removed debugging code Signed-off-by: snipe --- app/Http/Transformers/AccessoriesTransformer.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Http/Transformers/AccessoriesTransformer.php b/app/Http/Transformers/AccessoriesTransformer.php index 158e430ab..6f254b3b8 100644 --- a/app/Http/Transformers/AccessoriesTransformer.php +++ b/app/Http/Transformers/AccessoriesTransformer.php @@ -68,8 +68,6 @@ class AccessoriesTransformer $array = []; foreach ($accessory_users as $user) { - \Log::debug(print_r($user->pivot, true)); - \Log::debug(print_r($user->pivot, true)); $array[] = [ 'assigned_pivot_id' => $user->pivot->id,