Updated dark skins with compiled assets for prod

app/Http/Controllers/Auth/LoginController.php

@@ -157,9 +157,26 @@ class LoginController extends Controller
         if (Setting::getSettings()->login_remote_user_enabled == "1" && isset($remote_user) && !empty($remote_user)) {
             Log::debug("Authenticating via HTTP header $header_name.");
 
-            $pos = strpos($remote_user, '\\');
+            $strip_prefixes = [
+                // IIS/AD
+                // https://github.com/snipe/snipe-it/pull/5862
+                '\\',
+
+                // Google Cloud IAP
+                // https://cloud.google.com/iap/docs/identity-howto#getting_the_users_identity_with_signed_headers
+                'accounts.google.com:',
+            ];
+
+            $pos = 0;
+            foreach ($strip_prefixes as $needle) {
+                if (($pos = strpos($remote_user, $needle)) !== FALSE) {
+                    $pos += strlen($needle);
+                    break;
+                }
+            }
+
             if ($pos > 0) {
-                $remote_user = substr($remote_user, $pos + 1);
+                $remote_user = substr($remote_user, $pos);
             };
             
             try {

public/mix-manifest.json

@@ -7,27 +7,27 @@
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=747948e5f269f64047f7",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=d7996d850e8bcdc4e167",
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=eb25d2ec49f730d09431",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=007a6a34faef7ae0dbae",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=3b3c544f99a912a4a27b",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=35602987835e5d50d162",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=3ffccc321a19007ae2a2",
+    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=1a1ebcc437f2de698c27",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=5d40700e5a9ffce2337f",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=9b0d44d6e3a9cf46fa02",
     "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=b6dcb6d5c666fc5c8cc0",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=0a02c76392200c4349b2",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=3acc03e5a20757aa08ca",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=cb85a4e40e784319e878",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=5c430afd404d8e27678b",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=46311efe6c78ad08a7ce",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=4eb849d29e458a7dc71c",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=1473bf8494b4c962eb44",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=9d1b4bb34e17de3e5952",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=b41e38b304805136e81f",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b4fc4a74e1f6367dc3e2",
     "/css/dist/all.css": "/css/dist/all.css?id=199fdf677ce0dce6cef8",
     "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
     "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=007a6a34faef7ae0dbae",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=3b3c544f99a912a4a27b",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=3ffccc321a19007ae2a2",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=1a1ebcc437f2de698c27",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=4eb849d29e458a7dc71c",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=1473bf8494b4c962eb44",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=5c430afd404d8e27678b",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=46311efe6c78ad08a7ce",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=5d40700e5a9ffce2337f",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=9b0d44d6e3a9cf46fa02",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=0a02c76392200c4349b2",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=3acc03e5a20757aa08ca",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=9d1b4bb34e17de3e5952",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=b41e38b304805136e81f",
     "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=d7996d850e8bcdc4e167",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
     "/css/build/signature-pad.min.css": "/css/build/signature-pad.min.css?id=d41d8cd98f00b204e980",

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

@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@black, 15%);
+  --button-primary: darken(@black, 25%);
+  --button-hover: darken(@black, 30%);
   --header: @black; /* Use same as Header picker */
-  --text-main: #FFF;
+  --text-main: #BBB;
-  --text-sub: #BBB;
+  --text-sub: #9b9b9b;
-  --link: lighten(@black, 50%); /* Use same as Header picker */
+  --link: lighten(@black, 30%); /* 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 */
 }
@@ -123,7 +128,11 @@ a {
   border-color: var(--header);
 }
 
