From eaaac76435f2675d666b2b6347063b718b607c13 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 04:48:39 +0100 Subject: [PATCH 01/14] Added configs Signed-off-by: snipe --- .pa11yci | 31 +++++++++++++++++++++++++++++++ pa11y.js | 27 +++++++++++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 .pa11yci create mode 100644 pa11y.js diff --git a/.pa11yci b/.pa11yci new file mode 100644 index 000000000..4ed9e25c6 --- /dev/null +++ b/.pa11yci @@ -0,0 +1,31 @@ +{ + "standard": "WCAG2AA", + "level": "error", + "defaults": { + "timeout": 500000, + "wait": 2000, + "ignore" : [ + "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail" + ], + "viewport": { + "width": 1280, + "height": 1024 + } + }, + "urls": [ + { + "url": "https://snipe-it.test/login", + "actions": [ + "set field input[name='username'] to admin", + "set field input[name='password'] to password", + "click element button[type=submit]", + "wait for url to be https://snipe-it.test/" + ] + }, + { + "url": "https://snipe-it.test", + "actions": [ + ] + } + ] +} \ No newline at end of file diff --git a/pa11y.js b/pa11y.js new file mode 100644 index 000000000..fc1b705f5 --- /dev/null +++ b/pa11y.js @@ -0,0 +1,27 @@ +const pa11y = require('pa11y'); + +pa11y('http://snipe-it.test', { + standard: "WCAG2AA", + level: "error", + defaults: { + "timeout": 500000, + "wait": 2000, + "ignore": [ + "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18", + "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail", + ], + "viewport": { + "width": 1280, + "height": 1024 + }, + }, + actions: [ + 'set field #username to admin', + 'set field #password to password', + 'click element #submit', + 'wait for path to be /', + ], + ignore : [ + "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail" + ], +}); \ No newline at end of file From f05b2ad9be450591f6f4e225d36e99e5046fe909 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 04:48:47 +0100 Subject: [PATCH 02/14] First stabs at improvements Signed-off-by: snipe --- resources/views/auth/login.blade.php | 9 +- resources/views/dashboard.blade.php | 226 ++++++++++----------- resources/views/layouts/basic.blade.php | 10 +- resources/views/layouts/default.blade.php | 4 +- resources/views/notifications.blade.php | 12 +- resources/views/settings/general.blade.php | 4 +- 6 files changed, 131 insertions(+), 134 deletions(-) diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index 0a3c93333..69cc23e44 100755 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -54,7 +54,8 @@ -
+
+
@@ -94,7 +95,9 @@ @if (config('app.require_saml')) {{ trans('auth/general.saml_login') }} @else - + @endif @if ($snipeSettings->custom_forgot_pass_url) diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php index aa9c4e1d8..afe93b361 100755 --- a/resources/views/dashboard.blade.php +++ b/resources/views/dashboard.blade.php @@ -27,127 +27,121 @@ @endif
- -
- - -
-
-

{{ number_format(\App\Models\Asset::AssetsForShow()->count()) }}

-

{{ trans('general.assets') }}

-
- - @can('index', \App\Models\Asset::class) - {{ trans('general.view_all') }} - + + +
+ + +
+
+

{{ number_format(\App\Models\Asset::AssetsForShow()->count()) }}

+

{{ trans('general.assets') }}

+
+ + + {{ trans('general.view_all') }} + + +
- @endcan -
- -
+
-
- - -
-
-

{{ number_format($counts['license']) }}

-

{{ trans('general.licenses') }}

-
- - @can('view', \App\Models\License::class) - {{ trans('general.view_all') }} - - - @endcan -
- -
- - -
- - -
-
-

{{ number_format($counts['accessory']) }}

-

{{ trans('general.accessories') }}

-
- - @can('index', \App\Models\Accessory::class) - {{ trans('general.view_all') }} - - - @endcan -
- -
- -
- - - -
-
-

{{ number_format($counts['consumable']) }}

-

