From 75f5f3a0a8f524fdedc6cb2241b650732a1c1f10 Mon Sep 17 00:00:00 2001 From: Godfrey M Date: Wed, 18 May 2022 09:37:53 -0700 Subject: [PATCH 1/7] fixes inconsistencies with links styling --- resources/assets/less/skins/skin-black.less | 20 ++++++++++++++++++ resources/assets/less/skins/skin-blue.less | 20 ++++++++++++++++++ resources/assets/less/skins/skin-green.less | 22 +++++++++++++++++++- resources/assets/less/skins/skin-orange.less | 20 ++++++++++++++++++ resources/assets/less/skins/skin-purple.less | 21 +++++++++++++++++++ resources/assets/less/skins/skin-red.less | 22 ++++++++++++++++++++ resources/assets/less/skins/skin-yellow.less | 21 +++++++++++++++++++ 7 files changed, 145 insertions(+), 1 deletion(-) diff --git a/resources/assets/less/skins/skin-black.less b/resources/assets/less/skins/skin-black.less index 5db57608f..29322ac96 100755 --- a/resources/assets/less/skins/skin-black.less +++ b/resources/assets/less/skins/skin-black.less @@ -102,6 +102,26 @@ a { .text-primary { color: darken(@black, 20%); } +:root { + --button-default: darken(@black, 15%); + --button-primary: darken(@black, 25%); + --button-hover: darken(@black, 30%); + --header: @black; /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #AAA; /* Use same as Header picker, lighten by 70% */ + --visited-link: lighten(@black, 40%); /* Use same as Header picker, lighten by 70% */ + --hover-link: lighten(@black, 45%); /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ +} +a:link { + color: var(--link); +} + +a:visited { + color: var(--visited-link); +} .skin-black .main-header .navbar .nav>li>a, .skin-black .main-header .navbar .nav>li>a { text-decoration: none; diff --git a/resources/assets/less/skins/skin-blue.less b/resources/assets/less/skins/skin-blue.less index dc02aeab3..d8764521c 100755 --- a/resources/assets/less/skins/skin-blue.less +++ b/resources/assets/less/skins/skin-blue.less @@ -109,6 +109,26 @@ a { color: @light-blue; } } +:root { + --button-default: darken(@blue, 15%); + --button-primary: darken(@blue, 25%); + --button-hover: darken(@blue, 30%); + --header: @blue; /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #1978D4; /* Use same as Header picker, lighten by 70% */ + --visited-link: #3c8dbc ; /* Use same as Header picker, lighten by 70% */ + --hover-link: #4B77BE; /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ +} +a:link { + color: var(--link); +} + +a:visited { + color: var(--visited-link); +} .text-primary { color: darken(@light-blue, 20%); diff --git a/resources/assets/less/skins/skin-green.less b/resources/assets/less/skins/skin-green.less index b0f38c557..e0ca3330c 100755 --- a/resources/assets/less/skins/skin-green.less +++ b/resources/assets/less/skins/skin-green.less @@ -6,7 +6,20 @@ @import "../bootstrap-less/variables.less"; @import "../variables.less"; @import "../mixins.less"; - +:root{ + --visited-link: #5D995D; /* Use same as Header picker, lighten by 70% */ + --background: #222; + --back-main: #333; + --back-sub: #3d4144; + --back-sub-alt: rgba(0, 0, 0, 0.36); + --button-default: darken(@green, 15%); + --button-primary: darken(@green, 25%); + --button-hover: darken(@green, 30%); + --header: @green; /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #28A228; /* Use same as Header picker, lighten by 70% */ +} .skin-green { //Navbar .main-header { @@ -85,6 +98,13 @@ } } +a:link { + color: var(--link); +} + +a:visited { + color: var(--visited-link); +} a { color: @green; diff --git a/resources/assets/less/skins/skin-orange.less b/resources/assets/less/skins/skin-orange.less index 89e5ac9d2..8d8ffc117 100644 --- a/resources/assets/less/skins/skin-orange.less +++ b/resources/assets/less/skins/skin-orange.less @@ -99,6 +99,26 @@ a { .text-primary { color: darken(@orange, 20%); } +:root { + --button-default: darken(@orange, 15%); + --button-primary: darken(@orange, 25%); + --button-hover: darken(@orange, 30%); + --header: @orange; /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #D43900; /* Use same as Header picker, lighten by 70% */ + --visited-link: #D46A43; /* Use same as Header picker, lighten by 70% */ + --hover-link: #FF4500; /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ +} +a:link { + color: var(--link); +} + +a:visited { + color: var(--visited-link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; diff --git a/resources/assets/less/skins/skin-purple.less b/resources/assets/less/skins/skin-purple.less index 1edaff067..cc58f54f3 100755 --- a/resources/assets/less/skins/skin-purple.less +++ b/resources/assets/less/skins/skin-purple.less @@ -100,6 +100,27 @@ a { color: darken(@purple, 20%); } +:root { + --button-default: darken(@purple, 15%); + --button-primary: darken(@purple, 25%); + --button-hover: darken(@purple, 30%); + --header: @purple; /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #9370DB; /* Use same as Header picker, lighten by 70% */ + --visited-link: #B93CF6; /* Use same as Header picker, lighten by 70% */ + --hover-link: #BF55EC; /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ +} +a:link { + color: var(--link); +} + +a:visited { + color: var(--visited-link); +} + .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/resources/assets/less/skins/skin-red.less b/resources/assets/less/skins/skin-red.less index c2383d0de..115cbc609 100755 --- a/resources/assets/less/skins/skin-red.less +++ b/resources/assets/less/skins/skin-red.less @@ -100,6 +100,28 @@ a { color: darken(@red, 20%); } +:root { + --button-default: darken(@red, 15%); + --button-primary: darken(@red, 25%); + --button-hover: darken(@red, 30%); + --header: @red; /* Use same as Header picker */ + --text-main: #BBB; + --text-alt: #222; + --text-sub: #9b9b9b; + --link: #e00000; /* Use same as Header picker, lighten by 70% */ + --visited-link: #D24D57; /* Use same as Header picker, lighten by 70% */ + --hover-link: #D24D57; /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ +} +a:link { + color: var(--link); +} + +a:visited { + color: var(--visited-link); +} + .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/resources/assets/less/skins/skin-yellow.less b/resources/assets/less/skins/skin-yellow.less index b8c5de92c..daafdce9c 100755 --- a/resources/assets/less/skins/skin-yellow.less +++ b/resources/assets/less/skins/skin-yellow.less @@ -100,6 +100,27 @@ a { color: darken(@yellow, 20%); } +:root { + --button-default: darken(@yellow, 15%); + --button-primary: darken(@yellow, 25%); + --button-hover: darken(@yellow, 30%); + --header: @yellow; /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: lighten(@yellow, 10%); /* Use same as Header picker, lighten by 70% */ + --visited-link: lighten(@yellow, 20%); /* Use same as Header picker, lighten by 70% */ + --hover-link: lighten(@yellow, 45%); /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; /* Use same as Header picker */ + --light-link: #fff; /* Use same as Header picker */ +} +a:link { + color: var(--link); +} + +a:visited { + color: var(--visited-link); +} + .fixed-table-container tbody .selected td { background-color: #fff8af; } From 891009dc672c68c10d3a0c1b5bfdaf725fb40df3 Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 18 May 2022 15:35:57 -0700 Subject: [PATCH 2/7] Nicer formatting for buttons in bulk user edit Signed-off-by: snipe --- .../Controllers/Users/BulkUsersController.php | 5 ++- resources/lang/en/general.php | 1 + resources/views/users/bulk-edit.blade.php | 37 +++++++++++++++---- 3 files changed, 34 insertions(+), 9 deletions(-) diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php index 6bf52a114..3be8a0636 100644 --- a/app/Http/Controllers/Users/BulkUsersController.php +++ b/app/Http/Controllers/Users/BulkUsersController.php @@ -91,7 +91,10 @@ class BulkUsersController extends Controller ->conditionallyAddItem('company_id') ->conditionallyAddItem('locale') ->conditionallyAddItem('remote') + ->conditionallyAddItem('ldap_sync') ->conditionallyAddItem('activated'); + + //dd($this); // If the manager_id is one of the users being updated, generate a warning. if (array_search($request->input('manager_id'), $user_raw_array)) { @@ -107,7 +110,7 @@ class BulkUsersController extends Controller User::whereIn('id', $user_raw_array) ->where('id', '!=', Auth::id())->update($this->update_array); - if(array_key_exists('location_id', $this->update_array)){ + if (array_key_exists('location_id', $this->update_array)){ Asset::where('assigned_type', User::class) ->whereIn('assigned_to', $user_raw_array) ->update(['location_id' => $this->update_array['location_id']]); diff --git a/resources/lang/en/general.php b/resources/lang/en/general.php index 6ee22f68c..03bddaef2 100644 --- a/resources/lang/en/general.php +++ b/resources/lang/en/general.php @@ -356,4 +356,5 @@ return [ 'checkout_user_tooltip' => 'Check this item out to a user', 'maintenance_mode' => 'The service is temporarily unavailable for system updates. Please check back later.', 'maintenance_mode_title' => 'System Temporarily Unavilable', + 'ldap_import' => 'User password should not be managed by LDAP. (This allows you to send forgotten password requests.)', ]; \ No newline at end of file diff --git a/resources/views/users/bulk-edit.blade.php b/resources/views/users/bulk-edit.blade.php index 9e7bdefba..11082f20f 100644 --- a/resources/views/users/bulk-edit.blade.php +++ b/resources/views/users/bulk-edit.blade.php @@ -13,6 +13,12 @@ {{-- Page content --}} @section('content') + +
@@ -69,28 +75,43 @@ {{ trans('admin/users/general.remote') }}
-
+
+ +
+
+ {{ trans('general.ldap_sync') }} +
+
+
+ +
+
+
+
{{ trans('general.activated') }}
-
+
From f609146c294abadca87ce93ab39bad47bc22821b Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 18 May 2022 15:37:10 -0700 Subject: [PATCH 3/7] Corrected field name Signed-off-by: snipe --- app/Http/Controllers/Users/BulkUsersController.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Users/BulkUsersController.php b/app/Http/Controllers/Users/BulkUsersController.php index 3be8a0636..cd6d67983 100644 --- a/app/Http/Controllers/Users/BulkUsersController.php +++ b/app/Http/Controllers/Users/BulkUsersController.php @@ -91,11 +91,10 @@ class BulkUsersController extends Controller ->conditionallyAddItem('company_id') ->conditionallyAddItem('locale') ->conditionallyAddItem('remote') - ->conditionallyAddItem('ldap_sync') + ->conditionallyAddItem('ldap_import') ->conditionallyAddItem('activated'); - //dd($this); - + // If the manager_id is one of the users being updated, generate a warning. if (array_search($request->input('manager_id'), $user_raw_array)) { $manager_conflict = true; From 981741062bebbfbaca9e4104f8763115c6ffb944 Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Wed, 18 May 2022 15:51:32 -0700 Subject: [PATCH 4/7] Try to intelligently overwrite fields with default values for custom field --- resources/views/hardware/edit.blade.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 20e93f067..42af51834 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -151,7 +151,12 @@ //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]) { - $(elem).val(transformed_oldvals[elem.name]).trigger('change'); //the trigger is for select2-based objects, if we have any + {{-- If there already *is* is a previously input 'transformed_oldvals' handy, + only overwrite with previously that value *IF* this is an edit of an existing item *OR* + there is no new default custom field value coming from the model --}} + if({{ $item->id ? 'true' : 'false' }} || $(elem).val() == '') { + $(elem).val(transformed_oldvals[elem.name]).trigger('change'); //the trigger is for select2-based objects, if we have any + } } }); From e4b24e17f396d9a32fc34512f8734b086c5fedb4 Mon Sep 17 00:00:00 2001 From: Brady Wetherington Date: Wed, 18 May 2022 16:06:39 -0700 Subject: [PATCH 5/7] Improve comments because the logic is complicated and unintuitive --- resources/views/hardware/edit.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php index 42af51834..14e5a4507 100755 --- a/resources/views/hardware/edit.blade.php +++ b/resources/views/hardware/edit.blade.php @@ -151,9 +151,9 @@ //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 there already *is* is a previously input 'transformed_oldvals' handy, - only overwrite with previously that value *IF* this is an edit of an existing item *OR* - there is no new default custom field value coming from the model --}} + {{-- 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 --}} if({{ $item->id ? 'true' : 'false' }} || $(elem).val() == '') { $(elem).val(transformed_oldvals[elem.name]).trigger('change'); //the trigger is for select2-based objects, if we have any } From 319eae78106810312b96897c09a162728247333e Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 18 May 2022 16:21:04 -0700 Subject: [PATCH 6/7] Recompiled dev assets Signed-off-by: snipe --- public/css/dist/skins/skin-black.css | 25 ++++++++++++++++++++ public/css/dist/skins/skin-black.min.css | 25 ++++++++++++++++++++ public/css/dist/skins/skin-blue.css | 25 ++++++++++++++++++++ public/css/dist/skins/skin-blue.min.css | 25 ++++++++++++++++++++ public/css/dist/skins/skin-green.css | 23 +++++++++++++++++++ public/css/dist/skins/skin-green.min.css | 23 +++++++++++++++++++ public/css/dist/skins/skin-orange.css | 25 ++++++++++++++++++++ public/css/dist/skins/skin-orange.min.css | 25 ++++++++++++++++++++ public/css/dist/skins/skin-purple.css | 25 ++++++++++++++++++++ public/css/dist/skins/skin-purple.min.css | 25 ++++++++++++++++++++ public/css/dist/skins/skin-red.css | 26 +++++++++++++++++++++ public/css/dist/skins/skin-red.min.css | 26 +++++++++++++++++++++ public/css/dist/skins/skin-yellow.css | 25 ++++++++++++++++++++ public/css/dist/skins/skin-yellow.min.css | 25 ++++++++++++++++++++ public/mix-manifest.json | 28 +++++++++++------------ 15 files changed, 362 insertions(+), 14 deletions(-) diff --git a/public/css/dist/skins/skin-black.css b/public/css/dist/skins/skin-black.css index c401e2723..f081feaeb 100644 --- a/public/css/dist/skins/skin-black.css +++ b/public/css/dist/skins/skin-black.css @@ -168,6 +168,31 @@ a:visited { .text-primary { color: #000000; } +:root { + --button-default: #000000; + --button-primary: #000000; + --button-hover: #000000; + --header: #111; + /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #AAA; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #777777; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #848484; + /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; + /* Use same as Header picker */ + --light-link: #fff; + /* Use same as Header picker */ +} +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} .skin-black .main-header .navbar .nav > li > a, .skin-black .main-header .navbar .nav > li > a { text-decoration: none; diff --git a/public/css/dist/skins/skin-black.min.css b/public/css/dist/skins/skin-black.min.css index c401e2723..f081feaeb 100644 --- a/public/css/dist/skins/skin-black.min.css +++ b/public/css/dist/skins/skin-black.min.css @@ -168,6 +168,31 @@ a:visited { .text-primary { color: #000000; } +:root { + --button-default: #000000; + --button-primary: #000000; + --button-hover: #000000; + --header: #111; + /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #AAA; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #777777; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #848484; + /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; + /* Use same as Header picker */ + --light-link: #fff; + /* Use same as Header picker */ +} +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} .skin-black .main-header .navbar .nav > li > a, .skin-black .main-header .navbar .nav > li > a { text-decoration: none; diff --git a/public/css/dist/skins/skin-blue.css b/public/css/dist/skins/skin-blue.css index 8f6ffb786..2fae69191 100644 --- a/public/css/dist/skins/skin-blue.css +++ b/public/css/dist/skins/skin-blue.css @@ -181,6 +181,31 @@ a:hover { a:visited { color: #3c8dbc; } +:root { + --button-default: #00436b; + --button-primary: #002338; + --button-hover: #00131e; + --header: #0073b7; + /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #1978D4; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #3c8dbc; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #4B77BE; + /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; + /* Use same as Header picker */ + --light-link: #fff; + /* Use same as Header picker */ +} +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} .text-primary { color: #23536f; } diff --git a/public/css/dist/skins/skin-blue.min.css b/public/css/dist/skins/skin-blue.min.css index 8f6ffb786..2fae69191 100644 --- a/public/css/dist/skins/skin-blue.min.css +++ b/public/css/dist/skins/skin-blue.min.css @@ -181,6 +181,31 @@ a:hover { a:visited { color: #3c8dbc; } +:root { + --button-default: #00436b; + --button-primary: #002338; + --button-hover: #00131e; + --header: #0073b7; + /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #1978D4; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #3c8dbc; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #4B77BE; + /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; + /* Use same as Header picker */ + --light-link: #fff; + /* Use same as Header picker */ +} +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} .text-primary { color: #23536f; } diff --git a/public/css/dist/skins/skin-green.css b/public/css/dist/skins/skin-green.css index 3b38ae8f7..7e1540db9 100644 --- a/public/css/dist/skins/skin-green.css +++ b/public/css/dist/skins/skin-green.css @@ -2,6 +2,23 @@ * Skin: Green * ---------- */ +:root { + --visited-link: #5D995D; + /* Use same as Header picker, lighten by 70% */ + --background: #222; + --back-main: #333; + --back-sub: #3d4144; + --back-sub-alt: rgba(0, 0, 0, 0.36); + --button-default: #005a31; + --button-primary: #002715; + --button-hover: #000d07; + --header: #00a65a; + /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #28A228; + /* Use same as Header picker, lighten by 70% */ +} .skin-green .main-header .navbar { background-color: #00a65a; } @@ -149,6 +166,12 @@ background-color: #000d07; color: #fff; } +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} a { color: #00a65a; } diff --git a/public/css/dist/skins/skin-green.min.css b/public/css/dist/skins/skin-green.min.css index 3b38ae8f7..7e1540db9 100644 --- a/public/css/dist/skins/skin-green.min.css +++ b/public/css/dist/skins/skin-green.min.css @@ -2,6 +2,23 @@ * Skin: Green * ---------- */ +:root { + --visited-link: #5D995D; + /* Use same as Header picker, lighten by 70% */ + --background: #222; + --back-main: #333; + --back-sub: #3d4144; + --back-sub-alt: rgba(0, 0, 0, 0.36); + --button-default: #005a31; + --button-primary: #002715; + --button-hover: #000d07; + --header: #00a65a; + /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #28A228; + /* Use same as Header picker, lighten by 70% */ +} .skin-green .main-header .navbar { background-color: #00a65a; } @@ -149,6 +166,12 @@ background-color: #000d07; color: #fff; } +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} a { color: #00a65a; } diff --git a/public/css/dist/skins/skin-orange.css b/public/css/dist/skins/skin-orange.css index a39d9d27d..2e3b67c82 100644 --- a/public/css/dist/skins/skin-orange.css +++ b/public/css/dist/skins/skin-orange.css @@ -161,6 +161,31 @@ a:visited { .text-primary { color: #995400; } +:root { + --button-default: #b36200; + --button-primary: #804600; + --button-hover: #663800; + --header: #FF8C00; + /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #D43900; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #D46A43; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #FF4500; + /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; + /* Use same as Header picker */ + --light-link: #fff; + /* Use same as Header picker */ +} +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-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 a39d9d27d..2e3b67c82 100644 --- a/public/css/dist/skins/skin-orange.min.css +++ b/public/css/dist/skins/skin-orange.min.css @@ -161,6 +161,31 @@ a:visited { .text-primary { color: #995400; } +:root { + --button-default: #b36200; + --button-primary: #804600; + --button-hover: #663800; + --header: #FF8C00; + /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #D43900; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #D46A43; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #FF4500; + /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; + /* Use same as Header picker */ + --light-link: #fff; + /* Use same as Header picker */ +} +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/css/dist/skins/skin-purple.css b/public/css/dist/skins/skin-purple.css index 1f2519d5b..f11dabf07 100644 --- a/public/css/dist/skins/skin-purple.css +++ b/public/css/dist/skins/skin-purple.css @@ -161,6 +161,31 @@ a:visited { .text-primary { color: #3a3767; } +:root { + --button-default: #434078; + --button-primary: #302e56; + --button-hover: #272546; + --header: #605ca8; + /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #9370DB; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #B93CF6; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #BF55EC; + /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; + /* Use same as Header picker */ + --light-link: #fff; + /* Use same as Header picker */ +} +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/css/dist/skins/skin-purple.min.css b/public/css/dist/skins/skin-purple.min.css index 1f2519d5b..f11dabf07 100644 --- a/public/css/dist/skins/skin-purple.min.css +++ b/public/css/dist/skins/skin-purple.min.css @@ -161,6 +161,31 @@ a:visited { .text-primary { color: #3a3767; } +:root { + --button-default: #434078; + --button-primary: #302e56; + --button-hover: #272546; + --header: #605ca8; + /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #9370DB; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #B93CF6; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #BF55EC; + /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; + /* Use same as Header picker */ + --light-link: #fff; + /* Use same as Header picker */ +} +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/css/dist/skins/skin-red.css b/public/css/dist/skins/skin-red.css index 210e4c106..650645363 100644 --- a/public/css/dist/skins/skin-red.css +++ b/public/css/dist/skins/skin-red.css @@ -161,6 +161,32 @@ a:visited { .text-primary { color: #96271a; } +:root { + --button-default: #ac2d1e; + --button-primary: #802216; + --button-hover: #6b1c12; + --header: #dd4b39; + /* Use same as Header picker */ + --text-main: #BBB; + --text-alt: #222; + --text-sub: #9b9b9b; + --link: #e00000; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #D24D57; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #D24D57; + /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; + /* Use same as Header picker */ + --light-link: #fff; + /* Use same as Header picker */ +} +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/css/dist/skins/skin-red.min.css b/public/css/dist/skins/skin-red.min.css index 210e4c106..650645363 100644 --- a/public/css/dist/skins/skin-red.min.css +++ b/public/css/dist/skins/skin-red.min.css @@ -161,6 +161,32 @@ a:visited { .text-primary { color: #96271a; } +:root { + --button-default: #ac2d1e; + --button-primary: #802216; + --button-hover: #6b1c12; + --header: #dd4b39; + /* Use same as Header picker */ + --text-main: #BBB; + --text-alt: #222; + --text-sub: #9b9b9b; + --link: #e00000; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #D24D57; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #D24D57; + /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; + /* Use same as Header picker */ + --light-link: #fff; + /* Use same as Header picker */ +} +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/css/dist/skins/skin-yellow.css b/public/css/dist/skins/skin-yellow.css index e16f6de66..3cdea4650 100644 --- a/public/css/dist/skins/skin-yellow.css +++ b/public/css/dist/skins/skin-yellow.css @@ -161,6 +161,31 @@ a:visited { .text-primary { color: #976008; } +:root { + --button-default: #b06f09; + --button-primary: #7f5006; + --button-hover: #674105; + --header: #f39c12; + /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #f5b043; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #f8c573; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #fef7ec; + /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; + /* Use same as Header picker */ + --light-link: #fff; + /* Use same as Header picker */ +} +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/css/dist/skins/skin-yellow.min.css b/public/css/dist/skins/skin-yellow.min.css index e16f6de66..3cdea4650 100644 --- a/public/css/dist/skins/skin-yellow.min.css +++ b/public/css/dist/skins/skin-yellow.min.css @@ -161,6 +161,31 @@ a:visited { .text-primary { color: #976008; } +:root { + --button-default: #b06f09; + --button-primary: #7f5006; + --button-hover: #674105; + --header: #f39c12; + /* Use same as Header picker */ + --text-main: #BBB; + --text-sub: #9b9b9b; + --link: #f5b043; + /* Use same as Header picker, lighten by 70% */ + --visited-link: #f8c573; + /* Use same as Header picker, lighten by 70% */ + --hover-link: #fef7ec; + /* Use same as Header picker, lighten by 70% */ + --nav-link: #FFF; + /* Use same as Header picker */ + --light-link: #fff; + /* Use same as Header picker */ +} +a:link { + color: var(--link); +} +a:visited { + color: var(--visited-link); +} .fixed-table-container tbody .selected td { background-color: #fff8af; } diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 5fb7e6be6..cc1a56f3a 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,23 +1,23 @@ { "/js/build/app.js": "/js/build/app.js?id=8b75d505c1bee38e1557", - "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f1cc6901a7c5175c93ae", + "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=d970defc84a523e67e64", "/css/build/overrides.css": "/css/build/overrides.css?id=4fc3a0e0a16964643e70", "/css/build/app.css": "/css/build/app.css?id=a7cd7ad6e0e053ccf443", "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=65ca7a34198fa16ba846", - "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=2e5767d79e6c57bfbc4b", + "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=745c1422e8f5462156b6", "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=42567ac674089cc824b1", "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=df833fb557131cac373e", "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=febf2e993f85ff74fab8", - "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=98a647be9f296e72de5e", + "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=eb4d9347b7f7dd50c199", "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=121eb42fc9fdfe35770f", - "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=a4fa947ea4ea5cde9a93", + "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=ee316b6599d3b06981dc", "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=92abb943148527d96b41", "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=81f5e6c7216d0fe56425", - "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=9dda5d1f907fef08fe97", + "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=10507e47aacfe3d0b8dd", "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=6fd9b20408ba284bc0c3", - "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=8184148eee63ebe2f13c", + "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=6f91dafdc70b414614b3", "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=6a9d0ac448c28b88e5d6", - "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=77bd8e92475ecddc9c62", + "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=139dfdf278b6eaec2022", "/css/dist/all.css": "/css/dist/all.css?id=6f5411354ef775df6745", "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212", "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b", @@ -27,19 +27,19 @@ "/js/build/vendor.js": "/js/build/vendor.js?id=47ecbb4bb3b0e02315f3", "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=8b909f5a1792dcc78a4b", "/js/dist/all.js": "/js/dist/all.js?id=448ec9994dee0c281e8b", - "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=8184148eee63ebe2f13c", + "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=6f91dafdc70b414614b3", "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=6fd9b20408ba284bc0c3", - "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=9dda5d1f907fef08fe97", + "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=10507e47aacfe3d0b8dd", "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=81f5e6c7216d0fe56425", - "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=f1cc6901a7c5175c93ae", + "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=d970defc84a523e67e64", "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=df833fb557131cac373e", - "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=98a647be9f296e72de5e", + "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=eb4d9347b7f7dd50c199", "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=febf2e993f85ff74fab8", - "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=77bd8e92475ecddc9c62", + "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=139dfdf278b6eaec2022", "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=92abb943148527d96b41", - "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=a4fa947ea4ea5cde9a93", + "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=ee316b6599d3b06981dc", "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=121eb42fc9fdfe35770f", - "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=2e5767d79e6c57bfbc4b", + "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=745c1422e8f5462156b6", "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=42567ac674089cc824b1", "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=6a9d0ac448c28b88e5d6" } From 4669bb54fe9cd062299096fbeb26a67bec899fab Mon Sep 17 00:00:00 2001 From: snipe Date: Wed, 18 May 2022 17:14:22 -0700 Subject: [PATCH 7/7] Small fixes for asset tag regeneration script Signed-off-by: snipe --- app/Console/Commands/RegenerateAssetTags.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/Console/Commands/RegenerateAssetTags.php b/app/Console/Commands/RegenerateAssetTags.php index 94ed5ce07..bd5cf37a4 100644 --- a/app/Console/Commands/RegenerateAssetTags.php +++ b/app/Console/Commands/RegenerateAssetTags.php @@ -60,7 +60,7 @@ class RegenerateAssetTags extends Command } foreach ($total_assets as $asset) { - $start_tag++; + $output['info'][] = 'Asset tag:'.$asset->asset_tag; $asset->asset_tag = $settings->auto_increment_prefix.$settings->auto_increment_prefix.$start_tag; @@ -72,8 +72,15 @@ class RegenerateAssetTags extends Command // Use forceSave here to override model level validation $asset->forceSave(); + $start_tag++; + if ($bar) { + $bar->advance(); + } } + $settings->next_auto_tag_base = Asset::zerofill($start_tag, $settings->zerofill_count); + $settings->save(); + $bar->finish(); $this->info("\n");