From a2035693e65e6d39528b22ea3e4c8963d3a85cb2 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 3 Apr 2025 12:28:30 +0100 Subject: [PATCH 1/9] Added licenseKeyFormatter Signed-off-by: snipe --- app/Presenters/LicensePresenter.php | 2 +- resources/views/partials/bootstrap-table.blade.php | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Presenters/LicensePresenter.php b/app/Presenters/LicensePresenter.php index f6ccafa8ac..351a9acea4 100644 --- a/app/Presenters/LicensePresenter.php +++ b/app/Presenters/LicensePresenter.php @@ -41,7 +41,7 @@ class LicensePresenter extends Presenter 'searchable' => true, 'sortable' => true, 'title' => trans('admin/licenses/form.license_key'), - 'formatter' => 'licensesLinkFormatter', + 'formatter' => 'licenseKeyFormatter', ], [ 'field' => 'expiration_date', 'searchable' => true, diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 2a5a0ef716..19ed335c96 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -333,6 +333,13 @@ }; } + + function licenseKeyFormatter(value, row) { + return ''; + } + + + function hardwareAuditFormatter(value, row) { return '{{ trans('general.audit') }}'; } From 9204309d67d318df66318ccc47b72c5382a77146 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 3 Apr 2025 12:28:47 +0100 Subject: [PATCH 2/9] Checkin/Checkout note added to language file Signed-off-by: snipe --- resources/lang/en-US/general.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php index 8366a68216..e20c7dfd54 100644 --- a/resources/lang/en-US/general.php +++ b/resources/lang/en-US/general.php @@ -62,6 +62,8 @@ return [ 'changepassword' => 'Change Password', 'checkin' => 'Checkin', 'checkin_from' => 'Checkin from', + 'checkin_note' => 'Checkin Note', + 'checkout_note' => 'Checkout Note', 'checkout' => 'Checkout', 'checkouts_count' => 'Checkouts', 'checkins_count' => 'Checkins', From 45d3c0444be08164ae1174278d2e4ab158ad1189 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 3 Apr 2025 12:29:30 +0100 Subject: [PATCH 3/9] Added copy to license keys Signed-off-by: snipe --- resources/views/account/view-assets.blade.php | 6 ++- resources/views/hardware/view.blade.php | 2 +- resources/views/licenses/checkin.blade.php | 42 ++++++++++++------- resources/views/licenses/checkout.blade.php | 23 +++++----- resources/views/licenses/view.blade.php | 8 ++-- resources/views/users/view.blade.php | 2 +- 6 files changed, 48 insertions(+), 35 deletions(-) diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index f2eeba8f38..bb4e6e6207 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -565,10 +565,12 @@ @foreach ($user->licenses as $license) - {{ $license->name }} + + {{ $license->name }} + @can('viewKeys', $license) - {{ $license->serial }} + @else ------------ @endcan diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index d0c026b29a..224bf32813 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -1165,7 +1165,7 @@ {{ $seat->license->name }} @can('viewKeys', $seat->license) - {!! nl2br(e($seat->license->serial)) !!} + @else ------------ @endcan diff --git a/resources/views/licenses/checkin.blade.php b/resources/views/licenses/checkin.blade.php index 5ef9159549..a300b2a010 100755 --- a/resources/views/licenses/checkin.blade.php +++ b/resources/views/licenses/checkin.blade.php @@ -16,7 +16,7 @@ @section('content')
-
+
{{csrf_field()}} @@ -28,31 +28,41 @@
- -
+ +

{{ $licenseSeat->license->name }}

- +
- -
-

- @can('viewKeys', $licenseSeat->license) - {{ $licenseSeat->license->serial }} - @else - ------------ - @endcan -

+ +
+

{{ $licenseSeat->license->category->name }}

+ + @can('viewKeys', $licenseSeat->license) +
+ +
+

+ {{ $licenseSeat->license->serial }} +

+
+
+ @endcan +
- -
- + +
+ {!! $errors->first('notes', '') !!}
diff --git a/resources/views/licenses/checkout.blade.php b/resources/views/licenses/checkout.blade.php index ef6b87fc0d..af090a7c47 100755 --- a/resources/views/licenses/checkout.blade.php +++ b/resources/views/licenses/checkout.blade.php @@ -15,7 +15,7 @@ @section('content')
-
+
{{csrf_field()}} @@ -26,7 +26,7 @@
- +
@@ -42,18 +42,19 @@
+ @can('viewKeys', $license)
- +
-

- @can('viewKeys', $license) - {{ $license->serial }} - @else - ------------ - @endcan +

{{ $license->serial }}

+ @endcan @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true']) @@ -64,9 +65,9 @@
- +
- + {!! $errors->first('note', '') !!}
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php index 2de0f9d6e0..ffcc94621b 100755 --- a/resources/views/licenses/view.blade.php +++ b/resources/views/licenses/view.blade.php @@ -124,13 +124,13 @@
{{ trans('admin/licenses/form.license_key') }} +
@can('viewKeys', $license) - {!! nl2br(e($license->serial)) !!} - + {!! nl2br(e($license->serial)) !!} @else ------------ @endcan diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index a11de31af0..fbaa96b539 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -831,7 +831,7 @@ @can('viewKeys', $license) - {!! $license->present()->serialUrl() !!} + @else ------------ @endcan From 6d7f061a1d79e97ffe8fbab443bccb74f2b20592 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 3 Apr 2025 13:39:31 +0100 Subject: [PATCH 4/9] Larger key box Signed-off-by: snipe --- resources/views/licenses/edit.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/licenses/edit.blade.php b/resources/views/licenses/edit.blade.php index 27f60931c8..092c323a62 100755 --- a/resources/views/licenses/edit.blade.php +++ b/resources/views/licenses/edit.blade.php @@ -34,7 +34,7 @@
- + {!! $errors->first('serial', '') !!}
From c7890f4c3be6f2c6ee51d86cdaf9fdd369d20347 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 3 Apr 2025 13:52:55 +0100 Subject: [PATCH 5/9] Use id as copy key Signed-off-by: snipe --- resources/views/users/view.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index fbaa96b539..d4142da55c 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -831,7 +831,7 @@ @can('viewKeys', $license) - + @else ------------ @endcan From a4a99adf80468fd423418e1c16a2a7424776eed0 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 3 Apr 2025 15:03:16 +0100 Subject: [PATCH 6/9] Added one-line code style Signed-off-by: snipe --- public/css/build/app.css | 6 ++++++ public/css/build/overrides.css | 6 ++++++ public/css/dist/all.css | 12 ++++++++++++ public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 6 ++++++ 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index eb8a1db230..a5a26ca55d 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -1426,4 +1426,10 @@ th.text-right.text-padding-number-footer-cell { padding-right: 20px !important; white-space: nowrap; } +code.single-line { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + overflow: hidden; +} diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index edf9a25d82..002535ebe3 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -1057,4 +1057,10 @@ th.text-right.text-padding-number-footer-cell { padding-right: 20px !important; white-space: nowrap; } +code.single-line { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + overflow: hidden; +} diff --git a/public/css/dist/all.css b/public/css/dist/all.css index db92e5c8ef..67a3d837a7 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -22761,6 +22761,12 @@ th.text-right.text-padding-number-footer-cell { padding-right: 20px !important; white-space: nowrap; } +code.single-line { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + overflow: hidden; +} .select2-container { @@ -24304,4 +24310,10 @@ th.text-right.text-padding-number-footer-cell { padding-right: 20px !important; white-space: nowrap; } +code.single-line { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + overflow: hidden; +} diff --git a/public/mix-manifest.json b/public/mix-manifest.json index dbed5cb541..0c87c3441a 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -2,8 +2,8 @@ "/js/build/app.js": "/js/build/app.js?id=607de09b70b83ef82a427e4b36341682", "/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/build/overrides.css": "/css/build/overrides.css?id=f188c07f91348503bc38f4b6683993aa", - "/css/build/app.css": "/css/build/app.css?id=7f6827b6d2149b8eab327d00e2dd66f0", + "/css/build/overrides.css": "/css/build/overrides.css?id=8e3294cc5d42e588f971ce32ef0c047f", + "/css/build/app.css": "/css/build/app.css?id=9212f27aad1d4abdfe02826c709da9ff", "/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", @@ -19,7 +19,7 @@ "/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-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", - "/css/dist/all.css": "/css/dist/all.css?id=e6bb343692dc7255405be1793f149e0a", + "/css/dist/all.css": "/css/dist/all.css?id=9e663ed34ef8b38eb8d405e8c7c28ca6", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index bbbb74ec88..e71ecbcdb3 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -1175,3 +1175,9 @@ th.text-right.text-padding-number-footer-cell { white-space: nowrap; } +code.single-line { + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; + overflow: hidden; +} From b7c011dd2dbeecb0a1977ac777b039f035ada4d1 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 3 Apr 2025 15:03:31 +0100 Subject: [PATCH 7/9] Use new one line code style Signed-off-by: snipe --- resources/views/account/view-assets.blade.php | 13 +++++++------ resources/views/hardware/view.blade.php | 10 +++++----- resources/views/partials/bootstrap-table.blade.php | 2 +- resources/views/users/view.blade.php | 6 ++++-- 4 files changed, 17 insertions(+), 14 deletions(-) diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index bb4e6e6207..42ce556bd2 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -554,11 +554,11 @@ }'> - {{ trans('general.name') }} - {{ trans('admin/licenses/form.license_key') }} - {{ trans('admin/licenses/form.to_name') }} - {{ trans('admin/licenses/form.to_email') }} - {{ trans('general.category') }} + {{ trans('general.name') }} + {{ trans('admin/licenses/form.license_key') }} + {{ trans('admin/licenses/form.to_name') }} + {{ trans('admin/licenses/form.to_email') }} + {{ trans('general.category') }} @@ -570,7 +570,8 @@ @can('viewKeys', $license) - + + @else ------------ @endcan diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index 224bf32813..e7bd3460e5 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -1152,10 +1152,10 @@ - - - - + + + + @@ -1165,7 +1165,7 @@
{{ trans('general.name') }}{{ trans('admin/licenses/form.license_key') }}{{ trans('admin/licenses/form.expiration') }}{{ trans('table.actions') }}{{ trans('general.name') }}{{ trans('admin/licenses/form.license_key') }}{{ trans('admin/licenses/form.expiration') }}{{ trans('table.actions') }}
{{ $seat->license->name }} @can('viewKeys', $seat->license) - + @else ------------ @endcan diff --git a/resources/views/partials/bootstrap-table.blade.php b/resources/views/partials/bootstrap-table.blade.php index 19ed335c96..4f3c1d5ff9 100644 --- a/resources/views/partials/bootstrap-table.blade.php +++ b/resources/views/partials/bootstrap-table.blade.php @@ -335,7 +335,7 @@ function licenseKeyFormatter(value, row) { - return ''; + return ''; } diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php index d4142da55c..7ee3c4926c 100755 --- a/resources/views/users/view.blade.php +++ b/resources/views/users/view.blade.php @@ -792,6 +792,8 @@
+ +
- + @@ -831,7 +833,7 @@
{{ trans('general.name') }}{{ trans('general.name') }} {{ trans('admin/licenses/form.license_key') }} {{ trans('general.purchase_cost') }} {{ trans('admin/licenses/form.purchase_order') }} @can('viewKeys', $license) - + @else ------------ @endcan From 274c5fe4d35779e9f8d8bf6b6fafb2b7511cfb6d Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 3 Apr 2025 15:07:10 +0100 Subject: [PATCH 8/9] Added max-width Signed-off-by: snipe --- public/css/build/app.css | 1 + public/css/build/overrides.css | 1 + public/css/dist/all.css | 2 ++ public/mix-manifest.json | 6 +++--- resources/assets/less/overrides.less | 1 + 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index a5a26ca55d..aaa9ed4033 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -1431,5 +1431,6 @@ code.single-line { -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden; + max-width: 400px; } diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 002535ebe3..6d0687c74e 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -1062,5 +1062,6 @@ code.single-line { -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden; + max-width: 400px; } diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 67a3d837a7..9669ae81a6 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -22766,6 +22766,7 @@ code.single-line { -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden; + max-width: 400px; } @@ -24315,5 +24316,6 @@ code.single-line { -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden; + max-width: 400px; } diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 0c87c3441a..363faf57f3 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -2,8 +2,8 @@ "/js/build/app.js": "/js/build/app.js?id=607de09b70b83ef82a427e4b36341682", "/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/build/overrides.css": "/css/build/overrides.css?id=8e3294cc5d42e588f971ce32ef0c047f", - "/css/build/app.css": "/css/build/app.css?id=9212f27aad1d4abdfe02826c709da9ff", + "/css/build/overrides.css": "/css/build/overrides.css?id=01e77f7a486fd578a14760d045dcd80f", + "/css/build/app.css": "/css/build/app.css?id=ad2974ecfed16a76dadd2f4ec34f8dac", "/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", @@ -19,7 +19,7 @@ "/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-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", - "/css/dist/all.css": "/css/dist/all.css?id=9e663ed34ef8b38eb8d405e8c7c28ca6", + "/css/dist/all.css": "/css/dist/all.css?id=524d6fe45db04b3258c818dfb391fe2c", "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7", "/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde", diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index e71ecbcdb3..7c7bff4d66 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -1180,4 +1180,5 @@ code.single-line { -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden; + max-width: 400px; } From 0e654987997b5f5f09bd1e661218fa8f827bb3d2 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 3 Apr 2025 15:24:03 +0100 Subject: [PATCH 9/9] Added webp as inline-able images Signed-off-by: snipe --- app/Helpers/Helper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.php index 216245a3db..f146d57d29 100644 --- a/app/Helpers/Helper.php +++ b/app/Helpers/Helper.php @@ -868,7 +868,7 @@ class Helper $filetype = @finfo_file($finfo, $file); finfo_close($finfo); - if (($filetype == 'image/jpeg') || ($filetype == 'image/jpg') || ($filetype == 'image/png') || ($filetype == 'image/bmp') || ($filetype == 'image/gif') || ($filetype == 'image/avif')) { + if (($filetype == 'image/jpeg') || ($filetype == 'image/jpg') || ($filetype == 'image/png') || ($filetype == 'image/bmp') || ($filetype == 'image/gif') || ($filetype == 'image/avif') || ($filetype == 'image/webp')) { return $filetype; }