-.navbar-nav>li>a:link {
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+
+.thead, .navbar-nav>li>a:link {
   color: var(--nav-link);
 }
 
@@ -131,22 +140,39 @@ a {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.popover {
+
-  background-color:var(--back-main);
+a:link {
-}
+  color: var(--link);
-.popover-title {
-  background-color: #111;
 }
 
-a, a:link, a:visited, .btn-primary.hover {
+a:visited {
-  color: var(--text-main);
+  color: var(--nav-link);
 }
+
+a:hover {
+  color: var(--hover-link);
+}
+
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+
+.small-box h3, .small-box p {
+  color: var(--nav-link) !important;
+  a:hover {
+    text-decoration: none;
+    color: var(--nav-link) !important;
+  }
+}
+
+
 #accessoriesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
 #assetsListingTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
+
 #assetsListingTable>tbody>tr.selected>td {
   background-color: var(--back-main);
 }
@@ -158,23 +184,29 @@ body {
   border-top-color: var(--header);
 }
 .box-body, .box-footer, .box-header {
-  background-color: var(--back-sub);
-  color: var(--text-main);
-}
-.btn-default{
-  background-color: var(--back-main);
-  color: var(--text-main);
-}
-.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
   background-color: var(--back-sub);
   color: var(--header);
 }
-.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
+.btn-default{
+  background-color: var(--button-default);
+  color: var(--link);
+}
+
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+
+.btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
+  background-color: var(--button-hover);
+  color: var(--link);
+}
+.btn-primary, .btn-primary.hover, .btn-primary:active, .text-black {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
+  background-color: var(--button-primary);
-  color: var(--header)!important;
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -201,11 +233,11 @@ body {
 }
 .dropdown-menu, .dropdown-menu>li>a {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--text-main) !important;
 }
 .dropdown-menu>li>a:hover {
   background-color: var(--back-main);
-  color: var(--text-main);
+  color: var(--nav-link);
 }
 .form-control {
   background-color: var(--back-main);
@@ -303,19 +335,25 @@ input[type=text], input[type=search] {
 .table-striped>tbody>tr:nth-of-type(odd) {
   background-color: var(--back-sub);
 }
-#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa {
+#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
   color: var(--text-main);
 }
 
+.box-header.with-border {
+  border-bottom: #000;
+}
+
 a {
   color: var(--link);
+
   &:link {
-    color: var(--text-main)  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--text-sub)
+    color: var(--visited-link)
   }
 }
 

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

@@ -233,11 +233,11 @@ body {
 }
 .dropdown-menu, .dropdown-menu>li>a {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--text-main) !important;
 }
 .dropdown-menu>li>a:hover {
   background-color: var(--back-main);
-  color: var(--text-main);
+  color: var(--nav-link);
 }
 .form-control {
   background-color: var(--back-main);

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

@@ -233,11 +233,11 @@ body {
 }
 .dropdown-menu, .dropdown-menu>li>a {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--text-main) !important;
 }
 .dropdown-menu>li>a:hover {
   background-color: var(--back-main);
-  color: var(--text-main);
+  color: var(--nav-link);
 }
 .form-control {
   background-color: var(--back-main);

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

@@ -233,11 +233,11 @@ body {
 }
 .dropdown-menu, .dropdown-menu>li>a {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--text-main) !important;
 }
 .dropdown-menu>li>a:hover {
   background-color: var(--back-main);
-  color: var(--text-main);
+  color: var(--nav-link);
 }
 .form-control {
   background-color: var(--back-main);

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

@@ -233,11 +233,11 @@ body {
 }
 .dropdown-menu, .dropdown-menu>li>a {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--text-main) !important;
 }
 .dropdown-menu>li>a:hover {
   background-color: var(--back-main);
-  color: var(--text-main);
+  color: var(--nav-link);
 }
 .form-control {
   background-color: var(--back-main);

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

@@ -233,11 +233,11 @@ body {
 }
 .dropdown-menu, .dropdown-menu>li>a {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--text-main) !important;
 }
 .dropdown-menu>li>a:hover {
   background-color: var(--back-main);
-  color: var(--text-main);
+  color: var(--nav-link);
 }
 .form-control {
   background-color: var(--back-main);

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

@@ -233,11 +233,11 @@ body {
 }
 .dropdown-menu, .dropdown-menu>li>a {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--text-main) !important;
 }
 .dropdown-menu>li>a:hover {
   background-color: var(--back-main);
-  color: var(--text-main);
+  color: var(--nav-link);
 }
 .form-control {
   background-color: var(--back-main);

resources/lang/en/auth/general.php

@@ -8,6 +8,7 @@ return [
     'login'                         => 'Login',
     'login_prompt'                  => 'Please Login',
     'forgot_password'               => 'I forgot my password',
+    'ldap_reset_password'           => 'Please click here to reset your LDAP password',
     'remember_me'                   => 'Remember Me',
     'username_help_top'                 => 'Enter your <strong>username</strong> to be emailed a password reset link.',
     'username_help_bottom'          => 'Your username and email address <em>may</em> be the same, but may not be, depending on your configuration. If you cannot remember your username, contact your administrator. <br><br><strong>Usernames without an associated email address will not be emailed a password reset link.</strong> ',

resources/views/auth/passwords/email.blade.php

@@ -4,12 +4,22 @@
 {{-- Page content --}}
 @section('content')
 
+
     @if ($snipeSettings->custom_forgot_pass_url)
+        <!--  The admin settings specify an LDAP password reset URL to let's send them there -->
+        <div class="col-md-4 col-md-offset-4" style="margin-top: 20px;">
+            <div class="box box-header text-center">
+                <h3 class="box-title">
                     <a href="{{ $snipeSettings->custom_forgot_pass_url  }}" rel="noopener">
-            {{ trans('auth/general.forgot_password')  }}
+                        {{ trans('auth/general.ldap_reset_password')  }}
                     </a>
+                </h3>
+            </div>
+        </div>
+
     @else
 
+
     <form class="form" role="form" method="POST" action="{{ url('/password/email') }}">
         {!! csrf_field() !!}
     <div class="container">

resources/views/hardware/edit.blade.php

@@ -229,13 +229,13 @@
 
             var auto_tag        = $("#asset_tag").val().replace(/[^\d]/g, '');
             var box_html        = '';
-
+			const zeroPad 		= (num, places) => String(num).padStart(places, '0');
 
             // Check that we haven't exceeded the max number of asset fields
             if (x < max_fields) {
 
                 if (auto_tag!='') {
-                     auto_tag = parseInt(auto_tag) + parseInt(x);
+                     auto_tag = zeroPad(parseInt(auto_tag) + parseInt(x),auto_tag.length);
                 } else {
                      auto_tag = '';
                 }