Merge remote-tracking branch 'origin/develop'

.github/workflows/codacy-analysis.yml

@@ -19,6 +19,8 @@ on:
 
 jobs:
   codacy-security-scan:
+    # Ensure schedule job never runs on forked repos. It's only executed for 'snipe/snipe-it'
+    if: (github.repository == 'snipe/snipe-it') || ((github.repository != 'snipe/snipe-it') && (github.event_name != 'schedule'))
     name: Codacy Security Scan
     runs-on: ubuntu-latest
     steps:

app/Http/Transformers/AssetsTransformer.php

@@ -98,6 +98,14 @@ class AssetsTransformer
                     $decrypted = Helper::gracefulDecrypt($field, $asset->{$field->convertUnicodeDbSlug()});
                     $value = (Gate::allows('superadmin')) ? $decrypted : strtoupper(trans('admin/custom_fields/general.encrypted'));
 
+                    if ($field->format == 'DATE'){
+                        if (Gate::allows('superadmin')){
+                            $value = Helper::getFormattedDateObject($value)['formatted'];
+                        } else {
+                           $value = strtoupper(trans('admin/custom_fields/general.encrypted'));
+                        }
+                    }
+
                     $fields_array[$field->name] = [
                             'field' => e($field->convertUnicodeDbSlug()),
                             'value' => e($value),
@@ -107,15 +115,19 @@ class AssetsTransformer
                         ];
 
                 } else {
+                    $value = $asset->{$field->convertUnicodeDbSlug()};
+
+                    if ($field->format == 'DATE'){
+                        $value = Helper::getFormattedDateObject($value)['formatted'];
+                    }
                     $fields_array[$field->name] = [
                         'field' => e($field->convertUnicodeDbSlug()),
-                        'value' => e($asset->{$field->convertUnicodeDbSlug()}),
+                        'value' => e($value),
                         'field_format' => $field->format,
                         'element' => $field->element,
                     ];
-
-
                 }
