From daf23edd103a918a0a9257353ace9a346278f3e6 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 22 Jul 2025 15:10:27 +0100 Subject: [PATCH] Adds disabled cursor on uneditable fields in user create/edit Signed-off-by: snipe --- package-lock.json | 6 +++--- 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 | 2 +- resources/views/users/edit.blade.php | 10 +++++----- 7 files changed, 12 insertions(+), 16 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8b6219adaa..746a88187f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4092,9 +4092,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001677", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001677.tgz", - "integrity": "sha512-fmfjsOlJUpMWu+mAAtZZZHz7UEwsUxIIvu1TJfO1HqFQvB/B+ii0xr9B5HpbZY/mC4XZ8SvjHJqtAY6pDPQEog==", + "version": "1.0.30001727", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001727.tgz", + "integrity": "sha512-pB68nIHmbN6L/4C6MH1DokyR3bYqFwjaSs/sWDHGj4CTcFtQUQMuJftVwWkXq7mNWOybD3KhUv3oWHoGxgP14Q==", "funding": [ { "type": "opencollective", diff --git a/public/css/build/app.css b/public/css/build/app.css index b6c2073aeb..b32c4701d2 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -1266,7 +1266,6 @@ label.form-control { } label.form-control--disabled { color: #959495; - pointer-events: none; cursor: not-allowed; } /** --------------------------------------- **/ diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 34a882ff8b..8a0bb41bd2 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -887,7 +887,6 @@ label.form-control { } label.form-control--disabled { color: #959495; - pointer-events: none; cursor: not-allowed; } /** --------------------------------------- **/ diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 0924af427a..075593c961 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -22601,7 +22601,6 @@ label.form-control { } label.form-control--disabled { color: #959495; - pointer-events: none; cursor: not-allowed; } /** --------------------------------------- **/ @@ -24177,7 +24176,6 @@ label.form-control { } label.form-control--disabled { color: #959495; - pointer-events: none; cursor: not-allowed; } /** --------------------------------------- **/ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 37f6ae70bb..c2ade48a6e 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -2,8 +2,8 @@ "/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=78bfb1c7b5782df4fb0ac7e36f80f847", "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=503d0b09e157a22f555e3670d1ec9bb5", - "/css/build/overrides.css": "/css/build/overrides.css?id=f2822e504d454229b662569ee39c579d", - "/css/build/app.css": "/css/build/app.css?id=945d335018cdbccc366d239b6c7d67d6", + "/css/build/overrides.css": "/css/build/overrides.css?id=a2147e7a0e0117ab3d20cce276e362e5", + "/css/build/app.css": "/css/build/app.css?id=80d437dcee5ae27fc5e68f85beea4b09", "/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=f6b2e7fa795596ac4754500c9c30eacc", @@ -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=7aacfabbafd138c5af6420609f97820d", "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", - "/css/dist/all.css": "/css/dist/all.css?id=8867854784ed3c7ec07d84940894fd47", + "/css/dist/all.css": "/css/dist/all.css?id=c357227b5654c50afb9797141ac32dff", "/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 ab932ddfbf..98568ab8f5 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -973,10 +973,10 @@ label.form-control { label.form-control--disabled { color: #959495; - pointer-events:none; cursor: not-allowed; } + /** --------------------------------------- **/ /** Start checkbox styles to replace iCheck **/ /** --------------------------------------- **/ diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php index 69723a1696..f2e5fd994f 100755 --- a/resources/views/users/edit.blade.php +++ b/resources/views/users/edit.blade.php @@ -104,7 +104,7 @@ @if ($user->ldap_import!='1' || str_contains(Route::currentRouteName(), 'clone')) - id)) ? ' disabled' : '' }}> + id)) ? ' style="cursor: not-allowed" disabled ' : '' !!}> @else @@ -151,7 +151,7 @@
@if ($user->ldap_import!='1' || str_contains(Route::currentRouteName(), 'clone') ) - id)) ? ' required' : '' }}{{ (!Gate::allows('canEditAuthFields', $user)) || ((!Gate::allows('editableOnDemo') && ($user->id))) ? ' disabled' : '' }}> + id)) ? ' required' : '' }}{!! (!Gate::allows('canEditAuthFields', $user)) || ((!Gate::allows('editableOnDemo')) && ($user->id)) ? ' style="cursor: not-allowed" disabled ' : '' !!}> {!! $errors->first('password', '') !!} @else @@ -191,7 +191,7 @@ {{ trans('admin/users/table.password_confirm') }}
- id) ? ' required' : '' }} onfocus="this.removeAttribute('readonly');" readonly {{ (!Gate::allows('canEditAuthFields', $user)) || ((!Gate::allows('editableOnDemo')) && ($user->id)) ? ' disabled' : '' }}> + id) ? ' required' : '' }} onfocus="this.removeAttribute('readonly');" readonly {!! (!Gate::allows('canEditAuthFields', $user)) || ((!Gate::allows('editableOnDemo')) && ($user->id)) ? ' style="cursor: not-allowed" disabled ' : '' !!}> @cannot('canEditAuthFields', $user)

@@ -216,7 +216,7 @@

- @if ((!Gate::allows('canEditAuthFields', $user)) || ($user->id == auth()->user()->id) || ($user->id)) + @if ((!Gate::allows('canEditAuthFields', $user)) || ($user->id == auth()->user()->id))