{{ trans('general.consumables') }}

-
- - @can('index', \App\Models\Consumable::class) - {{ trans('general.view_all') }} - +
+ + +
+
+

{{ number_format($counts['license']) }}

+

{{ trans('general.licenses') }}

+
+ + + {{ trans('general.view_all') }} + + +
- @endcan -
-
+
-
- - -
-
-

{{ number_format($counts['component']) }}

-

{{ trans('general.components') }}

-
- - @can('view', \App\Models\License::class) - {{ trans('general.view_all') }} - - - @endcan -
- -
-
- - -
-
-

{{ number_format($counts['user']) }}

-

{{ trans('general.people') }}

-
- - @can('view', \App\Models\License::class) - {{ trans('general.view_all') }} - - - @endcan -
- -
+
+ + +
+
+

{{ number_format($counts['accessory']) }}

+

{{ trans('general.accessories') }}

+
+ + + {{ trans('general.view_all') }} + + +
+ +
+ +
+ + +
+
+

{{ number_format($counts['consumable']) }}

+

{{ trans('general.consumables') }}

+
+ + + {{ trans('general.view_all') }} + + +
+ +
+ +
+ + +
+
+

{{ number_format($counts['component']) }}

+

{{ trans('general.components') }}

+
+ + + {{ trans('general.view_all') }} + + +
+ +
+ +
+ + +
+
+

{{ number_format($counts['user']) }}

+

{{ trans('general.people') }}