+
                 $array['custom_fields'] = $fields_array;
             }
         } else {

app/Listeners/CheckoutableListener.php

@@ -30,7 +30,6 @@ class CheckoutableListener
     public function onCheckedOut($event)
     {
 
-        \Log::debug('onCheckedOut in the Checkoutable listener fired');
 
         /**
          * When the item wasn't checked out to a user, we can't send notifications

public/mix-manifest.json

@@ -1,24 +1,24 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=1218df365997eb1079ea",
-    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=9f6ae16efc6ddadf0ad4",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=21281fb933786f40e97c",
-    "/css/build/app.css": "/css/build/app.css?id=a05de1e55dcc50ddba9a",
-    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=40a6f3c46ef38d996f49",
-    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=1da067e3b29fa4025fab",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=b39ee82b48cc27c648ca",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=55ce0f4b9f43b17c8ca7",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=76a13b403f77351926dc",
-    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=b455da82eb04b8629f2d",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=ebdacfffd0e8def6214a",
-    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=92330c5da2593fedb6b5",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=7f4d9d84e507abe268f7",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=72a21ceded782ed22531",
-    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=537a7214eb6eb2ddb6cb",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=f46ff1c860ae9e87d484",
-    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=d14248e210b998d85641",
-    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=3654491c6565f7dc9bb4",
-    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=1c8d372f8457ed3d26c2",
-    "/css/dist/all.css": "/css/dist/all.css?id=b657d018489da88020dd",
+    "/js/build/app.js": "/js/build/app.js?id=8b75d505c1bee38e1557",
+    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f577ce74b0dc04d0ec2b",
+    "/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=0715caf11a30f0756768",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=c17de79571bc6dc42112",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=d7326fc67c3ca143b923",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=8b9d88179519a78562f0",
+    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=47021aa27f4112d4abb6",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=d8ff93a7b6938b2bf01c",
+    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=73bb57f917efb3289548",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=25b72081b75e2769b506",
+    "/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=10507e47aacfe3d0b8dd",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=ad668346fb0a97b86491",
+    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=407f83d58689706f303a",
+    "/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=c17879493dcd86dbb6c1",
+    "/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",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
@@ -26,20 +26,20 @@
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=e45be9555cc66bf80749",
     "/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=e25ec49ad10591b90f1a",
-    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=d14248e210b998d85641",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=f46ff1c860ae9e87d484",
-    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=537a7214eb6eb2ddb6cb",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=72a21ceded782ed22531",
-    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=9f6ae16efc6ddadf0ad4",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=55ce0f4b9f43b17c8ca7",
-    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=b455da82eb04b8629f2d",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=76a13b403f77351926dc",
-    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=1c8d372f8457ed3d26c2",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=7f4d9d84e507abe268f7",
-    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=92330c5da2593fedb6b5",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=ebdacfffd0e8def6214a",
-    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=1da067e3b29fa4025fab",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=b39ee82b48cc27c648ca",
-    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=3654491c6565f7dc9bb4"
+    "/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=407f83d58689706f303a",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=ad668346fb0a97b86491",
+    "/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=f577ce74b0dc04d0ec2b",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=d7326fc67c3ca143b923",
+    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=47021aa27f4112d4abb6",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=8b9d88179519a78562f0",
+    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=c17879493dcd86dbb6c1",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=25b72081b75e2769b506",
+    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=73bb57f917efb3289548",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=d8ff93a7b6938b2bf01c",
+    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=0715caf11a30f0756768",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=c17de79571bc6dc42112",
+    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=6a9d0ac448c28b88e5d6"
 }

resources/assets/less/skins/skin-blue-dark.less

@@ -61,12 +61,12 @@
 
 
 .btn, .btn:hover {
-  color: #fff;
+  color: #fff !important;
 
   &.btn-primary, .btn-primary:link {
     background-color: darken(@blue, 10%);
-    border-color: darken(@blue, 20%);
-    color: #fff;
+    border-color: #FFF;
+    color: #FFF;
   }
 
 
@@ -90,10 +90,10 @@
 
 a {
   &:hover {
-    color: #fff;
+    color: var(--hover-link);
   }
   &:visited {
-    color: #fff;
+    color: var(--visited-link);
   }
 }
 
@@ -107,7 +107,7 @@ a {
 :root {
   --background: #222;
   --back-main: #333;
-  --back-sub: #3d4144;
+  --back-sub: #272727;
   --back-sub-alt: rgba(0, 0, 0, 0.36);
   --button-default: darken(@blue, 15%);
   --button-primary: darken(@blue, 25%);
@@ -115,9 +115,9 @@ a {
   --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% */
+  --link: #00BFFF; /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(#00BFFF,15%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(#00BFFF,30%); /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF; /* Use same as Header picker */
   --light-link: #fff; /* Use same as Header picker */
 }
@@ -146,14 +146,6 @@ a:link {
   color: var(--link);
 }
 
-a:visited {
-  color: var(--nav-link);
-}
-
-a:hover {
-  color: var(--hover-link);
-}
-
 .btn-primary.hover {
   color: var(--nav-link);
 }
@@ -203,7 +195,7 @@ body {
   color: var(--link);
 }
 .btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
-  color: var(--text-main)!important;
+  color: var(--text-main);
 }
 .btn-primary:hover {
   background-color: var(--button-primary);

resources/assets/less/skins/skin-blue.less

@@ -64,7 +64,7 @@
   &.btn-primary, .btn-primary:link {
     background-color: darken(@light-blue, 10%);
     border-color: darken(@light-blue, 20%);
-    color: #fff;
+    color: #fff !important;
   }
 
 
@@ -99,16 +99,6 @@
 }
 
 
