From 39e06a88567e7fed6244124eff9dc1d5e43a736d Mon Sep 17 00:00:00 2001 From: akemi Date: Mon, 28 Nov 2022 13:52:43 -0500 Subject: [PATCH 1/6] Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated --- app/Http/Controllers/Api/UsersController.php | 19 ++++--------------- .../lang/en/admin/accessories/message.php | 5 +++++ 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 4a243c7cb..dcd18e449 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -505,22 +505,11 @@ class UsersController extends Controller $user = User::findOrFail($id); if (empty($user->email)) { - return response()->json( - [ - 'status' => 'error', - 'message' => 'This user has no email set.', - 'payload' => null, - ], 404); + return response()->json(Helper::formatStandardApiResponse(‘error’, $accessory, trans('admin/accessories/message.inventorynotification.error'))); } - - $user->notify((new CurrentInventory($user))); - - return response()->json( - [ - 'status' => 'success', - 'message' => 'The user was notified about his current inventory.', - 'payload' => null, - ], 200); + + return response()->Helper::formatStandardApiResponse('success', $accessory, trans('admin/accessories/message.inventorynotification.success')); + } /** diff --git a/resources/lang/en/admin/accessories/message.php b/resources/lang/en/admin/accessories/message.php index a35646306..5cbfdeb43 100644 --- a/resources/lang/en/admin/accessories/message.php +++ b/resources/lang/en/admin/accessories/message.php @@ -31,6 +31,11 @@ return array( 'error' => 'Accessory was not checked in, please try again', 'success' => 'Accessory checked in successfully.', 'user_does_not_exist' => 'That user is invalid. Please try again.' + ), + + 'inventorynotification' => array( + 'error' => 'This user has no email set.', + 'success' => 'The user has been notified about their current inventory.' ) From 55f5e7866dcd99456b38f4d08e0d39e38521f412 Mon Sep 17 00:00:00 2001 From: akemi Date: Tue, 29 Nov 2022 15:59:36 -0500 Subject: [PATCH 2/6] edits for PR --- app/Http/Controllers/Api/UsersController.php | 6 +++--- resources/lang/en/admin/accessories/message.php | 4 ---- resources/lang/en/admin/users/message.php | 4 ++++ 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index dcd18e449..5a368ecde 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -492,7 +492,7 @@ class UsersController extends Controller } /** - * Notify a specific user via email with all of his assigned assets. + * Notify a specific user via email with all of their assigned assets. * * @author [Lukas Fehling] [] * @since [v6.0.13] @@ -505,10 +505,10 @@ class UsersController extends Controller $user = User::findOrFail($id); if (empty($user->email)) { - return response()->json(Helper::formatStandardApiResponse(‘error’, $accessory, trans('admin/accessories/message.inventorynotification.error'))); + return response()->json(Helper::formatStandardApiResponse(‘error’, null, trans('admin/users/message.inventorynotification.error'))); } - return response()->Helper::formatStandardApiResponse('success', $accessory, trans('admin/accessories/message.inventorynotification.success')); + return response()->Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success')); } diff --git a/resources/lang/en/admin/accessories/message.php b/resources/lang/en/admin/accessories/message.php index 5cbfdeb43..8099a3ac8 100644 --- a/resources/lang/en/admin/accessories/message.php +++ b/resources/lang/en/admin/accessories/message.php @@ -33,10 +33,6 @@ return array( 'user_does_not_exist' => 'That user is invalid. Please try again.' ), - 'inventorynotification' => array( - 'error' => 'This user has no email set.', - 'success' => 'The user has been notified about their current inventory.' - ) ); diff --git a/resources/lang/en/admin/users/message.php b/resources/lang/en/admin/users/message.php index 29f82db38..11292a069 100644 --- a/resources/lang/en/admin/users/message.php +++ b/resources/lang/en/admin/users/message.php @@ -59,4 +59,8 @@ return array( 'invalidfiles' => 'One or more of your files is too large or is a filetype that is not allowed. Allowed filetypes are png, gif, jpg, doc, docx, pdf, and txt.', ), + 'inventorynotification' => array( + 'error' => 'This user has no email set.', + 'success' => 'The user has been notified about their current inventory.' + ) ); \ No newline at end of file From cfc4229308fea172f6daef09842c8883d3274d9b Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 29 Nov 2022 13:15:08 -0800 Subject: [PATCH 3/6] Add @akemidx as a contributor --- .all-contributorsrc | 9 +++++++++ README.md | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 7f9f3f8de..a3214121c 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -2801,6 +2801,15 @@ "contributions": [ "code" ] + }, + { + "login": "akemidx", + "name": "akemidx", + "avatar_url": "https://avatars.githubusercontent.com/u/116301219?v=4", + "profile": "https://github.com/akemidx", + "contributions": [ + "code" + ] } ] } diff --git a/README.md b/README.md index 199f11f43..c92eb3358 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![Build Status](https://app.chipperci.com/projects/0e5f8979-31eb-4ee6-9abf-050b76ab0383/status/master) [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.svg)](https://crowdin.com/project/snipe-it) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeitapp.svg?style=social)](https://twitter.com/snipeitapp) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade) -[![All Contributors](https://img.shields.io/badge/all_contributors-308-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev) +[![All Contributors](https://img.shields.io/badge/all_contributors-309-orange.svg?style=flat-square)](#contributors) [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label)](https://discord.gg/yZFtShAcKk) [![huntr](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev) ## Snipe-IT - Open Source Asset Management System @@ -139,6 +139,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken | [
Christian Weirich](https://github.com/chrisweirich)
[💻](https://github.com/snipe/snipe-it/commits?author=chrisweirich "Code") | [
denzfarid](https://github.com/denzfarid)
| [
ntbutler-nbcs](https://github.com/ntbutler-nbcs)
[💻](https://github.com/snipe/snipe-it/commits?author=ntbutler-nbcs "Code") | [
Naveen](https://naveensrinivasan.dev)
[💻](https://github.com/snipe/snipe-it/commits?author=naveensrinivasan "Code") | [
Mike Roquemore](https://github.com/mikeroq)
[💻](https://github.com/snipe/snipe-it/commits?author=mikeroq "Code") | [
Daniel Reeder](https://github.com/reederda)
[🌍](#translation-reederda "Translation") [🌍](#translation-reederda "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=reederda "Code") | [
vickyjaura183](https://github.com/vickyjaura183)
[💻](https://github.com/snipe/snipe-it/commits?author=vickyjaura183 "Code") | | [
Peace](https://github.com/julian-piehl)
[💻](https://github.com/snipe/snipe-it/commits?author=julian-piehl "Code") | [
Kyle Gordon](https://github.com/kylegordon)
[💻](https://github.com/snipe/snipe-it/commits?author=kylegordon "Code") | [
Katharina Drexel](http://www.bfh.ch)
[💻](https://github.com/snipe/snipe-it/commits?author=sunflowerbofh "Code") | [
David Sferruzza](https://david.sferruzza.fr/)
[💻](https://github.com/snipe/snipe-it/commits?author=dsferruzza "Code") | [
Rick Nelson](https://github.com/rnelsonee)
[💻](https://github.com/snipe/snipe-it/commits?author=rnelsonee "Code") | [
BasO12](https://github.com/BasO12)
[💻](https://github.com/snipe/snipe-it/commits?author=BasO12 "Code") | [
Vautia](https://github.com/Vautia)
[💻](https://github.com/snipe/snipe-it/commits?author=Vautia "Code") | | [
Chris Hartjes](http://www.littlehart.net/atthekeyboard)
[💻](https://github.com/snipe/snipe-it/commits?author=chartjes "Code") | [
geo-chen](https://github.com/geo-chen)
[💻](https://github.com/snipe/snipe-it/commits?author=geo-chen "Code") | [
Phan Nguyen](https://github.com/nh314)
[💻](https://github.com/snipe/snipe-it/commits?author=nh314 "Code") | [
Iisakki Jaakkola](https://github.com/StarlessNights)
[💻](https://github.com/snipe/snipe-it/commits?author=StarlessNights "Code") | [
Ikko Ashimine](https://bandism.net/)
[💻](https://github.com/snipe/snipe-it/commits?author=eltociear "Code") | [
Lukas Fehling](https://github.com/lukasfehling)
[💻](https://github.com/snipe/snipe-it/commits?author=lukasfehling "Code") | [
Fernando Almeida](https://github.com/fernando-almeida)
[💻](https://github.com/snipe/snipe-it/commits?author=fernando-almeida "Code") | +| [
akemidx](https://github.com/akemidx)
[💻](https://github.com/snipe/snipe-it/commits?author=akemidx "Code") | This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! From 371a5bf4d602f5d8e2800388723f009a19800a80 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 30 Nov 2022 10:37:47 -0800 Subject: [PATCH 4/6] changes the icon color with themes --- public/css/dist/skins/skin-black-dark.css | 3 + public/css/dist/skins/skin-black-dark.min.css | 3 + public/css/dist/skins/skin-black.css | 3 + public/css/dist/skins/skin-black.min.css | 3 + public/css/dist/skins/skin-blue-dark.css | 3 + public/css/dist/skins/skin-blue-dark.min.css | 3 + public/css/dist/skins/skin-blue.css | 5 +- public/css/dist/skins/skin-blue.min.css | 5 +- public/css/dist/skins/skin-green-dark.css | 3 + public/css/dist/skins/skin-green-dark.min.css | 3 + public/css/dist/skins/skin-green.css | 3 + public/css/dist/skins/skin-green.min.css | 3 + public/css/dist/skins/skin-orange-dark.css | 3 + .../css/dist/skins/skin-orange-dark.min.css | 3 + public/css/dist/skins/skin-orange.css | 3 + public/css/dist/skins/skin-orange.min.css | 3 + public/css/dist/skins/skin-purple-dark.css | 3 + .../css/dist/skins/skin-purple-dark.min.css | 3 + public/css/dist/skins/skin-purple.css | 3 + public/css/dist/skins/skin-purple.min.css | 3 + public/css/dist/skins/skin-red-dark.css | 3 + public/css/dist/skins/skin-red-dark.min.css | 3 + public/css/dist/skins/skin-red.css | 3 + public/css/dist/skins/skin-red.min.css | 3 + public/css/dist/skins/skin-yellow-dark.css | 3 + .../css/dist/skins/skin-yellow-dark.min.css | 3 + public/css/dist/skins/skin-yellow.css | 3 + public/css/dist/skins/skin-yellow.min.css | 3 + public/mix-manifest.json | 56 +++++++++---------- .../assets/less/skins/skin-black-dark.less | 3 + resources/assets/less/skins/skin-black.less | 3 + .../assets/less/skins/skin-blue-dark.less | 4 +- resources/assets/less/skins/skin-blue.less | 8 ++- .../assets/less/skins/skin-green-dark.less | 4 +- resources/assets/less/skins/skin-green.less | 4 +- .../assets/less/skins/skin-orange-dark.less | 3 + resources/assets/less/skins/skin-orange.less | 3 + .../assets/less/skins/skin-purple-dark.less | 4 +- resources/assets/less/skins/skin-purple.less | 4 +- .../assets/less/skins/skin-red-dark.less | 3 + resources/assets/less/skins/skin-red.less | 3 + .../assets/less/skins/skin-yellow-dark.less | 3 + resources/assets/less/skins/skin-yellow.less | 3 + 43 files changed, 158 insertions(+), 38 deletions(-) diff --git a/public/css/dist/skins/skin-black-dark.css b/public/css/dist/skins/skin-black-dark.css index 8c9fd2462..5ba6c5ead 100644 --- a/public/css/dist/skins/skin-black-dark.css +++ b/public/css/dist/skins/skin-black-dark.css @@ -217,6 +217,9 @@ a:visited { .navbar-nav > li > a:link { color: var(--nav-link); } +.far fa-life-ring { + color: var(--link); +} .modal-content { background-color: var(--back-main); color: var(--text-main); diff --git a/public/css/dist/skins/skin-black-dark.min.css b/public/css/dist/skins/skin-black-dark.min.css index 8c9fd2462..5ba6c5ead 100644 --- a/public/css/dist/skins/skin-black-dark.min.css +++ b/public/css/dist/skins/skin-black-dark.min.css @@ -217,6 +217,9 @@ a:visited { .navbar-nav > li > a:link { color: var(--nav-link); } +.far fa-life-ring { + color: var(--link); +} .modal-content { background-color: var(--back-main); color: var(--text-main); diff --git a/public/css/dist/skins/skin-black.css b/public/css/dist/skins/skin-black.css index d487beb26..ab4d845e2 100644 --- a/public/css/dist/skins/skin-black.css +++ b/public/css/dist/skins/skin-black.css @@ -199,6 +199,9 @@ a.btn-danger:visited { .btn-danger.btn-sm.disabled { color: #FFF; } +.far fa-life-ring { + color: var(--link); +} .sidebar-toggle-mobile { color: #FFF !important; } diff --git a/public/css/dist/skins/skin-black.min.css b/public/css/dist/skins/skin-black.min.css index d487beb26..ab4d845e2 100644 --- a/public/css/dist/skins/skin-black.min.css +++ b/public/css/dist/skins/skin-black.min.css @@ -199,6 +199,9 @@ a.btn-danger:visited { .btn-danger.btn-sm.disabled { color: #FFF; } +.far fa-life-ring { + color: var(--link); +} .sidebar-toggle-mobile { color: #FFF !important; } diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css index 9431acd43..a393ee578 100644 --- a/public/css/dist/skins/skin-blue-dark.css +++ b/public/css/dist/skins/skin-blue-dark.css @@ -212,6 +212,9 @@ a:visited { .navbar-nav > li > a:link { color: var(--nav-link); } +.far fa-life-ring { + color: var(--link); +} .modal-content { background-color: var(--back-main); color: var(--text-main); diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css index 9431acd43..a393ee578 100644 --- a/public/css/dist/skins/skin-blue-dark.min.css +++ b/public/css/dist/skins/skin-blue-dark.min.css @@ -212,6 +212,9 @@ a:visited { .navbar-nav > li > a:link { color: var(--nav-link); } +.far fa-life-ring { + color: var(--link); +} .modal-content { background-color: var(--back-main); color: var(--text-main); diff --git a/public/css/dist/skins/skin-blue.css b/public/css/dist/skins/skin-blue.css index c6212ed43..cac900017 100644 --- a/public/css/dist/skins/skin-blue.css +++ b/public/css/dist/skins/skin-blue.css @@ -123,7 +123,7 @@ border-bottom-left-radius: 0; } .skin-blue.layout-top-nav .main-header > .logo .logo-variant { - background-color: none; + background-color: unset; } .btn.btn-primary, btn-sm.btn-primary, @@ -218,6 +218,9 @@ a:hover { .text-primary { color: #23536f; } +.far fa-life-ring { + color: var(--link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/css/dist/skins/skin-blue.min.css b/public/css/dist/skins/skin-blue.min.css index c6212ed43..cac900017 100644 --- a/public/css/dist/skins/skin-blue.min.css +++ b/public/css/dist/skins/skin-blue.min.css @@ -123,7 +123,7 @@ border-bottom-left-radius: 0; } .skin-blue.layout-top-nav .main-header > .logo .logo-variant { - background-color: none; + background-color: unset; } .btn.btn-primary, btn-sm.btn-primary, @@ -218,6 +218,9 @@ a:hover { .text-primary { color: #23536f; } +.far fa-life-ring { + color: var(--link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css index e6b796086..3fe0a606d 100644 --- a/public/css/dist/skins/skin-green-dark.css +++ b/public/css/dist/skins/skin-green-dark.css @@ -205,6 +205,9 @@ a:visited { .bootstrap-table .fixed-table-container .table thead th .sortable { color: var(--nav-link); } +.far fa-life-ring { + color: var(--link); +} .thead, .navbar-nav > li > a:link { color: var(--nav-link); diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css index e6b796086..3fe0a606d 100644 --- a/public/css/dist/skins/skin-green-dark.min.css +++ b/public/css/dist/skins/skin-green-dark.min.css @@ -205,6 +205,9 @@ a:visited { .bootstrap-table .fixed-table-container .table thead th .sortable { color: var(--nav-link); } +.far fa-life-ring { + color: var(--link); +} .thead, .navbar-nav > li > a:link { color: var(--nav-link); diff --git a/public/css/dist/skins/skin-green.css b/public/css/dist/skins/skin-green.css index 04ce314c9..fe0b85160 100644 --- a/public/css/dist/skins/skin-green.css +++ b/public/css/dist/skins/skin-green.css @@ -195,6 +195,9 @@ a:visited { .text-primary { color: #004023; } +.far fa-life-ring { + color: var(--link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/css/dist/skins/skin-green.min.css b/public/css/dist/skins/skin-green.min.css index 04ce314c9..fe0b85160 100644 --- a/public/css/dist/skins/skin-green.min.css +++ b/public/css/dist/skins/skin-green.min.css @@ -195,6 +195,9 @@ a:visited { .text-primary { color: #004023; } +.far fa-life-ring { + color: var(--link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css index da5e5e1b3..fe7af4f62 100644 --- a/public/css/dist/skins/skin-orange-dark.css +++ b/public/css/dist/skins/skin-orange-dark.css @@ -196,6 +196,9 @@ li.dropdown-item-marker { background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%); border-color: var(--header); } +.far fa-life-ring { + color: var(--link); +} .bootstrap-table .fixed-table-container .table thead th .sortable { color: var(--nav-link); } diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css index da5e5e1b3..fe7af4f62 100644 --- a/public/css/dist/skins/skin-orange-dark.min.css +++ b/public/css/dist/skins/skin-orange-dark.min.css @@ -196,6 +196,9 @@ li.dropdown-item-marker { background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%); border-color: var(--header); } +.far fa-life-ring { + color: var(--link); +} .bootstrap-table .fixed-table-container .table thead th .sortable { color: var(--nav-link); } diff --git a/public/css/dist/skins/skin-orange.css b/public/css/dist/skins/skin-orange.css index 052c01f87..b26415b6a 100644 --- a/public/css/dist/skins/skin-orange.css +++ b/public/css/dist/skins/skin-orange.css @@ -190,6 +190,9 @@ a.btn-warning:visited, a.btn-danger:visited { color: #FFF; } +.far fa-life-ring { + color: var(--link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/css/dist/skins/skin-orange.min.css b/public/css/dist/skins/skin-orange.min.css index 052c01f87..b26415b6a 100644 --- a/public/css/dist/skins/skin-orange.min.css +++ b/public/css/dist/skins/skin-orange.min.css @@ -190,6 +190,9 @@ a.btn-warning:visited, a.btn-danger:visited { color: #FFF; } +.far fa-life-ring { + color: var(--link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css index d0b7bfa91..e1bd8edb4 100644 --- a/public/css/dist/skins/skin-purple-dark.css +++ b/public/css/dist/skins/skin-purple-dark.css @@ -223,6 +223,9 @@ a:visited { a:link { color: var(--link); } +.far fa-life-ring { + color: var(--link); +} .btn-primary.hover { color: var(--nav-link); } diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css index d0b7bfa91..e1bd8edb4 100644 --- a/public/css/dist/skins/skin-purple-dark.min.css +++ b/public/css/dist/skins/skin-purple-dark.min.css @@ -223,6 +223,9 @@ a:visited { a:link { color: var(--link); } +.far fa-life-ring { + color: var(--link); +} .btn-primary.hover { color: var(--nav-link); } diff --git a/public/css/dist/skins/skin-purple.css b/public/css/dist/skins/skin-purple.css index bb4d0b9bd..d4f67fee9 100644 --- a/public/css/dist/skins/skin-purple.css +++ b/public/css/dist/skins/skin-purple.css @@ -196,6 +196,9 @@ a.btn-danger:visited { .select2-container--default .select2-selection--multiple .select2-selection__choice { background-color: #605ca8; } +.far fa-life-ring { + color: var(--link); +} .search-highlight, .search-highlight:hover { background-color: #e9d15b; diff --git a/public/css/dist/skins/skin-purple.min.css b/public/css/dist/skins/skin-purple.min.css index bb4d0b9bd..d4f67fee9 100644 --- a/public/css/dist/skins/skin-purple.min.css +++ b/public/css/dist/skins/skin-purple.min.css @@ -196,6 +196,9 @@ a.btn-danger:visited { .select2-container--default .select2-selection--multiple .select2-selection__choice { background-color: #605ca8; } +.far fa-life-ring { + color: var(--link); +} .search-highlight, .search-highlight:hover { background-color: #e9d15b; diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css index f420494d0..cbb5b07d1 100644 --- a/public/css/dist/skins/skin-red-dark.css +++ b/public/css/dist/skins/skin-red-dark.css @@ -226,6 +226,9 @@ a:visited { a:hover { color: var(--hover-link); } +.far fa-life-ring { + color: var(--link); +} .btn-primary.hover { color: var(--nav-link); } diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css index f420494d0..cbb5b07d1 100644 --- a/public/css/dist/skins/skin-red-dark.min.css +++ b/public/css/dist/skins/skin-red-dark.min.css @@ -226,6 +226,9 @@ a:visited { a:hover { color: var(--hover-link); } +.far fa-life-ring { + color: var(--link); +} .btn-primary.hover { color: var(--nav-link); } diff --git a/public/css/dist/skins/skin-red.css b/public/css/dist/skins/skin-red.css index f8b67c606..0dc365805 100644 --- a/public/css/dist/skins/skin-red.css +++ b/public/css/dist/skins/skin-red.css @@ -207,4 +207,7 @@ a.btn-danger:visited { .search-highlight:hover { background-color: #e9d15b; } +.far fa-life-ring { + color: var(--link); +} diff --git a/public/css/dist/skins/skin-red.min.css b/public/css/dist/skins/skin-red.min.css index f8b67c606..0dc365805 100644 --- a/public/css/dist/skins/skin-red.min.css +++ b/public/css/dist/skins/skin-red.min.css @@ -207,4 +207,7 @@ a.btn-danger:visited { .search-highlight:hover { background-color: #e9d15b; } +.far fa-life-ring { + color: var(--link); +} diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css index 3a3c34bec..5691df219 100644 --- a/public/css/dist/skins/skin-yellow-dark.css +++ b/public/css/dist/skins/skin-yellow-dark.css @@ -217,6 +217,9 @@ a:link.btn-default { text-decoration: none; color: var(--nav-link) !important; } +.far fa-life-ring { + color: var(--link); +} #accessoriesTable > tbody > tr > td > nobr > a > i.fa { color: var(--text-main); } diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css index 3a3c34bec..5691df219 100644 --- a/public/css/dist/skins/skin-yellow-dark.min.css +++ b/public/css/dist/skins/skin-yellow-dark.min.css @@ -217,6 +217,9 @@ a:link.btn-default { text-decoration: none; color: var(--nav-link) !important; } +.far fa-life-ring { + color: var(--link); +} #accessoriesTable > tbody > tr > td > nobr > a > i.fa { color: var(--text-main); } diff --git a/public/css/dist/skins/skin-yellow.css b/public/css/dist/skins/skin-yellow.css index 8a799cb64..8aef4cb90 100644 --- a/public/css/dist/skins/skin-yellow.css +++ b/public/css/dist/skins/skin-yellow.css @@ -214,4 +214,7 @@ a:visited { .skin-yellow .main-header .navbar .nav > li > a { color: #413F42; } +.far fa-life-ring { + color: var(--link); +} diff --git a/public/css/dist/skins/skin-yellow.min.css b/public/css/dist/skins/skin-yellow.min.css index 8a799cb64..8aef4cb90 100644 --- a/public/css/dist/skins/skin-yellow.min.css +++ b/public/css/dist/skins/skin-yellow.min.css @@ -214,4 +214,7 @@ a:visited { .skin-yellow .main-header .navbar .nav > li > a { color: #413F42; } +.far fa-life-ring { + color: var(--link); +} diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 535e8ef47..15e1bdd52 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,23 +1,23 @@ { "/js/build/app.js": "/js/build/app.js?id=598b7e88aba2349085422a0986bf1d9e", - "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=71977934351d63b126c6b3573baf3349", + "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374", "/css/build/overrides.css": "/css/build/overrides.css?id=f3e3228f6820fe6e5c520627f796af35", "/css/build/app.css": "/css/build/app.css?id=2a56df3a1a81da8eb5d8893e076620b5", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b", - "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=0715caf11a30f0756768c093ee3a5a8f", - "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=836ffa6a0053e605f53d797a7109fe63", - "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=a57f83bb35ed8aafa840cc1dc65785e5", - "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=1eaeba7e8bda34924d768c59e2b26d0c", - "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=47021aa27f4112d4abb6ba9ca371ded3", - "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=58736e6d133afd3a6dc5ca072033e389", - "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=73bb57f917efb32895488cef3d92b42a", - "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=3c9cef32dbb7c702b01d77871f30b84d", - "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=a5fb1d90f9c7fb061064f4db3522a49e", - "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=924fd5e1d5d41ffc483841a628eb9c58", - "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=c4c9c4304a3473e473774a45deee0a46", - "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=407f83d58689706f303a83e195f6c041", + "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", + "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=f343f659ca1d45534d2c2c3cc30fb619", + "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=57e634d63101d3613f4c73aaa2e3f50a", + "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=5120ce6a4b70d11bbc84a5125aa31949", + "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=7b315b9612b8fde8f9c5b0ddb6bba690", + "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=713b1205aa2d7c9db282f8cd5754c0e4", + "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=6fe68325d5356197672c27bc77cedcb4", + "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=6ea1eecb7f939256c373c92f58749e72", + "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=1c0f59079342d1a10099bf41d2e46f59", + "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=76482123f6c70e866d6b971ba91de7bb", + "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=c0d21166315b7c2cdd4819fa4a5e4d1e", + "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=8e538625ebd4b8096e150d1aa483547b", - "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=c17879493dcd86dbb6c1701082bec9f7", + "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898", "/css/dist/all.css": "/css/dist/all.css?id=e3544f9d2342c3d0a07e19b09b183e20", "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f2122815b2e4b150", "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b2414bd51dac5", @@ -35,19 +35,19 @@ "/js/build/vendor.js": "/js/build/vendor.js?id=47ecbb4bb3b0e02315f391caadbdf971", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=14d9a2affec7b066d20fcba2e6e67ad2", "/js/dist/all.js": "/js/dist/all.js?id=c281e69bed1a5a386e8cbc611b9bf781", - "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=407f83d58689706f303a83e195f6c041", - "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=c4c9c4304a3473e473774a45deee0a46", - "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=924fd5e1d5d41ffc483841a628eb9c58", - "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=a5fb1d90f9c7fb061064f4db3522a49e", - "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=71977934351d63b126c6b3573baf3349", - "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=a57f83bb35ed8aafa840cc1dc65785e5", - "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=47021aa27f4112d4abb6ba9ca371ded3", - "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=1eaeba7e8bda34924d768c59e2b26d0c", - "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=c17879493dcd86dbb6c1701082bec9f7", - "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=3c9cef32dbb7c702b01d77871f30b84d", - "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=73bb57f917efb32895488cef3d92b42a", - "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=58736e6d133afd3a6dc5ca072033e389", - "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=0715caf11a30f0756768c093ee3a5a8f", - "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=836ffa6a0053e605f53d797a7109fe63", + "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=0a82a6ae6bb4e58fe62d162c4fb50397", + "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=c0d21166315b7c2cdd4819fa4a5e4d1e", + "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=76482123f6c70e866d6b971ba91de7bb", + "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=1c0f59079342d1a10099bf41d2e46f59", + "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=f677207c6cf9678eb539abecb408c374", + "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=57e634d63101d3613f4c73aaa2e3f50a", + "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=7b315b9612b8fde8f9c5b0ddb6bba690", + "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=5120ce6a4b70d11bbc84a5125aa31949", + "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=44bf834f2110504a793dadec132a5898", + "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=6ea1eecb7f939256c373c92f58749e72", + "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=6fe68325d5356197672c27bc77cedcb4", + "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=713b1205aa2d7c9db282f8cd5754c0e4", + "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=6f0563e726c2fe4fab4026daaa5bfdf2", + "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=f343f659ca1d45534d2c2c3cc30fb619", "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=8e538625ebd4b8096e150d1aa483547b" } diff --git a/resources/assets/less/skins/skin-black-dark.less b/resources/assets/less/skins/skin-black-dark.less index fb0a0e0b8..cd2c2d1de 100644 --- a/resources/assets/less/skins/skin-black-dark.less +++ b/resources/assets/less/skins/skin-black-dark.less @@ -152,6 +152,9 @@ a { .thead, .navbar-nav>li>a:link { color: var(--nav-link); } +.far fa-life-ring{ + color:var(--link); +} .modal-content { background-color: var(--back-main); diff --git a/resources/assets/less/skins/skin-black.less b/resources/assets/less/skins/skin-black.less index b5581c679..1f85a9069 100755 --- a/resources/assets/less/skins/skin-black.less +++ b/resources/assets/less/skins/skin-black.less @@ -124,6 +124,9 @@ a.btn-info:link, a.btn-warning:link, a.btn-danger:link{ .btn-danger.btn-sm.disabled{ color: #FFF; } +.far fa-life-ring{ + color:var(--link); +} .sidebar-toggle-mobile { color: #FFF !important; diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less index 9d838bea3..a5f5c9398 100644 --- a/resources/assets/less/skins/skin-blue-dark.less +++ b/resources/assets/less/skins/skin-blue-dark.less @@ -149,7 +149,9 @@ a { .thead, .navbar-nav>li>a:link { color: var(--nav-link); } - +.far fa-life-ring{ + color:var(--link); +} .modal-content { background-color: var(--back-main); color: var(--text-main); diff --git a/resources/assets/less/skins/skin-blue.less b/resources/assets/less/skins/skin-blue.less index e0338f02f..fcbb3c030 100755 --- a/resources/assets/less/skins/skin-blue.less +++ b/resources/assets/less/skins/skin-blue.less @@ -52,7 +52,7 @@ .skin-blue.layout-top-nav .main-header > .logo { .logo-variant { - background-color: none; + background-color: unset; } } @@ -98,7 +98,7 @@ color: #fff; } -.btn-default:link, a.btn-default:hover, .btn-default:visited, +.btn-default:link, a.btn-default:hover, .btn-default:visited { color: @dark-gray; } @@ -138,7 +138,9 @@ a:hover { .text-primary { color: darken(@light-blue, 20%); } - +.far fa-life-ring{ + color:var(--link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less index c893c486a..80937c66b 100644 --- a/resources/assets/less/skins/skin-green-dark.less +++ b/resources/assets/less/skins/skin-green-dark.less @@ -142,7 +142,9 @@ a { .bootstrap-table .fixed-table-container .table thead th .sortable { color: var(--nav-link); } - +.far fa-life-ring{ + color:var(--link); +} .thead, .navbar-nav>li>a:link { color: var(--nav-link); } diff --git a/resources/assets/less/skins/skin-green.less b/resources/assets/less/skins/skin-green.less index af4586cd5..a152c6720 100755 --- a/resources/assets/less/skins/skin-green.less +++ b/resources/assets/less/skins/skin-green.less @@ -125,7 +125,9 @@ a { .text-primary { color: darken(@green, 20%); } - +.far fa-life-ring{ + color:var(--link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less index 04f7360ce..a62403d41 100644 --- a/resources/assets/less/skins/skin-orange-dark.less +++ b/resources/assets/less/skins/skin-orange-dark.less @@ -126,6 +126,9 @@ li.dropdown-item-marker { background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%); border-color: var(--header); } +.far fa-life-ring{ + color:var(--link); +} .bootstrap-table .fixed-table-container .table thead th .sortable { color: var(--nav-link); diff --git a/resources/assets/less/skins/skin-orange.less b/resources/assets/less/skins/skin-orange.less index 896eb6f31..966a6741e 100644 --- a/resources/assets/less/skins/skin-orange.less +++ b/resources/assets/less/skins/skin-orange.less @@ -119,6 +119,9 @@ a.btn-info:link, a.btn-warning:link, a.btn-danger:link{ &a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{ color: #FFF; } +.far fa-life-ring{ + color:var(--link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; diff --git a/resources/assets/less/skins/skin-purple-dark.less b/resources/assets/less/skins/skin-purple-dark.less index 6a0d82a8f..10c8fbfb3 100644 --- a/resources/assets/less/skins/skin-purple-dark.less +++ b/resources/assets/less/skins/skin-purple-dark.less @@ -162,7 +162,9 @@ a { a:link { color: var(--link); } - +.far fa-life-ring{ + color:var(--link); +} .btn-primary.hover { color: var(--nav-link); } diff --git a/resources/assets/less/skins/skin-purple.less b/resources/assets/less/skins/skin-purple.less index 7481ee5a7..feec37830 100755 --- a/resources/assets/less/skins/skin-purple.less +++ b/resources/assets/less/skins/skin-purple.less @@ -128,7 +128,9 @@ a.btn-info:link, a.btn-warning:link, a.btn-danger:link{ .select2-container--default .select2-selection--multiple .select2-selection__choice { background-color: @purple; } - +.far fa-life-ring{ + color:var(--link); +} .search-highlight, .search-highlight:hover { background-color: #e9d15b; } \ No newline at end of file diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less index f72b83de0..b5e3c96c6 100644 --- a/resources/assets/less/skins/skin-red-dark.less +++ b/resources/assets/less/skins/skin-red-dark.less @@ -169,6 +169,9 @@ a:visited { a:hover { color: var(--hover-link); } +.far fa-life-ring{ + color:var(--link); +} .btn-primary.hover { color: var(--nav-link); diff --git a/resources/assets/less/skins/skin-red.less b/resources/assets/less/skins/skin-red.less index 711bc6289..0ddc4bec6 100755 --- a/resources/assets/less/skins/skin-red.less +++ b/resources/assets/less/skins/skin-red.less @@ -137,4 +137,7 @@ a.btn-info:link, a.btn-warning:link, a.btn-danger:link{ .search-highlight, .search-highlight:hover { background-color: #e9d15b; +} +.far fa-life-ring{ + color:var(--link); } \ No newline at end of file diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less index 27913a4bd..b1688c09a 100644 --- a/resources/assets/less/skins/skin-yellow-dark.less +++ b/resources/assets/less/skins/skin-yellow-dark.less @@ -170,6 +170,9 @@ a:link.btn-default{ color: var(--nav-link) !important; } } +.far fa-life-ring{ + color:var(--link); +} #accessoriesTable>tbody>tr>td>nobr>a>i.fa { color: var(--text-main); diff --git a/resources/assets/less/skins/skin-yellow.less b/resources/assets/less/skins/skin-yellow.less index b324b2ba1..b27756154 100755 --- a/resources/assets/less/skins/skin-yellow.less +++ b/resources/assets/less/skins/skin-yellow.less @@ -141,4 +141,7 @@ a { } .skin-yellow .main-header .navbar .nav > li > a { color: #413F42; +} +.far fa-life-ring{ + color:var(--link); } \ No newline at end of file From 8d36971c8bfb9d9a8de86b03785000b138422c47 Mon Sep 17 00:00:00 2001 From: Ivan Nieto Vivanco Date: Wed, 30 Nov 2022 16:21:23 -0600 Subject: [PATCH 5/6] Properly select 'CUSTOM REGEX' from the select list if the format declares onee --- resources/views/custom_fields/fields/edit.blade.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php index b9b9715a2..35f3e1b89 100644 --- a/resources/views/custom_fields/fields/edit.blade.php +++ b/resources/views/custom_fields/fields/edit.blade.php @@ -74,8 +74,14 @@ + @php + $field_format = ''; + if (stripos($field->format, 'regex') === 0){ + $field_format = 'CUSTOM REGEX'; + } + @endphp
- {{ Form::select("format",Helper::predefined_formats(), $field->format, array('class'=>'format select2 form-control', 'aria-label'=>'format')) }} + {{ Form::select("format",Helper::predefined_formats(), ($field_format == '') ? $field->format : $field_format, array('class'=>'format select2 form-control', 'aria-label'=>'format')) }} {!! $errors->first('format', '') !!}
From 2f8a435e1875ca5ffc59029e68812cf3d09a5c5f Mon Sep 17 00:00:00 2001 From: akemi Date: Mon, 5 Dec 2022 18:06:28 -0500 Subject: [PATCH 6/6] fixing curly quotes --- app/Http/Controllers/Api/UsersController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php index 5a368ecde..9348b04b5 100644 --- a/app/Http/Controllers/Api/UsersController.php +++ b/app/Http/Controllers/Api/UsersController.php @@ -505,7 +505,7 @@ class UsersController extends Controller $user = User::findOrFail($id); if (empty($user->email)) { - return response()->json(Helper::formatStandardApiResponse(‘error’, null, trans('admin/users/message.inventorynotification.error'))); + return response()->json(Helper::formatStandardApiResponse('error', null, trans('admin/users/message.inventorynotification.error'))); } return response()->Helper::formatStandardApiResponse('success', null, trans('admin/users/message.inventorynotification.success'));