+
+ + {{ trans('general.view_all') }} + + +
+ +
diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php index 29e4ab0a2..bea80ff77 100644 --- a/resources/views/layouts/basic.blade.php +++ b/resources/views/layouts/basic.blade.php @@ -46,15 +46,15 @@ @if (($snipeSettings) && ($snipeSettings->logo!='')) -
- -
+
+ + + +
@endif @yield('content') - -
@if (($snipeSettings) && ($snipeSettings->privacy_policy_link!='')) {{ trans('admin/settings/general.privacy_policy') }} diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php index 10340a6c1..b3ac770dc 100644 --- a/resources/views/layouts/default.blade.php +++ b/resources/views/layouts/default.blade.php @@ -400,8 +400,8 @@ dir="{{ Helper::determineLanguageDirection() }}"> {{ trans('general.logout') }} - diff --git a/resources/views/notifications.blade.php b/resources/views/notifications.blade.php index 7d74e5d04..f14a2f351 100755 --- a/resources/views/notifications.blade.php +++ b/resources/views/notifications.blade.php @@ -1,5 +1,5 @@ @if ($errors->any()) -
+
@@ -12,7 +12,7 @@ @if ($message = session()->get('status')) -
+
@@ -24,7 +24,7 @@ @if ($message = session()->get('success')) -
+
@@ -37,7 +37,7 @@ @if ($message = session()->get('success-unescaped')) -
+
@@ -51,7 +51,7 @@ @if ($assets = session()->get('assets')) @foreach ($assets as $asset) -
+
@@ -77,7 +77,7 @@ @if ($consumables = session()->get('consumables')) @foreach ($consumables as $consumable) -
+
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php index a2261f0cc..122654118 100644 --- a/resources/views/settings/general.blade.php +++ b/resources/views/settings/general.blade.php @@ -322,7 +322,7 @@
-
+
{{ trans('admin/settings/general.legends.checkin') }} @@ -342,7 +342,7 @@ -
+
{{ trans('admin/settings/general.legends.dashboard') }} From 7e01d23aa2d45834bb308e5257754c7fcd680a46 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 04:50:14 +0100 Subject: [PATCH 03/14] Renamed file Signed-off-by: snipe --- .pa11yci => .pa11yci.json | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .pa11yci => .pa11yci.json (100%) diff --git a/.pa11yci b/.pa11yci.json similarity index 100% rename from .pa11yci rename to .pa11yci.json From ec65e64a67f45042dfa7f0eb78e27238b1344e40 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 05:06:34 +0100 Subject: [PATCH 04/14] Updated ignore rules Signed-off-by: snipe --- .pa11yci.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.pa11yci.json b/.pa11yci.json index 4ed9e25c6..d77e9968d 100644 --- a/.pa11yci.json +++ b/.pa11yci.json @@ -20,6 +20,12 @@ "set field input[name='password'] to password", "click element button[type=submit]", "wait for url to be https://snipe-it.test/" + ], + "ignore": [ + "WCAG2AA.Principle2.Guideline2_4.2_4_2.H25.1.NoTitleEl", + "WCAG2AA.Principle3.Guideline3_1.3_1_1.H57.2", + "WCAG2AA.Principle1.Guideline1_4.1_4_3.G145.Fail", + "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail" ] }, { From 2aa864afaa5792a446ef7283affd9440131fd9ea Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 05:16:22 +0100 Subject: [PATCH 05/14] Updated rules Signed-off-by: snipe --- .pa11yci.json | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.pa11yci.json b/.pa11yci.json index d77e9968d..43b799dfe 100644 --- a/.pa11yci.json +++ b/.pa11yci.json @@ -5,6 +5,7 @@ "timeout": 500000, "wait": 2000, "ignore" : [ + "WCAG2AA.Principle1.Guideline1_4.1_4_3.G145.Fail", "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail" ], "viewport": { @@ -20,13 +21,8 @@ "set field input[name='password'] to password", "click element button[type=submit]", "wait for url to be https://snipe-it.test/" - ], - "ignore": [ - "WCAG2AA.Principle2.Guideline2_4.2_4_2.H25.1.NoTitleEl", - "WCAG2AA.Principle3.Guideline3_1.3_1_1.H57.2", - "WCAG2AA.Principle1.Guideline1_4.1_4_3.G145.Fail", - "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail" ] + }, { "url": "https://snipe-it.test", From 11b48ee6360f31a96b72b7cebae9d1784442ea3a Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 05:21:32 +0100 Subject: [PATCH 06/14] Removed dupes Signed-off-by: snipe --- pa11y.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pa11y.js b/pa11y.js index fc1b705f5..4d5a1dbba 100644 --- a/pa11y.js +++ b/pa11y.js @@ -20,8 +20,5 @@ pa11y('http://snipe-it.test', { 'set field #password to password', 'click element #submit', 'wait for path to be /', - ], - ignore : [ - "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail" - ], + ] }); \ No newline at end of file From 3ae2454228ee704de3fc54a7570e32463bf86513 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 05:35:49 +0100 Subject: [PATCH 07/14] =?UTF-8?q?This=20doesn=E2=80=99t=20work=20the=20way?= =?UTF-8?q?=20I=20thought?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- .pa11yci.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.pa11yci.json b/.pa11yci.json index 43b799dfe..cb1418e1d 100644 --- a/.pa11yci.json +++ b/.pa11yci.json @@ -22,12 +22,6 @@ "click element button[type=submit]", "wait for url to be https://snipe-it.test/" ] - - }, - { - "url": "https://snipe-it.test", - "actions": [ - ] } ] } \ No newline at end of file From 65cc1bbd7ef8cd634443a9ed449db933b7cefb34 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 05:53:11 +0100 Subject: [PATCH 08/14] Ignore screenshots Signed-off-by: snipe --- .pa11yci.json | 12 +++++++++++- tests/pa11y/.gitignore | 2 ++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100755 tests/pa11y/.gitignore diff --git a/.pa11yci.json b/.pa11yci.json index cb1418e1d..943c6a8da 100644 --- a/.pa11yci.json +++ b/.pa11yci.json @@ -2,12 +2,19 @@ "standard": "WCAG2AA", "level": "error", "defaults": { + "useIncognitoBrowserContext": false, "timeout": 500000, "wait": 2000, "ignore" : [ "WCAG2AA.Principle1.Guideline1_4.1_4_3.G145.Fail", "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail" ], + "actions": [ + "set field input[name='username'] to admin", + "set field input[name='password'] to password", + "click element button[type=submit]", + "wait for url to be https://snipe-it.test/" + ], "viewport": { "width": 1280, "height": 1024 @@ -15,12 +22,15 @@ }, "urls": [ { + "__NOTE" : "this should always be FIRST (if browser context is preserved)", "url": "https://snipe-it.test/login", "actions": [ + "screen capture tests/pa11y/login.png", "set field input[name='username'] to admin", "set field input[name='password'] to password", "click element button[type=submit]", - "wait for url to be https://snipe-it.test/" + "wait for url to be https://snipe-it.test/", + "screen capture tests/pa11y/dashboard.png" ] } ] diff --git a/tests/pa11y/.gitignore b/tests/pa11y/.gitignore new file mode 100755 index 000000000..c96a04f00 --- /dev/null +++ b/tests/pa11y/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file From a9db8d6898641baf99274da9cfb3517ddda6d106 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 06:20:23 +0100 Subject: [PATCH 09/14] Added more urls Signed-off-by: snipe --- .pa11yci.json | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/.pa11yci.json b/.pa11yci.json index 943c6a8da..f06c152f1 100644 --- a/.pa11yci.json +++ b/.pa11yci.json @@ -4,17 +4,12 @@ "defaults": { "useIncognitoBrowserContext": false, "timeout": 500000, - "wait": 2000, + "wait": 5000, "ignore" : [ "WCAG2AA.Principle1.Guideline1_4.1_4_3.G145.Fail", "WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail" ], - "actions": [ - "set field input[name='username'] to admin", - "set field input[name='password'] to password", - "click element button[type=submit]", - "wait for url to be https://snipe-it.test/" - ], + "viewport": { "width": 1280, "height": 1024 @@ -25,6 +20,7 @@ "__NOTE" : "this should always be FIRST (if browser context is preserved)", "url": "https://snipe-it.test/login", "actions": [ + "navigate to https://snipe-it.test/login", "screen capture tests/pa11y/login.png", "set field input[name='username'] to admin", "set field input[name='password'] to password", @@ -32,6 +28,27 @@ "wait for url to be https://snipe-it.test/", "screen capture tests/pa11y/dashboard.png" ] - } + }, + { + "url" : "https://snipe-it.test/admin", + "actions" : [ + "navigate to https://snipe-it.test/admin", + "screen capture tests/pa11y/admin-settings.png" + ] + }, + { + "url" : "https://snipe-it.test/hardware/create", + "actions" : [ + "navigate to https://snipe-it.test/hardware/create", + "screen capture tests/pa11y/asset-create.png" + ] + }, + { + "url" : "https://snipe-it.test/hardware", + "actions" : [ + "navigate to https://snipe-it.test/hardware", + "screen capture tests/pa11y/asset-list.png" + ] + } ] } \ No newline at end of file From 6a00620552a801ed815bb9425d317246250e539e Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 06:27:20 +0100 Subject: [PATCH 10/14] More urls Signed-off-by: snipe --- .pa11yci.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.pa11yci.json b/.pa11yci.json index f06c152f1..e91c05c08 100644 --- a/.pa11yci.json +++ b/.pa11yci.json @@ -49,6 +49,20 @@ "navigate to https://snipe-it.test/hardware", "screen capture tests/pa11y/asset-list.png" ] + }, + { + "url" : "https://snipe-it.test/hardware/1", + "actions" : [ + "navigate to https://snipe-it.test/hardware/1", + "screen capture tests/pa11y/asset-detail.png" + ] + }, + { + "url" : "https://snipe-it.test/account/view-assets", + "actions" : [ + "navigate to https://snipe-it.test/account/view-assets", + "screen capture tests/pa11y/profile.png" + ] } ] } \ No newline at end of file From 75c9936dbb3909a04da9bbcdf79ca8467a736020 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 12:37:13 +0100 Subject: [PATCH 11/14] Added alt text Signed-off-by: snipe --- resources/views/account/view-assets.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 42ce556bd..1cc14b18f 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -99,7 +99,7 @@
- {{ $user->present()->fullName() }} + {{ $user->present()->fullName() }}
@can('self.profile')
@@ -468,9 +468,9 @@ {{ $counter }} @if (($asset->image) && ($asset->image!='')) - + @elseif (($asset->model) && ($asset->model->image!='')) - + @endif From f0b18042f99280b87db2f227571fcc578b4d7421 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 14:01:52 +0100 Subject: [PATCH 12/14] Added aria label to admin settings search Signed-off-by: snipe --- resources/views/settings/index.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 2f24fad4e..ef4b12fde 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -14,9 +14,9 @@
-
+
- +
From e3f511ec7c5a372d307cdedccd2434ee9450de1a Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 15:53:41 +0100 Subject: [PATCH 13/14] Small accessibility improvements Signed-off-by: snipe --- .pa11yci.json | 35 ++++++ 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 | 6 + resources/views/account/view-assets.blade.php | 118 ++++++++++-------- resources/views/blade/filestable.blade.php | 6 +- resources/views/dashboard.blade.php | 27 ++-- resources/views/hardware/edit.blade.php | 7 +- resources/views/layouts/edit-form.blade.php | 2 +- 11 files changed, 147 insertions(+), 76 deletions(-) diff --git a/.pa11yci.json b/.pa11yci.json index e91c05c08..c33396dae 100644 --- a/.pa11yci.json +++ b/.pa11yci.json @@ -63,6 +63,41 @@ "navigate to https://snipe-it.test/account/view-assets", "screen capture tests/pa11y/profile.png" ] + }, + { + "url" : "https://snipe-it.test/licences", + "actions" : [ + "navigate to https://snipe-it.test/licenses", + "screen capture tests/pa11y/license-list.png" + ] + }, + { + "url" : "https://snipe-it.test/licences/create", + "actions" : [ + "navigate to https://snipe-it.test/licenses/create", + "screen capture tests/pa11y/license-create.png" + ] + }, + { + "url" : "https://snipe-it.test/licences/1", + "actions" : [ + "navigate to https://snipe-it.test/licenses/1", + "screen capture tests/pa11y/license-view.png" + ] + }, + { + "url" : "https://snipe-it.test/accessories", + "actions" : [ + "navigate to https://snipe-it.test/accessories", + "screen capture tests/pa11y/accessory-list.png" + ] + }, + { + "url" : "https://snipe-it.test/accessories/create", + "actions" : [ + "navigate to https://snipe-it.test/accessories/create", + "screen capture tests/pa11y/accessory-create.png" + ] } ] } \ No newline at end of file diff --git a/public/css/build/app.css b/public/css/build/app.css index 4100b09c8..79c40d5f4 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -1448,4 +1448,8 @@ legend { fieldset { padding-bottom: 20px; } +caption.tableCaption { + font-size: 18px; + padding-left: 8px; +} diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css index 37f704b65..9fe2d1a33 100644 --- a/public/css/build/overrides.css +++ b/public/css/build/overrides.css @@ -1079,4 +1079,8 @@ legend { fieldset { padding-bottom: 20px; } +caption.tableCaption { + font-size: 18px; + padding-left: 8px; +} diff --git a/public/css/dist/all.css b/public/css/dist/all.css index 4400eade7..a9d1e28ec 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -22783,6 +22783,10 @@ legend { fieldset { padding-bottom: 20px; } +caption.tableCaption { + font-size: 18px; + padding-left: 8px; +} .select2-container { @@ -24348,4 +24352,8 @@ legend { fieldset { padding-bottom: 20px; } +caption.tableCaption { + font-size: 18px; + padding-left: 8px; +} diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 83f7c564b..0bf335fc7 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=06c13e817cc022028b3f4a33c0ca303a", "/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=79aa889a1a6691013be6c342ca7391cd", - "/css/build/overrides.css": "/css/build/overrides.css?id=23b8695f142b81daac944f9e04651c0c", - "/css/build/app.css": "/css/build/app.css?id=a48ed31ea3de97ccacd8c082c3170419", + "/css/build/overrides.css": "/css/build/overrides.css?id=c05ff69c5fa7cae36e9235c2f1521a55", + "/css/build/app.css": "/css/build/app.css?id=b9bb079547d79412ea5a5127855c41fb", "/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=ffee9ce5396c4880dc0b461586638497", + "/css/dist/all.css": "/css/dist/all.css?id=1845b570a7e2d03b331998c453d30361", "/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 e0429b1fa..05a960393 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -1205,3 +1205,9 @@ legend { fieldset { padding-bottom: 20px; } + +caption.tableCaption { + font-size: 18px; + padding-left: 8px; +} + diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 1cc14b18f..9d2218fbb 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -9,6 +9,7 @@ {{-- Account page content --}} @section('content') + @if ($acceptances = \App\Models\CheckoutAcceptance::forUser(Auth::user())->pending()->count())
@@ -32,20 +33,23 @@
  • - - + +
  • - - - + +
    • @@ -56,7 +60,7 @@ @@ -67,18 +71,18 @@
  • - +
    • @@ -93,11 +97,6 @@
    - - -
    - -
    {{ $user->present()->fullName() }}
    @@ -376,35 +375,31 @@
    -
    +
    - -
    - @if ($user->id) -
    -
    - @endif - -
    - - + + +
    + {{ trans('general.assets') }} +
    @@ -420,7 +415,7 @@ {{ trans('admin/hardware/table.asset_tag') }} - {{ trans('general.name') }} + {{ trans('general.name') }}fljg {{ trans('admin/hardware/table.asset_model') }} @@ -530,13 +525,11 @@ @endforeach
    -
    -
    -
    + + + @@ -593,12 +592,11 @@ @endforeach
    + {{ trans('general.licenses') }} +
    {{ trans('general.name') }}
    -
    -
    username) }}-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"] }'> + + + + @@ -644,12 +648,11 @@ @endforeach
    + {{ trans('general.accessories') }} +
    {{ trans('general.name') }}
    -
    -
    username) }}-{{ date('Y-m-d') }}", "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","delete","download","icon"] }'> + + + @@ -693,8 +701,10 @@ @endforeach
    + {{ trans('general.consumables') }} +
    {{ trans('general.name') }}
    -
    +
    +

    fdlkgjljg

    +
    diff --git a/resources/views/blade/filestable.blade.php b/resources/views/blade/filestable.blade.php index e198e339d..6c807984f 100644 --- a/resources/views/blade/filestable.blade.php +++ b/resources/views/blade/filestable.blade.php @@ -9,9 +9,9 @@
    - + {{ trans('general.view_all') }} - +
    - +
    + {{ trans('general.view_all') }} - +
    @@ -79,10 +79,10 @@ - + {{ trans('general.view_all') }} - +
    @@ -98,10 +98,10 @@ - + {{ trans('general.view_all') }} - + @@ -117,10 +117,10 @@ - + {{ trans('general.view_all') }} - + @@ -136,9 +136,10 @@ - {{ trans('general.view_all') }} + + {{ trans('general.view_all') }} - + diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 1a7a5fad8..3832f62b8 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -42,8 +42,11 @@ {!! $errors->first('asset_tag', ' :message') !!}
    -
    @endif @@ -116,7 +119,7 @@
    -
    @if (isset($topSubmit) && ($topSubmit=='true'))
    - From d9326fc555488ec84dfa795294d24590808b2b26 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 23 Apr 2025 21:13:40 +0100 Subject: [PATCH 14/14] Removed sky-is-blue text Signed-off-by: snipe --- resources/views/account/view-assets.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 9d2218fbb..68749ae2a 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -415,7 +415,7 @@ {{ trans('admin/hardware/table.asset_tag') }}