-
-a {
-  color: @light-blue;
-  &:hover {
-    color: darken(@light-blue, 20%);
-  }
-  &:visited {
-    color: @light-blue;
-  }
-}
 :root {
   --button-default: darken(@blue, 15%);
   --button-primary: darken(@blue, 25%);
@@ -116,12 +106,18 @@ a {
   --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% */
+  --link: @blue; /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@blue,10%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@blue,20%); /* 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.btn-info:link, a.btn-warning:link, a.btn-danger:link{
+  color: #FFF;
+}
+&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{
+  color: #FFF;
+}
 a:link {
   color: var(--link);
 }
@@ -130,6 +126,10 @@ a:visited {
   color: var(--visited-link);
 }
 
+a:hover {
+  color: var(--hover-link);
+}
+
 .text-primary {
   color: darken(@light-blue, 20%);
 }

resources/assets/less/skins/skin-green-dark.less

@@ -61,39 +61,39 @@
 
 
 .btn, .btn:hover {
-  color: #fff;
+  color: #FFF !important;
 
   &.btn-primary, .btn-primary:link {
     background-color: darken(@green, 10%);
-    border-color: darken(@green, 20%);
-    color: #fff;
+    border-color: #FFF;
+    color: #FFF;
   }
 
 
   &a.btn-primary:hover {
     background-color: darken(@green, 20%);
     border-color: darken(@green, 20%);
-    color: #fff;
+    color: #FFF;
   }
 
   &.btn-white:link {
     background-color: darken(@green, 10%);
-    color: #fff;
+    color: #FFF;
   }
 
   &.btn-white:hover {
     background-color: darken(@green, 30%);
-    color: #fff;
+    color: #FFF;
   }
 }
 
 
 a {
   &:hover {
-    color: #fff;
+    color: var(--hover-link);
   }
   &:visited {
-    color: #fff;
+    color: var(--visited-link);
   }
 }
 
@@ -107,17 +107,17 @@ a {
 :root {
   --background: #222;
   --back-main: #333;
-  --back-sub: #3d4144;
+  --back-sub: #312F2F;
   --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;
+  --button-default: #006400;
+  --button-primary: darken(#006400, 10%);
+  --button-hover: darken(#006400, 30%);
+  --header: #006400; /* Use same as Header picker */
+  --text-main: #FFF;
   --text-sub: #9b9b9b;
-  --link: #28A228; /* Use same as Header picker, lighten by 70% */
-  --visited-link: #5D995D; /* Use same as Header picker, lighten by 70% */
-  --hover-link: #00AA00; /* Use same as Header picker, lighten by 70% */
+  --link: #9ACD32; /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(#9ACD32, 15%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(#9ACD32, 30%); /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF; /* Use same as Header picker */
   --light-link: #fff; /* Use same as Header picker */
 }
@@ -146,14 +146,6 @@ a:link {
   color: var(--link);
 }
 
-a:visited {
-  color: var(--nav-link);
-}
-
-a:hover {
-  color: var(--hover-link);
-}
-
 .btn-primary.hover {
   color: var(--nav-link);
 }
@@ -203,7 +195,7 @@ body {
   color: var(--link);
 }
 .btn-primary, .btn-primary.hover, .btn-primary:active, .text-green {
-  color: var(--text-main)!important;
+  color: var(--text-main);
 }
 .btn-primary:hover {
   background-color: var(--button-primary);

resources/assets/less/skins/skin-green.less

@@ -7,7 +7,6 @@
 @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;
@@ -18,7 +17,9 @@
   --header: @green; /* Use same as Header picker */
   --text-main: #BBB;
   --text-sub: #9b9b9b;
-  --link: #28A228; /* Use same as Header picker, lighten by 70% */
+  --link: @green; /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@green, 15%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@green, 20%);
 }
 .skin-green {
   //Navbar
@@ -97,7 +98,12 @@
     color: #fff;
   }
 }
-
+a.btn-info:link, a.btn-warning:link, a.btn-danger:link{
+  color: #FFF;
+}
+&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{
+  color: #FFF;
+}
 a:link {
   color: var(--link);
 }

resources/assets/less/skins/skin-orange-dark.less

@@ -61,11 +61,11 @@
 
 
 .btn, .btn:hover {
-  color: #fff;
+  color: #fff !important;
 
   &.btn-primary, .btn-primary:link {
     background-color: darken(@orange, 10%);
-    border-color: darken(@orange, 20%);
+    border-color: #fff;
     color: #fff;
   }
 
@@ -87,27 +87,14 @@
   }
 }
 
-
-a {
-  &:hover {
-    color: #fff;
-  }
-  &:visited {
-    color: #fff;
-  }
-}
-
 .text-primary {
   color: #fff;
 }
 
