From b29a2a6ae4d6555040ba78fa3ff353c5035ca852 Mon Sep 17 00:00:00 2001 From: akemidx Date: Thu, 24 Oct 2024 17:23:03 -0400 Subject: [PATCH 1/4] removing header color from login button --- resources/views/layouts/basic.blade.php | 7 ------- 1 file changed, 7 deletions(-) diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php index db9e60e5de..29e4ab0a28 100644 --- a/resources/views/layouts/basic.blade.php +++ b/resources/views/layouts/basic.blade.php @@ -32,13 +32,6 @@ .skin-blue .sidebar-menu > li:hover > a, .skin-blue .sidebar-menu > li.active > a { border-left-color: {{ $snipeSettings->header_color }}; } - - .btn-primary { - background-color: {{ $snipeSettings->header_color }}; - border-color: {{ $snipeSettings->header_color }}; - } - - @endif From ca4bafc04a8e4f07792f9a51ce5e8a2fa690b51c Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Thu, 7 Nov 2024 11:34:12 -0800 Subject: [PATCH 2/4] adds a dark background to fieldsets, fixes right border --- resources/assets/less/overrides.less | 2 +- resources/assets/less/skins/skin-black-dark.less | 6 ++++-- resources/assets/less/skins/skin-blue-dark.less | 4 ++++ resources/assets/less/skins/skin-green-dark.less | 4 ++++ resources/assets/less/skins/skin-orange-dark.less | 5 +++++ resources/assets/less/skins/skin-purple-dark.less | 6 ++++-- resources/assets/less/skins/skin-red-dark.less | 6 ++++-- resources/assets/less/skins/skin-yellow-dark.less | 6 ++++-- 8 files changed, 30 insertions(+), 9 deletions(-) diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less index 8c4f2113a0..34b0c59065 100644 --- a/resources/assets/less/overrides.less +++ b/resources/assets/less/overrides.less @@ -47,7 +47,7 @@ padding: 10px; background: #f4f4f4; margin-bottom: 3px; - border-left: 2px solid #e6e7e8; + border-inline: 2px solid #e6e7e8; color: #444; cursor: move; } diff --git a/resources/assets/less/skins/skin-black-dark.less b/resources/assets/less/skins/skin-black-dark.less index c47bd74b35..1a6c50428d 100644 --- a/resources/assets/less/skins/skin-black-dark.less +++ b/resources/assets/less/skins/skin-black-dark.less @@ -112,8 +112,10 @@ a { color: #fff; } - - +#sort tr.cansort{ + background-color:var(--back-main); + color:var(--text-main); +} :root { --background: #222; diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less index 13b3bc17b9..e10b111e49 100644 --- a/resources/assets/less/skins/skin-blue-dark.less +++ b/resources/assets/less/skins/skin-blue-dark.less @@ -107,6 +107,10 @@ a { .text-primary { color: #fff; } +#sort tr.cansort{ + background-color:var(--back-main); + color:var(--text-main); +} diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less index 069d1bb3b6..02b6fda117 100644 --- a/resources/assets/less/skins/skin-green-dark.less +++ b/resources/assets/less/skins/skin-green-dark.less @@ -107,6 +107,10 @@ a { color: #fff; } +#sort tr.cansort{ + background-color:var(--back-main); + color:var(--text-main); +} diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less index 0ec1a87d2e..4e0badac8b 100644 --- a/resources/assets/less/skins/skin-orange-dark.less +++ b/resources/assets/less/skins/skin-orange-dark.less @@ -98,6 +98,11 @@ li.dropdown-item-marker { color: #fff; } +#sort tr.cansort{ + background-color:var(--back-main); + color:var(--text-main); +} + :root { --background: #222; --back-main: #333; diff --git a/resources/assets/less/skins/skin-purple-dark.less b/resources/assets/less/skins/skin-purple-dark.less index c86bc810f3..272bade83e 100644 --- a/resources/assets/less/skins/skin-purple-dark.less +++ b/resources/assets/less/skins/skin-purple-dark.less @@ -108,8 +108,10 @@ a { color: #fff; } - - +#sort tr.cansort{ + background-color:var(--back-main); + color:var(--text-main); +} :root { --background: #222; diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index b9e97615f4..6c6e1b44fa 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -107,8 +107,10 @@ a { color: #fff; } - - +#sort tr.cansort{ + background-color:var(--back-main); + color:var(--text-main); +} :root { --background: #222; diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less index ded0ed452f..7fb8a03bbd 100644 --- a/resources/assets/less/skins/skin-yellow-dark.less +++ b/resources/assets/less/skins/skin-yellow-dark.less @@ -104,8 +104,10 @@ a { color: #fff; } - - +#sort tr.cansort{ + background-color:var(--back-main); + color:var(--text-main); +} :root { --background: #222; From 1061df8c8b6ccbe6fa67629bc425a2fbf88208eb Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 13 Nov 2024 13:07:28 -0800 Subject: [PATCH 3/4] fix user checkout license category email check --- app/Listeners/CheckoutableListener.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/Listeners/CheckoutableListener.php b/app/Listeners/CheckoutableListener.php index 5b740e3f42..c5499784b7 100644 --- a/app/Listeners/CheckoutableListener.php +++ b/app/Listeners/CheckoutableListener.php @@ -77,7 +77,7 @@ class CheckoutableListener */ if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() || - (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email())) { + $this->checkoutableShouldSendEmail($event)) { Log::info('Sending checkout email, Locale: ' . ($event->checkedOutTo->locale ?? 'default')); if (!empty($notifiable)) { Mail::to($notifiable)->cc($ccEmails)->send($mailable); @@ -146,7 +146,6 @@ class CheckoutableListener $ccEmails = array_filter($adminCcEmailsArray); $mailable = $this->getCheckinMailType($event); $notifiable = $this->getNotifiables($event); - if (!$event->checkedOutTo->locale){ $mailable->locale($event->checkedOutTo->locale); } @@ -159,7 +158,7 @@ class CheckoutableListener * 3. The item should send an email at check-in/check-out */ if ($event->checkoutable->requireAcceptance() || $event->checkoutable->getEula() || - (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email())) { + $this->checkoutableShouldSendEmail($event)) { Log::info('Sending checkin email, Locale: ' . ($event->checkedOutTo->locale ?? 'default')); if (!empty($notifiable)) { Mail::to($notifiable)->cc($ccEmails)->send($mailable); @@ -338,4 +337,12 @@ class CheckoutableListener { return Setting::getSettings() && Setting::getSettings()->webhook_endpoint; } + + private function checkoutableShouldSendEmail($event): bool + { + if($event->checkoutable instanceof LicenseSeat){ + return $event->checkoutable->license->checkin_email(); + } + return (method_exists($event->checkoutable, 'checkin_email') && $event->checkoutable->checkin_email()); + } } From ada8e77b85776306291c69c1ee0cd862621ba1d4 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 13 Nov 2024 21:16:08 +0000 Subject: [PATCH 4/4] Added location to asset view Signed-off-by: snipe --- resources/views/account/view-assets.blade.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/resources/views/account/view-assets.blade.php b/resources/views/account/view-assets.blade.php index 96683fa9b1..08062e29a5 100755 --- a/resources/views/account/view-assets.blade.php +++ b/resources/views/account/view-assets.blade.php @@ -431,6 +431,9 @@ {{ trans('admin/hardware/form.default_location') }} + + {{ trans('general.location') }} + @can('self.view_purchase_cost') @@ -489,6 +492,9 @@ {{ ($asset->defaultLoc) ? $asset->defaultLoc->name : '' }} + + {{ ($asset->location) ? $asset->location->name : '' }} + @can('self.view_purchase_cost') {!! Helper::formatCurrencyOutput($asset->purchase_cost) !!}