From d96498ab1fb48f22ed8952bf545fa41db9e4d41c Mon Sep 17 00:00:00 2001 From: akemidx Date: Mon, 31 Mar 2025 18:33:20 -0400 Subject: [PATCH 01/17] this is a redo after a borked rebase --- resources/assets/less/app.less | 17 +++++++++++ resources/views/settings/index.blade.php | 36 ++++++++++++------------ 2 files changed, 35 insertions(+), 18 deletions(-) diff --git a/resources/assets/less/app.less b/resources/assets/less/app.less index 259172bae..b90a6271c 100644 --- a/resources/assets/less/app.less +++ b/resources/assets/less/app.less @@ -384,6 +384,23 @@ a.logo.no-hover a:hover { background-color: transparent; } +.index-blocks { + color: var(--text-sub); + max-width: 400px; + max-height: 15px; + overflow: hidden; + text-overflow: ellipsis; + text-align: center; + white-space: nowrap; +} +.index-blocks:hover{ + background-color: var(--back-sub); + color: var(--text-main); + overflow: visible; + white-space: normal; + height:auto; +} + input:required, select:required, textarea:required { border-right: 6px solid orange; } diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index 2f24fad4e..f0081a652 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -67,7 +67,7 @@ -

{{ trans('admin/settings/general.brand_help') }}

+

{{ trans('admin/settings/general.brand_help') }}

@@ -84,7 +84,7 @@ -

{{ trans('admin/settings/general.general_settings_help') }}

+

{{ trans('admin/settings/general.general_settings_help') }}

@@ -101,7 +101,7 @@ -

{{ trans('admin/settings/general.security_help') }}

+

{{ trans('admin/settings/general.security_help') }}

@@ -117,7 +117,7 @@ -

{{ trans('admin/settings/general.groups_help') }}

+

{{ trans('admin/settings/general.groups_help') }}

@@ -134,7 +134,7 @@ -

{{ trans('admin/settings/general.localization_help') }}

+

{{ trans('admin/settings/general.localization_help') }}

@@ -152,7 +152,7 @@ -

{{ trans('admin/settings/general.notifications_help') }}

+

{{ trans('admin/settings/general.notifications_help') }}

@@ -167,7 +167,7 @@ {{ trans('admin/settings/general.integrations') }} -

{{ trans('admin/settings/general.webhook_help') }}

+

{{ trans('admin/settings/general.webhook_help') }}

@@ -182,7 +182,7 @@ {{ trans('general.asset_tags') }} -

{{ trans('admin/settings/general.asset_tags_help') }}

+

{{ trans('admin/settings/general.asset_tags_help') }}

@@ -198,7 +198,7 @@ -

{!! trans('admin/settings/general.labels_help') !!}

+

{!! trans('admin/settings/general.labels_help') !!}

@@ -214,7 +214,7 @@ {{ trans('admin/settings/general.ldap') }} -

{{ trans('admin/settings/general.ldap_help') }}

+

{{ trans('admin/settings/general.ldap_help') }}

@@ -229,7 +229,7 @@ Google -

{{ trans('admin/settings/general.google_login') }}

+

{{ trans('admin/settings/general.google_login') }}

@@ -244,7 +244,7 @@ {{ trans('admin/settings/general.saml') }} -

{{ trans('admin/settings/general.saml_help') }}

+

{{ trans('admin/settings/general.saml_help') }}

@@ -259,7 +259,7 @@ {{ trans('admin/settings/general.backups') }} -

{!! trans('admin/settings/general.backups_help') !!}

+

{!! trans('admin/settings/general.backups_help') !!}

@@ -275,7 +275,7 @@ {{ trans('admin/settings/general.login') }} -

{{ trans('admin/settings/general.login_help') }}

+

{{ trans('admin/settings/general.login_help') }}

@@ -290,7 +290,7 @@ {{ trans('admin/settings/general.oauth') }} -

{{ trans('admin/settings/general.oauth_help') }}

+

{{ trans('admin/settings/general.oauth_help') }}

@@ -307,7 +307,7 @@ -

{{ trans('admin/settings/general.php_overview_help') }}

+