-
-
-
 :root {
   --background: #222;
   --back-main: #333;
-  --back-sub: #3d4144;
+  --back-sub: #2E2C2C;
   --back-sub-alt: rgba(0, 0, 0, 0.36);
   --button-default: darken(@orange, 15%);
   --button-primary: darken(@orange, 25%);
@@ -115,9 +102,9 @@ a {
   --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% */
+  --link: #FFA500; /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(#FFA500, 15%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(#FFA500, 30%); /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF; /* Use same as Header picker */
   --light-link: #fff; /* Use same as Header picker */
 }
@@ -147,7 +134,7 @@ a:link {
 }
 
 a:visited {
-  color: var(--nav-link);
+  color: var(--visited-link);
 }
 
 a:hover {
@@ -206,6 +193,7 @@ a:link.btn-default{
 }
 .btn-primary, .btn-primary.hover, .btn-primary:active, .text-orange {
   color: var(--nav-link)!important;
+  border-color: var(--button-primary);
 }
 .btn-primary:hover {
   background-color: var(--button-primary);
@@ -348,20 +336,6 @@ input[type=text], input[type=search] {
   border-bottom: #000;
 }
 
-a {
-  color: var(--link);
-
-  &:link {
-    color: var(--link)  }
-  &:hover {
-    color: var(--hover-link);
-    text-decoration: underline;
-  }
-  &:visited {
-    color: var(--visited-link)
-  }
-}
-
 .row-striped {
   vertical-align: top;
   line-height: 2.6;

resources/assets/less/skins/skin-orange.less

@@ -87,12 +87,12 @@
 
 
 a {
-  color: @orange;
+  color: var(--link);
   &:hover {
-    color: darken(@orange, 20%);
+    color: var(--hover-link);
   }
   &:visited {
-    color: @orange;
+    color: var(--visited-link);
   }
 }
 
@@ -106,18 +106,18 @@ a {
   --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% */
+  --link: @orange; /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@orange, 10%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@orange, 15%); /* 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);
+a.btn-info:link, a.btn-warning:link, a.btn-danger:link{
+  color: #FFF;
+}
+&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{
+  color: #FFF;
 }
 
 .fixed-table-container tbody .selected td {

resources/assets/less/skins/skin-purple-dark.less

@@ -61,11 +61,11 @@
 
 
 .btn, .btn:hover {
-  color: #fff;
+  color: #fff !important;
 
   &.btn-primary, .btn-primary:link {
     background-color: darken(@purple, 10%);
-    border-color: darken(@purple, 20%);
+    border-color: #FFF;
     color: #fff;
   }
 
@@ -90,10 +90,10 @@
 
 a {
   &:hover {
-    color: #fff;
+    color: var(--hover-link);
   }
   &:visited {
-    color: #fff;
+    color: var(--visited-link);
   }
 }
 
@@ -107,7 +107,7 @@ a {
 :root {
   --background: #222;
   --back-main: #333;
-  --back-sub: #3d4144;
+  --back-sub: #080808;
   --back-sub-alt: rgba(0, 0, 0, 0.36);
   --button-default: darken(@purple, 15%);
   --button-primary: darken(@purple, 25%);
@@ -115,9 +115,9 @@ a {
   --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% */
+  --link: #AC83FF; /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(#AC83FF, 15%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(#AC83FF, 30%); /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF; /* Use same as Header picker */
   --light-link: #fff; /* Use same as Header picker */
 }
@@ -136,6 +136,10 @@ a {
 .thead, .navbar-nav>li>a:link {
   color: var(--nav-link);
 }
+.label-default{
+  background-color:var(--back-sub);
+  color:#fff;
+}
 
 .modal-content {
   background-color: var(--back-main);
@@ -146,14 +150,6 @@ a:link {
   color: var(--link);
 }
 
-a:visited {
-  color: var(--nav-link);
-}
-
-a:hover {
-  color: var(--hover-link);
-}
-
 .btn-primary.hover {
   color: var(--nav-link);
 }

resources/assets/less/skins/skin-purple.less

@@ -87,12 +87,12 @@
 
 
 a {
-  color: @purple;
+  color: var(--link);
   &:hover {
-    color: darken(@purple, 20%);
+    color: var(--hover-link);
   }
   &:visited {
-    color: @purple;
+    color: var(--visited-link);
   }
 }
 
@@ -107,18 +107,18 @@ a {
   --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% */
+  --link: @purple; /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@purple, 15%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@purple, 30%); /* 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);
+a.btn-info:link, a.btn-warning:link, a.btn-danger:link{
+  color: #FFF;
+}
+&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{
+  color: #FFF;
 }
 
 .fixed-table-container tbody .selected td {

resources/assets/less/skins/skin-red-dark.less

@@ -65,7 +65,7 @@
 
   &.btn-primary, .btn-primary:link {
     background-color: darken(@red, 10%);
-    border-color: darken(@red, 20%);
+    border-color: #FFF;
     color: #fff;
   }
 
@@ -204,7 +204,7 @@ body {
   color: var(--link);
 }
 .btn-primary, .btn-primary.hover, .btn-primary:active, .text-red {
-  color: var(--text-main)!important;
+  color: var(--button-primary);
 }
 .btn-primary:hover {
   background-color: var(--button-primary);

resources/assets/less/skins/skin-red.less

@@ -108,9 +108,9 @@ a {
   --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% */
+  --link: @red; /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@red, 15%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@red, 30%); /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF; /* Use same as Header picker */
   --light-link: #fff; /* Use same as Header picker */
 }
@@ -121,6 +121,12 @@ a:link {
 a:visited {
   color: var(--visited-link);
 }
+a.btn-info:link, a.btn-warning:link, a.btn-danger:link{
+  color: #FFF;
+}
+&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{
+  color: #FFF;
+}
 
 .fixed-table-container tbody .selected td {
   background-color: #fff8af;

resources/assets/less/skins/skin-yellow-dark.less

@@ -11,11 +11,10 @@
   //Navbar
   .main-header {
     .navbar {
-      .navbar-variant(@yellow; #fff);
       .sidebar-toggle {
-        color: #fff;
+        color: #000 !important;
         &:hover {
-          background-color: darken(@yellow, 5%);
+          background-color: var(--link);
         }
       }
       @media (max-width: @screen-header-collapse) {
@@ -52,48 +51,43 @@
   .skin-dark-sidebar(@yellow);
 }
 
-.skin-yellow-dark.layout-top-nav .main-header > .logo {
-  .logo-variant {
-    background-color: none;
-  }
-}
-
-
-
 .btn, .btn:hover {
-  color: #fff;
+  color: #000;
 
   &.btn-primary, .btn-primary:link {
-    background-color: darken(@yellow, 10%);
-    border-color: darken(@yellow, 20%);
-    color: #fff;
+    background-color: var(--button-default);
+    border-color: var(--button-default);
+    color: #545454;
   }
 
 
   &a.btn-primary:hover {
-    background-color: darken(@yellow, 20%);
-    border-color: darken(@yellow, 20%);
-    color: #fff;
+    background-color: var(--button-hover);
+    border-color: var(--button-hover);
+    color: #545454;
   }
 
   &.btn-white:link {
-    background-color: darken(@yellow, 10%);
-    color: #fff;
+    background-color: var(--button-default);
+    color: #545454;
   }
 
   &.btn-white:hover {
-    background-color: darken(@yellow, 30%);
-    color: #fff;
+    background-color: var(--hover-link);
+    color: #545454;
   }
 }
 
 
 a {
+  &:link {
+    color: var(--link);
+  }
   &:hover {
-    color: #fff;
+    color: var(--hover-link);
   }
   &:visited {
-    color: #fff;
+    color: var(--visited-link);
   }
 }
 
@@ -109,17 +103,17 @@ a {
   --back-main: #333;
   --back-sub: #3d4144;
   --back-sub-alt: rgba(0, 0, 0, 0.36);
-  --button-default: darken(@yellow, 15%);
-  --button-primary: darken(@yellow, 25%);
-  --button-hover: darken(@yellow, 30%);
-  --header: @yellow; /* Use same as Header picker */
+  --button-default: #FFFF00;
+  --button-primary: darken(#FFFF00, 25%);
+  --button-hover: darken(#FFFF00, 30%);
+  --header: #FFFF00; /* Use same as Header picker */
   --text-main: #BBB;
   --text-sub: #9b9b9b;
-  --link: lighten(@yellow, 30%); /* Use same as Header picker, lighten by 70% */
-  --visited-link: lighten(@yellow, 40%); /* 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 */
+  --link: #F0E68C; /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(#F0E68C, 15%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(#F0E68C, 45%); /* Use same as Header picker, lighten by 70% */
+  --nav-link: #222; /* Use same as Header picker */
+  --light-link: #545454; /* Use same as Header picker */
 }
 
 .main-header .navbar, .main-header .logo {
@@ -128,7 +122,12 @@ a {
   background: linear-gradient(to bottom, var(--header) 0%,var(--header) 100%);
   border-color: var(--header);
 }
-
+.label-default{
+  background-color:var(--back-sub);
+}
+a.btn.btn-default{
+  color:var(--nav-link);
+}
 .bootstrap-table .fixed-table-container .table thead th .sortable {
   color: var(--nav-link);
 }
@@ -136,23 +135,15 @@ a {
 .thead, .navbar-nav>li>a:link {
   color: var(--nav-link);
 }
+.navbar-nav>li>a:visited {
+  color: var(--nav-link);
+}
 
 .modal-content {
   background-color: var(--back-main);
   color: var(--text-main);
 }
 
-a:link {
-  color: var(--link);
-}
-
-a:visited {
-  color: var(--nav-link);
-}
-
-a:hover {
-  color: var(--hover-link);
-}
 a:link.btn-default{
   color: var(--nav-link);
 }
@@ -161,14 +152,13 @@ a:link.btn-default{
 }
 
 .small-box h3, .small-box p {
-  color: var(--nav-link) !important;
+  color: #fff !important;
   a:hover {
     text-decoration: none;
     color: var(--nav-link) !important;
   }
 }
 
-
 #accessoriesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
@@ -192,7 +182,7 @@ body {
 }
 .btn-default{
   background-color: var(--button-default);
-  color: var(--link);
+
 }
 
 .btn-default dropdown-toggle {
@@ -324,7 +314,10 @@ input[type=text], input[type=search] {
 .skin-yellow-dark .main-header .navbar .dropdown-menu li a {
   color: var(--header);
 }
-.fixed-table-body thead th .th-inner, .skin-yellow-dark .sidebar-menu>li.active>a, .skin-yellow .sidebar-menu>li:hover>a, .sidebar-toggle:hover {
+div.th-inner{
+  color:var(--text-main);
+}
+.fixed-table-body thead th .th-inner, .skin-yellow-dark, .skin-yellow {
   background-color: var(--header)!important;
 }
 .tab-content, .tab-pane {
@@ -336,7 +329,9 @@ input[type=text], input[type=search] {
 }
 .table-striped>tbody>tr:nth-of-type(even){
   background-color: var(--back-sub-alt);
-
+}
+.th-inner{
+  color: var(--nav-link);
 }
 #webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
   color: var(--text-main);
@@ -346,20 +341,6 @@ input[type=text], input[type=search] {
   border-bottom: #000;
 }
 
-a {
-  color: var(--link);
-
-  &:link {
-    color: var(--link)  }
-  &:hover {
-    color: var(--hover-link);
-    text-decoration: underline;
-  }
-  &:visited {
-    color: var(--visited-link)
-  }
-}
-
 .row-striped {
   vertical-align: top;
   line-height: 2.6;
@@ -369,7 +350,6 @@ a {
   //border-left: 1px solid #dddddd;
   //border-right: 1px solid #dddddd;
   display: table;
-
 }
 
 .row-striped .row:nth-of-type(odd) div {
@@ -377,7 +357,6 @@ a {
   color: var(--text-main);
   border-top: 1px solid #dddddd;
   display: table-cell;
-
 }
 
 .row-striped .row:nth-of-type(even) div {
@@ -398,4 +377,4 @@ a {
 
 .search-highlight, .search-highlight:hover {
   background-color: #e9d15b;
-}
+}

resources/assets/less/skins/skin-yellow.less

@@ -11,11 +11,11 @@
   //Navbar
   .main-header {
     .navbar {
-      .navbar-variant(@yellow; #fff);
+      .navbar-variant(#FBCC34);
       .sidebar-toggle {
-        color: #fff;
+        color: #000;
         &:hover {
-          background-color: darken(@yellow, 5%);
+          background-color: darken(#FBCC34, 5%);
         }
       }
       @media (max-width: @screen-header-collapse) {
@@ -27,7 +27,7 @@
             a {
               color: #333;
               &:hover {
-                background: darken(@yellow, 5%);
+                background: darken(#FBCC34, 5%);
               }
             }
           }
@@ -37,7 +37,7 @@
     //Logo
 
     li.user-header {
-      background-color: @yellow;
+      background-color: #FBCC34;
     }
   }
 
@@ -47,11 +47,12 @@
   }
 
   //Create the sidebar skin
-  .skin-dark-sidebar(@yellow);
+  .skin-dark-sidebar(#FBCC34);
 }
 
 .skin-yellow.layout-top-nav .main-header > .logo {
   .logo-variant {
+    color: #413F42;
     background-color: none;
   }
 }
@@ -62,72 +63,82 @@
 
 
   &.btn-primary, .btn-primary:link {
-    background-color: darken(@yellow, 10%);
-    border-color: darken(@yellow, 20%);
-    color: #fff;
+    background-color: darken(#FBCC34, 10%);
+    border-color: darken(#FBCC34, 20%);
+    color: var(--nav-link);
   }
 
 
   &a.btn-primary:hover {
-    background-color: darken(@yellow, 20%);
-    border-color: darken(@yellow, 20%);
-    color: #fff;
+    background-color: darken(#FBCC34, 20%);
+    border-color: darken(#FBCC34, 20%);
+    color: var(--nav-link);
   }
 
   &.btn-white:link {
-    background-color: darken(@yellow, 10%);
-    color: #fff;
+    background-color: darken(#FBCC34, 10%);
+    color: var(--nav-link);
   }
 
   &.btn-white:hover {
-    background-color: darken(@yellow, 30%);
-    color: #fff;
+    background-color: darken(#FBCC34, 30%);
+    color: var(--nav-link);
   }
 }
-
+a.btn-info:link, a.btn-warning:link, a.btn-danger:link{
+  color: #FFF;
+}
+&a.btn-info:visited, a.btn-warning:visited, a.btn-danger:visited{
+  color: #FFF;
+}
 
 a {
-  color: @yellow;
+  color: var(--link);
   &:hover {
-    color: darken(@yellow, 20%);
+    color: var(--hover-link);
   }
   &:visited {
-    color: @yellow;
+    color: var(--visited-link);
   }
 }
 
 .text-primary {
-  color: darken(@yellow, 20%);
+  color: darken(#FBCC34, 20%);
 }
 
 :root {
-  --button-default: darken(@yellow, 15%);
-  --button-primary: darken(@yellow, 25%);
-  --button-hover: darken(@yellow, 30%);
-  --header: @yellow; /* Use same as Header picker */
+  --button-default: darken(#FBCC34, 15%);
+  --button-primary: darken(#FBCC34, 25%);
+  --button-hover: darken(#FBCC34, 30%);
+  --header: #FBCC34; /* 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 */
+  --link: lighten( #413F42, 10%); /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(#413F42, 20%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(#413F42, 45%); /* Use same as Header picker, lighten by 70% */
+  --nav-link: #222; /* 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;
 }
 .select2-container--default .select2-selection--multiple .select2-selection__choice {
-  background-color: @yellow;
+  background-color: #FBCC34;
 }
 
 .search-highlight, .search-highlight:hover {
   background-color: #e9d15b;
+}
+.thead, .navbar-nav>li>a:link {
+  color: var(--nav-link);
+}
+.navbar-nav>li>a:visited {
+  color: var(--nav-link);
+}
+&:hover{
+  color: var(--nav-link);
+}
+.skin-yellow .main-header .navbar .nav > li > a {
+  color: #413F42;
 }

resources/lang/en/admin/users/general.php

@@ -33,7 +33,7 @@ return [
     'remove_group_memberships' => 'Remove Group Memberships',
     'warning_deletion' => 'WARNING:',
     'warning_deletion_information' => 'You are about to delete the :count user(s) listed below. Super admin names are highlighted in red.',
-    'update_user_asssets_status' => 'Update all assets for these users to this status',
+    'update_user_assets_status' => 'Update all assets for these users to this status',
     'checkin_user_properties' => 'Check in all properties associated with these users',
     'remote_label'   => 'This is a remote user',
     'remote'   => 'Remote',

resources/views/partials/bootstrap-table.blade.php

@@ -465,7 +465,7 @@
                 if ((row.custom_fields[field_column_plain].field_format) && (row.custom_fields[field_column_plain].value)) {
                     if (row.custom_fields[field_column_plain].field_format=='URL') {
                         return '<a href="' + row.custom_fields[field_column_plain].value + '" target="_blank" rel="noopener">' + row.custom_fields[field_column_plain].value + '</a>';
-                    }else if (row.custom_fields[field_column_plain].field_format=='BOOLEAN') {
+                    } else if (row.custom_fields[field_column_plain].field_format=='BOOLEAN') {
                         return (row.custom_fields[field_column_plain].value == 1) ? "<span class='fas fa-check-circle' style='color:green' />" : "<span class='fas fa-times-circle' style='color:red' />";
                     } else if (row.custom_fields[field_column_plain].field_format=='EMAIL') {
                         return '<a href="mailto:' + row.custom_fields[field_column_plain].value + '">' + row.custom_fields[field_column_plain].value + '</a>';

resources/views/vendor/mail/html/message.blade.php

@@ -2,34 +2,47 @@
 {{-- Header --}}
 @slot('header')
 @component('mail::header', ['url' => config('app.url')])
-@if (isset($snipeSettings) && ($snipeSettings->show_images_in_email=='1' ) && ($snipeSettings::setupCompleted()))
 
-@if ($snipeSettings->brand == '3')
+{{-- Check that the $snipeSettings variable is set, images are set to be shown, and setup is complete --}}
 
-@if ($snipeSettings->email_logo!='')
-<img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
-@elseif ($snipeSettings->logo!='')
-<img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->logo)) }}">
-@endif
-<br><br>
-{{ $snipeSettings->site_name }}
-<br><br>
 
-@elseif ($snipeSettings->brand == '2')
-@if ($snipeSettings->email_logo!='')
+@if (isset($snipeSettings) && ($snipeSettings::setupCompleted()))
 
-<img style="max-width: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
-@elseif ($snipeSettings->logo!='')
-<img style="max-width: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->logo)) }}">
-@endif
+    {{-- Show images in email!  --}}
+    @if (($snipeSettings->show_images_in_email=='1' ) && (($snipeSettings->brand == '3') || ($snipeSettings->brand == '2')))
 
+        {{-- $snipeSettings->brand = 1 = Text  --}}
+        {{-- $snipeSettings->brand = 2 = Logo  --}}
+        {{-- $snipeSettings->brand = 3 = Logo + Text  --}}
+        @if ($snipeSettings->brand == '3')
+
+            @if ($snipeSettings->email_logo!='')
+            <img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
+            @elseif ($snipeSettings->logo!='')
+            <img style="max-height: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->logo)) }}">
+            @endif
+
+            <br><br>
+            {{ $snipeSettings->site_name }}
+            <br><br>
+        {{-- else if branding type is just logo --}}
+        @elseif ($snipeSettings->brand == '2')
+            @if ($snipeSettings->email_logo!='')
+
+            <img style="max-width: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->email_logo)) }}">
+            @elseif ($snipeSettings->logo!='')
+            <img style="max-width: 100px; vertical-align:middle;" src="{{ \Storage::disk('public')->url(e($snipeSettings->logo)) }}">
+            @endif
+        @endif
+    @else
+        {{ $snipeSettings->site_name }}
+    @endif
+
+{{-- Either the $snipeSettings variable isn't set or setup is not complete --}}
 @else
-{{ $snipeSettings->site_name }}
+{{ config('app.name') }}
 @endif
 
-@else
-Snipe-IT
-@endif
 @endcomponent
 @endslot
 

snipeit.sh

@@ -237,7 +237,7 @@ install_snipeit () {
   log "php $APP_PATH/artisan migrate --force"
 
   echo "* Creating scheduler cron."
-  (crontab -l ; echo "* * * * * /usr/bin/php $APP_PATH/artisan schedule:run >> /dev/null 2>&1") | crontab -
+  (run_as_app_user crontab -l ; echo "* * * * * /usr/bin/php $APP_PATH/artisan schedule:run >> /dev/null 2>&1") | run_as_app_user crontab -
 }
 
 set_firewall () {