{{ trans('admin/settings/general.php_overview_help') }}

@@ -325,7 +325,7 @@ -

{{ trans('admin/settings/general.purge_help') }}

+

{{ trans('admin/settings/general.purge_help') }}

@@ -448,7 +448,7 @@ var options = { - valueNames: [ 'name', 'keywords', 'summary', 'help-block'] + valueNames: [ 'name', 'keywords', 'summary', 'index-blocks'] }; var settingList = new List('setting-list', options); From 392db81499be3a8a6675f795ce37c86fbd3da3a8 Mon Sep 17 00:00:00 2001 From: akemidx Date: Wed, 2 Apr 2025 21:28:34 -0400 Subject: [PATCH 02/17] requested changes --- resources/assets/less/app.less | 10 ++----- resources/views/settings/index.blade.php | 36 ++++++++++++------------ 2 files changed, 20 insertions(+), 26 deletions(-) diff --git a/resources/assets/less/app.less b/resources/assets/less/app.less index b90a6271c..4bd388972 100644 --- a/resources/assets/less/app.less +++ b/resources/assets/less/app.less @@ -384,18 +384,12 @@ a.logo.no-hover a:hover { background-color: transparent; } -.index-blocks { - color: var(--text-sub); - max-width: 400px; - max-height: 15px; +.index-block { overflow: hidden; text-overflow: ellipsis; - text-align: center; white-space: nowrap; } -.index-blocks:hover{ - background-color: var(--back-sub); - color: var(--text-main); +.index-block:hover{ overflow: visible; white-space: normal; height:auto; diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php index f0081a652..718904a7e 100755 --- a/resources/views/settings/index.blade.php +++ b/resources/views/settings/index.blade.php @@ -67,7 +67,7 @@ -

{{ trans('admin/settings/general.brand_help') }}

+

{{ trans('admin/settings/general.brand_help') }}

@@ -84,7 +84,7 @@ -

{{ trans('admin/settings/general.general_settings_help') }}

+

{{ trans('admin/settings/general.general_settings_help') }}

@@ -101,7 +101,7 @@ -

{{ trans('admin/settings/general.security_help') }}

+

{{ trans('admin/settings/general.security_help') }}

@@ -117,7 +117,7 @@ -

{{ trans('admin/settings/general.groups_help') }}

+

{{ trans('admin/settings/general.groups_help') }}

@@ -134,7 +134,7 @@ -

{{ trans('admin/settings/general.localization_help') }}

+

{{ trans('admin/settings/general.localization_help') }}

@@ -152,7 +152,7 @@ -

{{ trans('admin/settings/general.notifications_help') }}

+

{{ trans('admin/settings/general.notifications_help') }}

@@ -167,7 +167,7 @@ {{ trans('admin/settings/general.integrations') }} -

{{ trans('admin/settings/general.webhook_help') }}

+

{{ trans('admin/settings/general.webhook_help') }}

@@ -182,7 +182,7 @@ {{ trans('general.asset_tags') }} -

{{ trans('admin/settings/general.asset_tags_help') }}

+

{{ trans('admin/settings/general.asset_tags_help') }}

@@ -198,7 +198,7 @@ -

{!! trans('admin/settings/general.labels_help') !!}

+

{!! trans('admin/settings/general.labels_help') !!}

@@ -214,7 +214,7 @@ {{ trans('admin/settings/general.ldap') }} -

{{ trans('admin/settings/general.ldap_help') }}

+

{{ trans('admin/settings/general.ldap_help') }}

@@ -229,7 +229,7 @@ Google -

{{ trans('admin/settings/general.google_login') }}

+

{{ trans('admin/settings/general.google_login') }}

@@ -244,7 +244,7 @@ {{ trans('admin/settings/general.saml') }} -

{{ trans('admin/settings/general.saml_help') }}

+

{{ trans('admin/settings/general.saml_help') }}

@@ -259,7 +259,7 @@ {{ trans('admin/settings/general.backups') }} -

{!! trans('admin/settings/general.backups_help') !!}

+

{!! trans('admin/settings/general.backups_help') !!}

@@ -275,7 +275,7 @@ {{ trans('admin/settings/general.login') }} -

{{ trans('admin/settings/general.login_help') }}

+

{{ trans('admin/settings/general.login_help') }}

@@ -290,7 +290,7 @@ {{ trans('admin/settings/general.oauth') }} -

{{ trans('admin/settings/general.oauth_help') }}

+

{{ trans('admin/settings/general.oauth_help') }}

@@ -307,7 +307,7 @@ -

{{ trans('admin/settings/general.php_overview_help') }}

+

{{ trans('admin/settings/general.php_overview_help') }}

@@ -325,7 +325,7 @@ -

{{ trans('admin/settings/general.purge_help') }}

+

{{ trans('admin/settings/general.purge_help') }}

@@ -448,7 +448,7 @@ var options = { - valueNames: [ 'name', 'keywords', 'summary', 'index-blocks'] + valueNames: [ 'name', 'keywords', 'summary', 'index-block'] }; var settingList = new List('setting-list', options); From 29433882eac38b153a06a6872cf26cbbf07f5c45 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 2 Jul 2024 16:14:04 -0700 Subject: [PATCH 03/17] Restore custom field checkbox and radio button values when switching model --- resources/views/hardware/edit.blade.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 1a7a5fad8..9f0b9c9d9 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -221,6 +221,17 @@ //now re-populate the custom fields based on the previously saved values $('#custom_fields_content').find('input,select').each(function (index,elem) { if(transformed_oldvals[elem.name]) { + if (elem.type === 'checkbox' || elem.type === 'radio'){ + let shouldBeChecked = oldvals.find(oldValElement => { + return oldValElement.name === elem.name && oldValElement.value === $(elem).val(); + }); + + if (shouldBeChecked){ + $(elem).prop('checked', true); + } + + return; + } {{-- If there already *is* is a previously-input 'transformed_oldvals' handy, overwrite with that previously-input value *IF* this is an edit of an existing item *OR* if there is no new default custom field value coming from the model --}} From 67ec042ee35d13b47392cde8ea34e8fe043316b8 Mon Sep 17 00:00:00 2001 From: Jeremy Price Date: Wed, 23 Apr 2025 13:27:58 -0700 Subject: [PATCH 04/17] Support more Mint versions and verify newer Ubuntu versions in snipeit.sh In https://github.com/grokability/snipe-it/pull/16763 we added support for Linux Mint 22.1, which is the newest stable version of Mint, but but didn't get around to testing or adding support for less-recent versions. With this PR, we're adding support for the following LinuxMint versions * 22 * 21.3 * 21.2 * 21.1 * 21 We recommend using the newest version, but at least now you won't be blocked so long as you're remotely up-to-date. We're not going back any further because prior versions are based on Ubuntu 20.04 (Focal), which is out of support as of April 2025, aka this month. Additionally, the most recent Ubuntu version specifically mentioned in the script is 23.10. The script in its current version works all the way up to the most recent version, so we're adding notation to that effect. Newly included Ubuntu versions are 25.04 24.10 24.04 (LTS) --- snipeit.sh | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/snipeit.sh b/snipeit.sh index e4b50c8e9..035551aa7 100755 --- a/snipeit.sh +++ b/snipeit.sh @@ -18,6 +18,8 @@ # Updated Snipe-IT Install Script # # Update created by Aaron Myers # # Change log # +# * verify support for Ubuntu 24.04 -> 25.04 # +# * add support for linux Mint 21 -> 22 inclusive # # * add support for linux mint 22.1 # # * add support for php8.2, awslinux2, alma 8/9 # # * fix rocky8/9 support # @@ -88,6 +90,7 @@ readonly APP_NAME="snipeit" readonly APP_PATH="/var/www/html/$APP_NAME" readonly APP_LOG="/var/log/snipeit-install.log" readonly COMPOSER_PATH="/home/$APP_USER" +is_mint=false progress () { spin[0]="-" @@ -351,6 +354,7 @@ case $distro in *linuxmint*) echo " The installer has detected $distro version $version codename $codename." distro=Ubuntu + is_mint=true apache_group=www-data apachefile=/etc/apache2/sites-available/$APP_NAME.conf ;; @@ -540,7 +544,7 @@ case $distro in ;; Ubuntu) if [ "${version//./}" -ge "2304" ]; then - # Install for Ubuntu 23.04 and 23.10 + # Install for Ubuntu 23.04 and above set_fqdn set_dbpass tzone=$(cat /etc/timezone) @@ -550,7 +554,7 @@ case $distro in progress echo "* Installing Apache httpd, PHP, MariaDB and other requirements." - PACKAGES="cron mariadb-server mariadb-client apache2 libapache2-mod-php php php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml php-bcmath curl git unzip" + PACKAGES="cron mariadb-server mariadb-client apache2 libapache2-mod-php php php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml php-bcmath curl git unzip wget" install_packages echo "* Configuring Apache." @@ -575,12 +579,27 @@ case $distro in chmod 777 -R $APP_PATH/storage/framework/cache/ log "run_as_app_user php $APP_PATH/artisan cache:clear" chmod 775 -R $APP_PATH/storage/ - elif [ "${version//./}" -eq "221" ]; then - # Install for Linux Mint 22.1 + elif [[ "${is_mint}" == "true" ]]; then + # Install for Linux Mint 21.2 - 22.1 + + if [[ "${version//.*/}" -eq "22" ]] ; then + ubuntu_codename=noble + elif [[ "${version//.*/}" -eq "21" ]]; then + ubuntu_codename=jammy + else + echo "Unsupported Linux Mint version. Version found: $version" + exit 1 + fi + set_fqdn set_dbpass tzone=$(cat /etc/timezone) + echo "* Set up Ondrej PHP repository" + echo "# Odrej PHP repo for ability to choose non-distro PHP versions" > /etc/apt/sources.list.d/ppa_ondrej_php_$ubuntu_codename.list + echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu $ubuntu_codename main" >> /etc/apt/sources.list.d/ppa_ondrej_php_$ubuntu_codename.list + sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C + echo -n "* Updating installed packages." log "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y upgrade" & pid=$! progress From 9722d29070b036caa6a8f660df6b4c4d9f60b306 Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 28 Apr 2025 09:59:17 +0100 Subject: [PATCH 05/17] =?UTF-8?q?Use=20default=20BS=20tables=20=E2=80=9Cno?= =?UTF-8?q?=20results=E2=80=9D=20view?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: snipe --- resources/views/hardware/view.blade.php | 27 +------------------------ 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index ba6556c41..662b651c5 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -1164,7 +1164,6 @@
- @if ($asset->licenses->count() > 0) @@ -1197,13 +1196,6 @@ @endforeach
- @else - -
- - {{ trans('general.no_results') }} -
- @endif
@@ -1212,7 +1204,7 @@
- @if($asset->components->count() > 0) + @@ -1257,12 +1249,6 @@
{{ trans('general.name') }}
- @else -
- - {{ trans('general.no_results') }} -
- @endif
@@ -1272,9 +1258,6 @@
- @if ($asset->assignedAssets->count() > 0) - -
- @else - -
- - {{ trans('general.no_results') }} -
- @endif -
From 66b537bc644f94e662cb45786f9eea9a9914868a Mon Sep 17 00:00:00 2001 From: snipe Date: Mon, 28 Apr 2025 09:59:28 +0100 Subject: [PATCH 06/17] Fixed duplicate ID Signed-off-by: snipe --- resources/views/locations/view.blade.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php index 90a8016da..469a08ad1 100644 --- a/resources/views/locations/view.blade.php +++ b/resources/views/locations/view.blade.php @@ -247,6 +247,7 @@ @include('partials.asset-bulk-actions', ['id_divname' => 'AssignedAssetsBulkEditToolbar', 'id_formname' => 'assignedAssetsBulkForm', 'id_button' => 'AssignedbulkAssetEditButton']) 'RTDassetsBulkEditToolbar', 'id_formname' => 'RTDassets', 'id_button' => 'RTDbulkAssetEditButton'])

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

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

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

Date: Mon, 28 Apr 2025 09:59:52 +0100 Subject: [PATCH 07/17] Default BS table no results Signed-off-by: snipe --- resources/views/hardware/requested.blade.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/resources/views/hardware/requested.blade.php b/resources/views/hardware/requested.blade.php index 3c54445bd..eff97ebfa 100644 --- a/resources/views/hardware/requested.blade.php +++ b/resources/views/hardware/requested.blade.php @@ -20,7 +20,6 @@
- @if ($requestedItems->count() > 0)
- @else -
-
- - {{ trans('general.no_results') }} -
-
- @endif + From 149d276e06bef7a5a651d8c716c66d5b223fc723 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Mon, 28 Apr 2025 13:26:49 -0700 Subject: [PATCH 08/17] fix field alignment issue --- app/View/Label.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/View/Label.php b/app/View/Label.php index 6dbad39a3..11bb24aab 100644 --- a/app/View/Label.php +++ b/app/View/Label.php @@ -177,14 +177,10 @@ class Label implements View // The end result of this will be in this format: // {labelOne} {valueOne} | {labelTwo} {valueTwo} | {labelThree} {valueThree} $previous['value'] = trim(implode(' | ', [ - implode(' ', [$previous['label'], $previous['value']]), + implode(' ', [null, $previous['value']]), implode(' ', [$current['label'], $current['value']]), ])); - // We'll set the label to an empty string since we - // injected the label into the value field above. - $previous['label'] = ''; - return $previous; }); From 28ea75512c6f208e52ed16be67e50988a4853e90 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 13:47:23 -0700 Subject: [PATCH 09/17] Replace from Form::radio on user edit page --- .../forms/edit/permissions-base.blade.php | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index a6a6abf9e..2ff5b79f6 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -59,15 +59,33 @@ From 97d2e6f9d4dd11b27da68bef2b94bbca3c47963c Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 14:03:27 -0700 Subject: [PATCH 10/17] Replace a Form::radio on user edit page --- .../forms/edit/permissions-base.blade.php | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index 2ff5b79f6..ffd3a3ce3 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -102,12 +102,15 @@ @endif From 36be23f7e44d87aebb82347c0fa3c3e45f28fd33 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 14:57:03 -0700 Subject: [PATCH 13/17] Replace a Form::radio on user edit page --- .../forms/edit/permissions-base.blade.php | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index 87ddf32cd..bf4f20110 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -18,11 +18,31 @@ From c3531e9eba1e141883c6c2f11afde67fa89ab700 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 29 Apr 2025 10:11:00 +0100 Subject: [PATCH 16/17] Nicer formatting on smaller screens Signed-off-by: snipe --- .../lang/en-US/admin/settings/general.php | 3 + resources/views/settings/alerts.blade.php | 254 +++++++++-------- resources/views/settings/security.blade.php | 269 +++++++++--------- 3 files changed, 278 insertions(+), 248 deletions(-) diff --git a/resources/lang/en-US/admin/settings/general.php b/resources/lang/en-US/admin/settings/general.php index 12be36a9c..e5931d9ac 100644 --- a/resources/lang/en-US/admin/settings/general.php +++ b/resources/lang/en-US/admin/settings/general.php @@ -465,6 +465,9 @@ return [ 'logos' => 'Logos & Display', 'colors' => 'Colors & Skins', 'footer' => 'Footer Preferences', + 'security' => 'Security Preferences', + 'general' => 'General', + 'intervals' => 'Intervals & Thresholds', ], diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php index 04554bcf3..3a009fffa 100644 --- a/resources/views/settings/alerts.blade.php +++ b/resources/views/settings/alerts.blade.php @@ -38,129 +38,147 @@
+
-
- -
-
- +
+ + {{ trans('admin/settings/general.legends.general') }} + + + +
+
+ +
+ + +
+
+ +
+
+ +
+ +
+ + {{ trans('admin/settings/general.legends.email') }} + + + +
+
+ +
+
+ + {!! $errors->first('alert_email', '
') !!} +

{{ trans('admin/settings/general.alert_email_help') }}

+ +
+
+ + + +
+
+ +
+
+ + {!! $errors->first('admin_cc_email', '
') !!} +

{{ trans('admin/settings/general.admin_cc_email_help') }}

+ + +
+
+
+ +
+ + {{ trans('admin/settings/general.legends.intervals') }} + + + + +
+
+ +
+
+ + {!! $errors->first('alert_interval', '') !!} +
+
+ + +
+
+ +
+
+ + {!! $errors->first('alert_threshold', '') !!} +
+
+ + + +
+
+ +
+
+ + {{ trans('general.months') }} +
+
+ {!! $errors->first('audit_interval', '') !!} +

{{ trans('admin/settings/general.audit_interval_help') }}

+
+
+ + +
+
+ +
+
+ + {{ trans('general.days') }} +
+
+ {!! $errors->first('audit_warning_days', '') !!} +

{{ trans('admin/settings/general.audit_warning_days_help') }}

+
+
+ + +
+
+ +
+
+ + {{ trans('general.days') }} +
+
+ {!! $errors->first('due_checkin_days', '') !!} +

{{ trans('admin/settings/general.due_checkin_days_help') }}

+
+
+
+
- -
-
- -
-
- - - - -
-
- -
-
- - {!! $errors->first('alert_email', '
') !!} -

{{ trans('admin/settings/general.alert_email_help') }}

- -
-
- - - -
-
- -
-
- - {!! $errors->first('admin_cc_email', '
') !!} - -

{{ trans('admin/settings/general.admin_cc_email_help') }}

- - -
-
- - -
-
- -
-
- - {!! $errors->first('alert_interval', '') !!} -
-
- - -
-
- -
-
- - {!! $errors->first('alert_threshold', '') !!} -
-
- - - -
-
- -
-
- - {{ trans('general.months') }} -
-
- {!! $errors->first('audit_interval', '') !!} -

{{ trans('admin/settings/general.audit_interval_help') }}

-
-
- - -
-
- -
-
- - {{ trans('general.days') }} -
-
- {!! $errors->first('audit_warning_days', '') !!} -

{{ trans('admin/settings/general.audit_warning_days_help') }}

-
-
- - -
-
- -
-
- - {{ trans('general.days') }} -
-
- {!! $errors->first('due_checkin_days', '') !!} -

{{ trans('admin/settings/general.due_checkin_days_help') }}

-
-
- -
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php index 366beccee..f1b5f4249 100644 --- a/resources/views/settings/security.blade.php +++ b/resources/views/settings/security.blade.php @@ -22,7 +22,7 @@ {{ csrf_field() }}
-
+
@@ -35,142 +35,151 @@
-
+
+
+ + {{ trans('admin/settings/general.legends.security') }} + - -
-
- -
-
+ +
+
+ +
+
- {!! Form::two_factor_options('two_factor_enabled', old('two_factor_enabled', $setting->two_factor_enabled), 'select2') !!} -

{{ trans('admin/settings/general.two_factor_enabled_warning') }}

+ {!! Form::two_factor_options('two_factor_enabled', old('two_factor_enabled', $setting->two_factor_enabled), 'select2') !!} +

{{ trans('admin/settings/general.two_factor_enabled_warning') }}

- @if (config('app.lock_passwords')) -

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

- @endif - - {!! $errors->first('two_factor_enabled', '') !!} -
-
- - -
-
- -
-
- - - {!! $errors->first('pwd_secure_min', '') !!} -

- {{ trans('admin/settings/general.pwd_secure_min_help') }} -

- - -
-
- - - - -
-
- -
-
- - - - - - - - @if ($errors->has('pwd_secure_complexity.*')) - {{ trans('validation.generic.invalid_value_in_field') }} - @endif -

- {{ trans('admin/settings/general.pwd_secure_complexity_help') }} -

-
-
- -
- -
-
- {{ trans('admin/settings/general.login_remote_user_text') }} -
-
- - - @if (config('app.lock_passwords')) -

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

- @else - - - {!! $errors->first('login_remote_user_enabled', '') !!} -

- {{ trans('admin/settings/general.login_remote_user_enabled_help') }} -

- - - - {!! $errors->first('login_remote_user_header_name', ':message') !!} -

- {{ trans('admin/settings/general.login_remote_user_header_name_help') }} -

- - - - - {!! $errors->first('login_remote_user_custom_logout_url', '') !!} -

- {{ trans('admin/settings/general.login_remote_user_custom_logout_url_help') }} -

- - @if ($setting->login_remote_user_enabled == '1') - - - - {!! $errors->first('login_common_disabled', '') !!} -

- {{ trans('admin/settings/general.login_common_disabled_help') }} -

+ @if (config('app.lock_passwords')) +

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

@endif - @endif - + {!! $errors->first('two_factor_enabled', '') !!} +
-
+ + +
+
+ +
+
+ + {!! $errors->first('pwd_secure_min', '') !!} +

+ {{ trans('admin/settings/general.pwd_secure_min_help') }} +

+
+
+ + + + +
+
+ +
+
+ + + + + + + + @if ($errors->has('pwd_secure_complexity.*')) + {{ trans('validation.generic.invalid_value_in_field') }} + @endif +

+ {{ trans('admin/settings/general.pwd_secure_complexity_help') }} +

+
+
+
+ +
+ + {{ trans('admin/settings/general.login_remote_user_text') }} + + +
+ +
+ + + @if (config('app.lock_passwords')) +

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

+ @else + + + {!! $errors->first('login_remote_user_enabled', '') !!} +

+ {{ trans('admin/settings/general.login_remote_user_enabled_help') }} +

+
+
+ + +
+
+ + {!! $errors->first('login_remote_user_header_name', ':message') !!} +

+ {{ trans('admin/settings/general.login_remote_user_header_name_help') }} +

+
+
+ + +
+
+ + {!! $errors->first('login_remote_user_custom_logout_url', '') !!} +

+ {{ trans('admin/settings/general.login_remote_user_custom_logout_url_help') }} +

+
+ @if ($setting->login_remote_user_enabled == '1') +
+ + +
+
+ {!! $errors->first('login_common_disabled', '') !!} +

+ {{ trans('admin/settings/general.login_common_disabled_help') }} +

+ @endif +
+ + @endif +
From f357dd690bfdc2691e64cc1a8ea660ed788589d6 Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 29 Apr 2025 10:21:24 +0100 Subject: [PATCH 17/17] Updated dev assets Signed-off-by: snipe --- public/css/build/app.css | 10 ++++++++++ public/css/dist/all.css | 10 ++++++++++ public/mix-manifest.json | 4 ++-- 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/public/css/build/app.css b/public/css/build/app.css index ac0038d91..08f9906ee 100644 --- a/public/css/build/app.css +++ b/public/css/build/app.css @@ -312,6 +312,16 @@ a.accordion-header { a.logo.no-hover a:hover { background-color: transparent; } +.index-block { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.index-block:hover { + overflow: visible; + white-space: normal; + height: auto; +} input:required, select:required, textarea:required { diff --git a/public/css/dist/all.css b/public/css/dist/all.css index daf7afc0c..6f3402d3e 100644 --- a/public/css/dist/all.css +++ b/public/css/dist/all.css @@ -21647,6 +21647,16 @@ a.accordion-header { a.logo.no-hover a:hover { background-color: transparent; } +.index-block { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} +.index-block:hover { + overflow: visible; + white-space: normal; + height: auto; +} input:required, select:required, textarea:required { diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 44a791aea..02c373c9b 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -3,7 +3,7 @@ "/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=a51d8ac1d0948606bf6bd2fb06118cf0", - "/css/build/app.css": "/css/build/app.css?id=ab4260b4ba55925847355b80d52284e7", + "/css/build/app.css": "/css/build/app.css?id=b9970ad4ec56f54702fd07be6ee5dd21", "/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=92544e15c3d4279605e0ca974b707737", + "/css/dist/all.css": "/css/dist/all.css?id=84aee73038982c2f8a4a09c658b3559e", "/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",
- {{ Form::radio("$area", '1',false,['value'=>"grant", 'data-checker-group' => str_slug($area), 'aria-label' => $area]) }} + - {{ Form::radio("$area", '-1',false,['value'=>"deny", 'data-checker-group' => str_slug($area), 'aria-label' => $area]) }} + - {{ Form::radio("$area", '0',false,['value'=>"inherit", 'data-checker-group' => str_slug($area), 'aria-label' => $area] ) }} +
- - @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[$permission['permission'] ] == '1', ["value"=>"grant", 'disabled'=>'disabled', 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }} - @else - {{ Form::radio('permission['.$permission['permission'].']', '1', $userPermissions[ $permission['permission'] ] == '1', ["value"=>"grant",'class'=>'radiochecker-'.str_slug($area), 'aria-label' =>'permission['.$permission['permission'].']']) }} - @endif + isSuperUser())) + name="permission[{{ $permission['permission'] }}]" + type="radio" + /> @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) From ea2f0cdd7b348d7bcf2900fb21e80bf59e5f11b9 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 14:18:01 -0700 Subject: [PATCH 11/17] Replace a Form::radio on user edit page --- .../partials/forms/edit/permissions-base.blade.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index ffd3a3ce3..83869fcf9 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -113,11 +113,15 @@ /> - @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny", 'disabled'=>'disabled', 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }} - @else - {{ Form::radio('permission['.$permission['permission'].']', '-1', $userPermissions[$permission['permission'] ] == '-1', ["value"=>"deny",'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }} - @endif + isSuperUser())) + name="permission[{{ $permission['permission'] }}]" + type="radio" + /> @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) From 51f67082f44b9ab36079194e45679b7f57af37b1 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 14:23:39 -0700 Subject: [PATCH 12/17] Replace a Form::radio on user edit page --- .../partials/forms/edit/permissions-base.blade.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index 83869fcf9..87ddf32cd 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -124,11 +124,15 @@ /> - @if (($permission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'disabled'=>'disabled', 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }} - @else - {{ Form::radio('permission['.$permission['permission'].']', '0', $userPermissions[$permission['permission']] =='0', ["value"=>"inherit", 'class'=>'radiochecker-'.str_slug($area), 'aria-label'=>'permission['.$permission['permission'].']']) }} - @endif + isSuperUser())) + name="permission[{{ $permission['permission'] }}]" + type="radio" + />
@if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin'))) - {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @else - {{ Form::radio('permission['.$localPermission['permission'].']', '1',$userPermissions[$localPermission['permission'] ] == '1',['value'=>"grant", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @endif From 8ca11542f8f7d736eaa6ffb6bbd83f5451f7ccf6 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 15:03:54 -0700 Subject: [PATCH 14/17] Replace a Form::radio on user edit page --- .../forms/edit/permissions-base.blade.php | 28 ++++++++++++++++--- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index bf4f20110..177ce43e8 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -37,11 +37,11 @@ /> @else @endif @@ -50,11 +50,31 @@ @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin'))) - {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @else - {{ Form::radio('permission['.$localPermission['permission'].']', '-1',$userPermissions[$localPermission['permission'] ] == '-1',['value'=>"deny", 'aria-label'=> 'permission['.$localPermission['permission'].']']) }} + @endif From db3f8e5d683abf0e2fd0c7b8e76b63d5a4060535 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Mon, 28 Apr 2025 15:08:05 -0700 Subject: [PATCH 15/17] Replace a Form::radio on user edit page --- .../forms/edit/permissions-base.blade.php | 26 ++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/resources/views/partials/forms/edit/permissions-base.blade.php b/resources/views/partials/forms/edit/permissions-base.blade.php index 177ce43e8..ad166888c 100644 --- a/resources/views/partials/forms/edit/permissions-base.blade.php +++ b/resources/views/partials/forms/edit/permissions-base.blade.php @@ -81,11 +81,31 @@ @if (($localPermission['permission'] == 'superuser') && (!Auth::user()->isSuperUser())) - {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }} + @elseif (($localPermission['permission'] == 'admin') && (!Auth::user()->hasAccess('admin'))) - {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['disabled'=>"disabled", 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }} + @else - {{ Form::radio('permission['.$localPermission['permission'].']','0',$userPermissions[$localPermission['permission'] ] == '0',['value'=>"inherit", 'aria-label'=> 'permission['.$localPermission['permission'].']'] ) }} + @endif