Merge remote-tracking branch 'origin/develop'

Following up on https://github.com/snipe/snipe-it/commit/7c2da8170028b2616b99ddf4483c956c057de31b,
this extends the logic, adding support for Google Cloud IAP.

.all-contributorsrc

@@ -135,7 +135,8 @@
       "avatar_url": "https://avatars0.githubusercontent.com/u/10137?v=3",
       "profile": "https://github.com/ghost",
       "contributions": [
-        "translation"
+        "translation",
+        "code"
       ]
     },
     {
@@ -1956,6 +1957,159 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "giannello",
+      "name": "Giuseppe Iannello",
+      "avatar_url": "https://avatars.githubusercontent.com/u/551789?v=4",
+      "profile": "https://github.com/giannello",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "PeterDaveHello",
+      "name": "Peter Dave Hello",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3691490?v=4",
+      "profile": "https://www.peterdavehello.org/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sigmoidal",
+      "name": "sigmoidal",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6106332?v=4",
+      "profile": "https://github.com/sigmoidal",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "phenixdotnet",
+      "name": "Vincent Lainé",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2082554?v=4",
+      "profile": "https://github.com/phenixdotnet",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "derlucas",
+      "name": "Lucas Pleß",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1943040?v=4",
+      "profile": "http://www.lucas-pless.com",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "iansltx",
+      "name": "Ian Littman",
+      "avatar_url": "https://avatars.githubusercontent.com/u/472804?v=4",
+      "profile": "http://twitter.com/iansltx",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "PauloLuna",
+      "name": "João Paulo",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3519029?v=4",
+      "profile": "https://github.com/PauloLuna",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ThoBur",
+      "name": "ThoBur",
+      "avatar_url": "https://avatars.githubusercontent.com/u/70443365?v=4",
+      "profile": "https://github.com/ThoBur",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "alek13",
+      "name": "Alexander Chibrikin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1972329?v=4",
+      "profile": "http://phpprofi.ru/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "winstan",
+      "name": "Anthony Winstanley",
+      "avatar_url": "https://avatars.githubusercontent.com/u/438332?v=4",
+      "profile": "https://github.com/winstan",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "fashberg",
+      "name": "Folke",
+      "avatar_url": "https://avatars.githubusercontent.com/u/3075214?v=4",
+      "profile": "https://github.com/fashberg",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "benwa",
+      "name": "Bennett Blodinger",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1351571?v=4",
+      "profile": "https://github.com/benwa",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ncareau",
+      "name": "NMC",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2974631?v=4",
+      "profile": "https://nmc.dev",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "andres-baller",
+      "name": "andres-baller",
+      "avatar_url": "https://avatars.githubusercontent.com/u/52182449?v=4",
+      "profile": "https://github.com/andres-baller",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "sean-borg",
+      "name": "sean-borg",
+      "avatar_url": "https://avatars.githubusercontent.com/u/67109348?v=4",
+      "profile": "https://github.com/sean-borg",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "EDVLeer",
+      "name": "EDVLeer",
+      "avatar_url": "https://avatars.githubusercontent.com/u/32170051?v=4",
+      "profile": "https://github.com/EDVLeer",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Kurokat",
+      "name": "Kurokat",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23075196?v=4",
+      "profile": "https://github.com/Kurokat",
+      "contributions": [
+        "code"
+      ]
     }
   ]
 }

.htaccess

@@ -5,7 +5,15 @@
 
     # Make sure .env files not not browseable if in a sub-directory.
     <FilesMatch "\.env$">
-    Deny from all
+       # Apache 2.2
+       <IfModule !authz_core_module>
+          Deny from all
+       </IfModule>
+       
+       # Apache 2.4+
+       <IfModule authz_core_module>
+          Require all denied
+       </IfModule>
     </FilesMatch>
     
 </IfModule>

Dockerfile.alpine

@@ -1,6 +1,6 @@
 FROM alpine:3.12
 # Apache + PHP
-RUN  apk add --update --no-cache \
+RUN  apk add --no-cache \
         apache2 \
         php7 \
         php7-common \

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) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![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-214-orange.svg?style=flat-square)](#contributors) 
+[![All Contributors](https://img.shields.io/badge/all_contributors-231-orange.svg?style=flat-square)](#contributors) 
 
 ## Snipe-IT - Open Source Asset Management System
 
@@ -90,7 +90,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 <!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
 | [<img src="https://avatars3.githubusercontent.com/u/197404?v=3" width="110px;"/><br /><sub>snipe</sub>](http://www.snipe.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=snipe "Code") [🚇](#infra-snipe "Infrastructure (Hosting, Build-Tools, etc)") [📖](https://github.com/snipe/snipe-it/commits?author=snipe "Documentation") [⚠️](https://github.com/snipe/snipe-it/commits?author=snipe "Tests") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Asnipe "Bug reports") [🎨](#design-snipe "Design") [👀](#review-snipe "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/36335?v=3" width="110px;"/><br /><sub>Brady Wetherington</sub>](http://www.uberbrady.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=uberbrady "Code") [📖](https://github.com/snipe/snipe-it/commits?author=uberbrady "Documentation") [🚇](#infra-uberbrady "Infrastructure (Hosting, Build-Tools, etc)") [👀](#review-uberbrady "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/3803132?v=3" width="110px;"/><br /><sub>Daniel Meltzer</sub>](https://github.com/dmeltzer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Code") [⚠️](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Tests") [📖](https://github.com/snipe/snipe-it/commits?author=dmeltzer "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/1609106?v=3" width="110px;"/><br /><sub>Michael T</sub>](http://www.tuckertechonline.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mtucker6784 "Code") | [<img src="https://avatars2.githubusercontent.com/u/3274937?v=3" width="110px;"/><br /><sub>madd15</sub>](https://github.com/madd15)<br />[📖](https://github.com/snipe/snipe-it/commits?author=madd15 "Documentation") [💬](#question-madd15 "Answering Questions") | [<img src="https://avatars2.githubusercontent.com/u/894126?v=3" width="110px;"/><br /><sub>Vincent Sposato</sub>](https://github.com/vsposato)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vsposato "Code") | [<img src="https://avatars0.githubusercontent.com/u/1639757?v=3" width="110px;"/><br /><sub>Andrea Bergamasco</sub>](https://github.com/vjandrea)<br />[💻](https://github.com/snipe/snipe-it/commits?author=vjandrea "Code") |
 | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
-| [<img src="https://avatars0.githubusercontent.com/u/10640152?v=3" width="110px;"/><br /><sub>Karol</sub>](https://github.com/kpawelski)<br />[🌍](#translation-kpawelski "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=kpawelski "Code") | [<img src="https://avatars3.githubusercontent.com/u/600106?v=3" width="110px;"/><br /><sub>morph027</sub>](http://blog.morph027.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=morph027 "Code") | [<img src="https://avatars3.githubusercontent.com/u/22935755?v=3" width="110px;"/><br /><sub>fvleminckx</sub>](https://github.com/fvleminckx)<br />[🚇](#infra-fvleminckx "Infrastructure (Hosting, Build-Tools, etc)") | [<img src="https://avatars2.githubusercontent.com/u/15633547?v=3" width="110px;"/><br /><sub>itsupportcmsukorg</sub>](https://github.com/itsupportcmsukorg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=itsupportcmsukorg "Code") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aitsupportcmsukorg "Bug reports") | [<img src="https://avatars3.githubusercontent.com/u/12373799?v=3" width="110px;"/><br /><sub>Frank</sub>](https://override.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=base-zero "Code") | [<img src="https://avatars0.githubusercontent.com/u/10137?v=3" width="110px;"/><br /><sub>Deleted user</sub>](https://github.com/ghost)<br />[🌍](#translation-ghost "Translation") | [<img src="https://avatars1.githubusercontent.com/u/10802313?v=3" width="110px;"/><br /><sub>tiagom62</sub>](https://github.com/tiagom62)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tiagom62 "Code") [🚇](#infra-tiagom62 "Infrastructure (Hosting, Build-Tools, etc)") |
+| [<img src="https://avatars0.githubusercontent.com/u/10640152?v=3" width="110px;"/><br /><sub>Karol</sub>](https://github.com/kpawelski)<br />[🌍](#translation-kpawelski "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=kpawelski "Code") | [<img src="https://avatars3.githubusercontent.com/u/600106?v=3" width="110px;"/><br /><sub>morph027</sub>](http://blog.morph027.de/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=morph027 "Code") | [<img src="https://avatars3.githubusercontent.com/u/22935755?v=3" width="110px;"/><br /><sub>fvleminckx</sub>](https://github.com/fvleminckx)<br />[🚇](#infra-fvleminckx "Infrastructure (Hosting, Build-Tools, etc)") | [<img src="https://avatars2.githubusercontent.com/u/15633547?v=3" width="110px;"/><br /><sub>itsupportcmsukorg</sub>](https://github.com/itsupportcmsukorg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=itsupportcmsukorg "Code") [🐛](https://github.com/snipe/snipe-it/issues?q=author%3Aitsupportcmsukorg "Bug reports") | [<img src="https://avatars3.githubusercontent.com/u/12373799?v=3" width="110px;"/><br /><sub>Frank</sub>](https://override.io)<br />[💻](https://github.com/snipe/snipe-it/commits?author=base-zero "Code") | [<img src="https://avatars0.githubusercontent.com/u/10137?v=3" width="110px;"/><br /><sub>Deleted user</sub>](https://github.com/ghost)<br />[🌍](#translation-ghost "Translation") [💻](https://github.com/snipe/snipe-it/commits?author=ghost "Code") | [<img src="https://avatars1.githubusercontent.com/u/10802313?v=3" width="110px;"/><br /><sub>tiagom62</sub>](https://github.com/tiagom62)<br />[💻](https://github.com/snipe/snipe-it/commits?author=tiagom62 "Code") [🚇](#infra-tiagom62 "Infrastructure (Hosting, Build-Tools, etc)") |
 | [<img src="https://avatars3.githubusercontent.com/u/2389047?v=3" width="110px;"/><br /><sub>Ryan Stafford</sub>](https://github.com/rystaf)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rystaf "Code") | [<img src="https://avatars2.githubusercontent.com/u/10345935?v=3" width="110px;"/><br /><sub>Eammon Hanlon</sub>](https://github.com/ehanlon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ehanlon "Code") | [<img src="https://avatars0.githubusercontent.com/u/441924?v=3" width="110px;"/><br /><sub>zjean</sub>](https://github.com/zjean)<br />[💻](https://github.com/snipe/snipe-it/commits?author=zjean "Code") | [<img src="https://avatars0.githubusercontent.com/u/12660103?v=3" width="110px;"/><br /><sub>Matthias Frei</sub>](http://www.frei.media)<br />[💻](https://github.com/snipe/snipe-it/commits?author=FREImedia "Code") | [<img src="https://avatars0.githubusercontent.com/u/3767518?v=3" width="110px;"/><br /><sub>opsydev</sub>](https://github.com/opsydev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=opsydev "Code") | [<img src="https://avatars1.githubusercontent.com/u/82290?v=3" width="110px;"/><br /><sub>Daniel Dreier</sub>](http://www.ddreier.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ddreier "Code") | [<img src="https://avatars0.githubusercontent.com/u/23448?v=3" width="110px;"/><br /><sub>Nikolai Prokoschenko</sub>](http://rassie.org)<br />[💻](https://github.com/snipe/snipe-it/commits?author=rassie "Code") |
 | [<img src="https://avatars0.githubusercontent.com/u/13452757?v=3" width="110px;"/><br /><sub>Drew</sub>](https://github.com/YetAnotherCodeMonkey)<br />[💻](https://github.com/snipe/snipe-it/commits?author=YetAnotherCodeMonkey "Code") | [<img src="https://avatars0.githubusercontent.com/u/1342320?v=3" width="110px;"/><br /><sub>Walter</sub>](https://github.com/merid14)<br />[💻](https://github.com/snipe/snipe-it/commits?author=merid14 "Code") | [<img src="https://avatars3.githubusercontent.com/u/11254614?v=3" width="110px;"/><br /><sub>Petr Baloun</sub>](https://github.com/balous)<br />[💻](https://github.com/snipe/snipe-it/commits?author=balous "Code") | [<img src="https://avatars0.githubusercontent.com/u/6117660?v=3" width="110px;"/><br /><sub>reidblomquist</sub>](https://github.com/reidblomquist)<br />[📖](https://github.com/snipe/snipe-it/commits?author=reidblomquist "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/539914?v=3" width="110px;"/><br /><sub>Mathieu Kooiman</sub>](https://github.com/mathieuk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mathieuk "Code") | [<img src="https://avatars3.githubusercontent.com/u/6606421?v=3" width="110px;"/><br /><sub>csayre</sub>](https://github.com/csayre)<br />[📖](https://github.com/snipe/snipe-it/commits?author=csayre "Documentation") | [<img src="https://avatars1.githubusercontent.com/u/768488?v=3" width="110px;"/><br /><sub>Adam Dunson</sub>](https://github.com/adamdunson)<br />[💻](https://github.com/snipe/snipe-it/commits?author=adamdunson "Code") |
 | [<img src="https://avatars0.githubusercontent.com/u/5547470?v=3" width="110px;"/><br /><sub>Hereward</sub>](https://github.com/thehereward)<br />[💻](https://github.com/snipe/snipe-it/commits?author=thehereward "Code") | [<img src="https://avatars0.githubusercontent.com/u/5802977?v=3" width="110px;"/><br /><sub>swoopdk</sub>](https://github.com/swoopdk)<br />[💻](https://github.com/snipe/snipe-it/commits?author=swoopdk "Code") | [<img src="https://avatars1.githubusercontent.com/u/3470403?v=3" width="110px;"/><br /><sub>Abdullah Alansari</sub>](https://linkedin.com/in/ahimta)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Ahimta "Code") | [<img src="https://avatars0.githubusercontent.com/u/796443?v=3" width="110px;"/><br /><sub>Micael Rodrigues</sub>](https://github.com/MicaelRodrigues)<br />[💻](https://github.com/snipe/snipe-it/commits?author=MicaelRodrigues "Code") | [<img src="https://avatars0.githubusercontent.com/u/614564?v=3" width="110px;"/><br /><sub>Patrick Gallagher</sub>](http://macadmincorner.com)<br />[📖](https://github.com/snipe/snipe-it/commits?author=patgmac "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/7165922?v=3" width="110px;"/><br /><sub>Miliamber</sub>](https://github.com/Miliamber)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Miliamber "Code") | [<img src="https://avatars3.githubusercontent.com/u/861766?v=3" width="110px;"/><br /><sub>hawk554</sub>](https://github.com/hawk554)<br />[💻](https://github.com/snipe/snipe-it/commits?author=hawk554 "Code") |
@@ -119,7 +119,9 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken
 | [<img src="https://avatars0.githubusercontent.com/u/6609453?v=4" width="110px;"/><br /><sub>Sxderp</sub>](https://github.com/Sxderp)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Sxderp "Code") | [<img src="https://avatars1.githubusercontent.com/u/4807843?v=4" width="110px;"/><br /><sub>fanta8897</sub>](https://github.com/fanta8897)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fanta8897 "Code") | [<img src="https://avatars2.githubusercontent.com/u/2576509?v=4" width="110px;"/><br /><sub>Andrey Bolonin</sub>](https://andreybolonin.com/phpconsulting/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andreybolonin "Code") | [<img src="https://avatars3.githubusercontent.com/u/2173307?v=4" width="110px;"/><br /><sub>shinayoshi</sub>](http://www.shinayoshi.net/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=shinayoshi "Code") | [<img src="https://avatars3.githubusercontent.com/u/2130159?v=4" width="110px;"/><br /><sub>Hubert</sub>](https://github.com/reuser)<br />[💻](https://github.com/snipe/snipe-it/commits?author=reuser "Code") | [<img src="https://avatars0.githubusercontent.com/u/6865789?v=4" width="110px;"/><br /><sub>KeenRivals</sub>](https://brashear.me)<br />[💻](https://github.com/snipe/snipe-it/commits?author=KeenRivals "Code") | [<img src="https://avatars3.githubusercontent.com/u/2902513?v=4" width="110px;"/><br /><sub>omyno</sub>](https://github.com/omyno)<br />[💻](https://github.com/snipe/snipe-it/commits?author=omyno "Code") |
 | [<img src="https://avatars1.githubusercontent.com/u/6271335?v=4" width="110px;"/><br /><sub>Evgeny</sub>](https://github.com/jackka)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jackka "Code") | [<img src="https://avatars2.githubusercontent.com/u/1169963?v=4" width="110px;"/><br /><sub>Colin Campbell</sub>](https://digitalist.se)<br />[💻](https://github.com/snipe/snipe-it/commits?author=colin-campbell "Code") | [<img src="https://avatars3.githubusercontent.com/u/2872098?v=4" width="110px;"/><br /><sub>Ľubomír Kučera</sub>](https://github.com/lubo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=lubo "Code") | [<img src="https://avatars3.githubusercontent.com/u/570639?v=4" width="110px;"/><br /><sub>Martin Meredith</sub>](https://www.sourceguru.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Mezzle "Code") | [<img src="https://avatars1.githubusercontent.com/u/7632599?v=4" width="110px;"/><br /><sub>Tim Farmer</sub>](https://github.com/timothyfarmer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=timothyfarmer "Code") | [<img src="https://avatars0.githubusercontent.com/u/17459600?v=4" width="110px;"/><br /><sub>Marián Skrip</sub>](https://github.com/mskrip)<br />[💻](https://github.com/snipe/snipe-it/commits?author=mskrip "Code") | [<img src="https://avatars2.githubusercontent.com/u/47435081?v=4" width="110px;"/><br /><sub>Godfrey Martinez</sub>](https://github.com/Godmartinz)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Godmartinz "Code") |
 | [<img src="https://avatars1.githubusercontent.com/u/2075128?v=4" width="110px;"/><br /><sub>bigtreeEdo</sub>](https://github.com/bigtreeEdo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=bigtreeEdo "Code") | [<img src="https://avatars0.githubusercontent.com/u/5000430?v=4" width="110px;"/><br /><sub>Colin  McNeil</sub>](https://colinmcneil.me/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ColinMcNeil "Code") | [<img src="https://avatars0.githubusercontent.com/u/421625?v=4" width="110px;"/><br /><sub>JoKneeMo</sub>](https://github.com/JoKneeMo)<br />[💻](https://github.com/snipe/snipe-it/commits?author=JoKneeMo "Code") | [<img src="https://avatars0.githubusercontent.com/u/54849013?v=4" width="110px;"/><br /><sub>Joshi</sub>](http://www.redbridge.se)<br />[💻](https://github.com/snipe/snipe-it/commits?author=joshi-redbridge "Code") | [<img src="https://avatars2.githubusercontent.com/u/15731458?v=4" width="110px;"/><br /><sub>Anthony Burns</sub>](https://github.com/anthonypburns)<br />[💻](https://github.com/snipe/snipe-it/commits?author=anthonypburns "Code") | [<img src="https://avatars1.githubusercontent.com/u/63399474?v=4" width="110px;"/><br /><sub>johnson-yi</sub>](https://github.com/johnson-yi)<br />[💻](https://github.com/snipe/snipe-it/commits?author=johnson-yi "Code") | [<img src="https://avatars1.githubusercontent.com/u/1862720?v=4" width="110px;"/><br /><sub>Sanjay Govind</sub>](https://tangentmc.net)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sanjay900 "Code") |
-| [<img src="https://avatars0.githubusercontent.com/u/1255375?v=4" width="110px;"/><br /><sub>Peter Upfold</sub>](https://peter.upfold.org.uk/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterUpfold "Code") | [<img src="https://avatars2.githubusercontent.com/u/961717?v=4" width="110px;"/><br /><sub>Jared Biel</sub>](https://github.com/jbiel)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jbiel "Code") | [<img src="https://avatars1.githubusercontent.com/u/1733625?v=4" width="110px;"/><br /><sub>Dampfklon</sub>](https://github.com/dampfklon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dampfklon "Code") | [<img src="https://avatars2.githubusercontent.com/u/52973156?v=4" width="110px;"/><br /><sub>Charles Hamilton</sub>](https://communityclosing.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chamilton-ccn "Code") |
+| [<img src="https://avatars0.githubusercontent.com/u/1255375?v=4" width="110px;"/><br /><sub>Peter Upfold</sub>](https://peter.upfold.org.uk/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterUpfold "Code") | [<img src="https://avatars2.githubusercontent.com/u/961717?v=4" width="110px;"/><br /><sub>Jared Biel</sub>](https://github.com/jbiel)<br />[💻](https://github.com/snipe/snipe-it/commits?author=jbiel "Code") | [<img src="https://avatars1.githubusercontent.com/u/1733625?v=4" width="110px;"/><br /><sub>Dampfklon</sub>](https://github.com/dampfklon)<br />[💻](https://github.com/snipe/snipe-it/commits?author=dampfklon "Code") | [<img src="https://avatars2.githubusercontent.com/u/52973156?v=4" width="110px;"/><br /><sub>Charles Hamilton</sub>](https://communityclosing.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=chamilton-ccn "Code") | [<img src="https://avatars.githubusercontent.com/u/551789?v=4" width="110px;"/><br /><sub>Giuseppe Iannello</sub>](https://github.com/giannello)<br />[💻](https://github.com/snipe/snipe-it/commits?author=giannello "Code") | [<img src="https://avatars.githubusercontent.com/u/3691490?v=4" width="110px;"/><br /><sub>Peter Dave Hello</sub>](https://www.peterdavehello.org/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PeterDaveHello "Code") | [<img src="https://avatars.githubusercontent.com/u/6106332?v=4" width="110px;"/><br /><sub>sigmoidal</sub>](https://github.com/sigmoidal)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sigmoidal "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/2082554?v=4" width="110px;"/><br /><sub>Vincent Lainé</sub>](https://github.com/phenixdotnet)<br />[💻](https://github.com/snipe/snipe-it/commits?author=phenixdotnet "Code") | [<img src="https://avatars.githubusercontent.com/u/1943040?v=4" width="110px;"/><br /><sub>Lucas Pleß</sub>](http://www.lucas-pless.com)<br />[💻](https://github.com/snipe/snipe-it/commits?author=derlucas "Code") | [<img src="https://avatars.githubusercontent.com/u/472804?v=4" width="110px;"/><br /><sub>Ian Littman</sub>](http://twitter.com/iansltx)<br />[💻](https://github.com/snipe/snipe-it/commits?author=iansltx "Code") | [<img src="https://avatars.githubusercontent.com/u/3519029?v=4" width="110px;"/><br /><sub>João Paulo</sub>](https://github.com/PauloLuna)<br />[💻](https://github.com/snipe/snipe-it/commits?author=PauloLuna "Code") | [<img src="https://avatars.githubusercontent.com/u/70443365?v=4" width="110px;"/><br /><sub>ThoBur</sub>](https://github.com/ThoBur)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ThoBur "Code") | [<img src="https://avatars.githubusercontent.com/u/1972329?v=4" width="110px;"/><br /><sub>Alexander Chibrikin</sub>](http://phpprofi.ru/)<br />[💻](https://github.com/snipe/snipe-it/commits?author=alek13 "Code") | [<img src="https://avatars.githubusercontent.com/u/438332?v=4" width="110px;"/><br /><sub>Anthony Winstanley</sub>](https://github.com/winstan)<br />[💻](https://github.com/snipe/snipe-it/commits?author=winstan "Code") |
+| [<img src="https://avatars.githubusercontent.com/u/3075214?v=4" width="110px;"/><br /><sub>Folke</sub>](https://github.com/fashberg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=fashberg "Code") | [<img src="https://avatars.githubusercontent.com/u/1351571?v=4" width="110px;"/><br /><sub>Bennett Blodinger</sub>](https://github.com/benwa)<br />[💻](https://github.com/snipe/snipe-it/commits?author=benwa "Code") | [<img src="https://avatars.githubusercontent.com/u/2974631?v=4" width="110px;"/><br /><sub>NMC</sub>](https://nmc.dev)<br />[💻](https://github.com/snipe/snipe-it/commits?author=ncareau "Code") | [<img src="https://avatars.githubusercontent.com/u/52182449?v=4" width="110px;"/><br /><sub>andres-baller</sub>](https://github.com/andres-baller)<br />[💻](https://github.com/snipe/snipe-it/commits?author=andres-baller "Code") | [<img src="https://avatars.githubusercontent.com/u/67109348?v=4" width="110px;"/><br /><sub>sean-borg</sub>](https://github.com/sean-borg)<br />[💻](https://github.com/snipe/snipe-it/commits?author=sean-borg "Code") | [<img src="https://avatars.githubusercontent.com/u/32170051?v=4" width="110px;"/><br /><sub>EDVLeer</sub>](https://github.com/EDVLeer)<br />[💻](https://github.com/snipe/snipe-it/commits?author=EDVLeer "Code") | [<img src="https://avatars.githubusercontent.com/u/23075196?v=4" width="110px;"/><br /><sub>Kurokat</sub>](https://github.com/Kurokat)<br />[💻](https://github.com/snipe/snipe-it/commits?author=Kurokat "Code") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->
 
 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!

app/Exceptions/Handler.php

@@ -25,6 +25,7 @@ class Handler extends ExceptionHandler
         \Illuminate\Session\TokenMismatchException::class,
         \Illuminate\Validation\ValidationException::class,
         \Intervention\Image\Exception\NotSupportedException::class,
+        \League\OAuth2\Server\Exception\OAuthServerException::class,
     ];
 
     /**

app/Helpers/Helper.php

@@ -428,6 +428,26 @@ class Helper
         return $statuslabel_list;
     }
 
+    /**
+     * Get the list of deployable status labels in an array to make a dropdown menu
+     *
+     * @todo This should probably be a selectlist, same as the other endpoints
+     * and we should probably add to the API controllers to make sure that
+     * the status_id submitted is actually really deployable.
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since [v5.1.0]
+     * @return Array
+     */
+    public static function deployableStatusLabelList()
+    {
+        $statuslabel_list =  Statuslabel::where('deployable', '=', '1')->orderBy('default_label', 'desc')
+                ->orderBy('name','asc')
+                ->orderBy('deployable','desc')
+                ->pluck('name', 'id')->toArray();
+        return $statuslabel_list;
+    }
+
     /**
      * Get the list of status label types in an array to make a dropdown menu
      *

app/Http/Controllers/Api/AssetModelsController.php

@@ -30,7 +30,20 @@ class AssetModelsController extends Controller
     public function index(Request $request)
     {
         $this->authorize('view', AssetModel::class);
-        $allowed_columns = ['id','image','name','model_number','eol','notes','created_at','manufacturer','requestable', 'assets_count'];
+        $allowed_columns =
+            [
+                'id',
+                'image',
+                'name',
+                'model_number',
+                'eol',
+                'notes',
+                'created_at',
+                'manufacturer',
+                'requestable',
+                'assets_count',
+                'category'
+            ];
 
         $assetmodels = AssetModel::select([
             'models.id',
@@ -75,16 +88,16 @@ class AssetModelsController extends Controller
             case 'manufacturer':
                 $assetmodels->OrderManufacturer($order);
                 break;
+            case 'category':
+                $assetmodels->OrderCategory($order);
+                break;
             default:
                 $assetmodels->orderBy($sort, $order);
                 break;
         }
 
-
-
-        $total = $assetmodels->count();
         $assetmodels = $assetmodels->skip($offset)->take($limit)->get();
-        return (new AssetModelsTransformer)->transformAssetModels($assetmodels, $total);
+        return (new AssetModelsTransformer)->transformAssetModels($assetmodels, $assetmodels->count());
     }
 
 
@@ -239,17 +252,17 @@ class AssetModelsController extends Controller
             $assetmodel->use_text = '';
 
             if ($settings->modellistCheckedValue('category')) {
-                $assetmodel->use_text .= (($assetmodel->category) ? e($assetmodel->category->name).' - ' : '');
+                $assetmodel->use_text .= (($assetmodel->category) ? $assetmodel->category->name.' - ' : '');
             }
 
             if ($settings->modellistCheckedValue('manufacturer')) {
-                $assetmodel->use_text .= (($assetmodel->manufacturer) ? e($assetmodel->manufacturer->name).' ' : '');
+                $assetmodel->use_text .= (($assetmodel->manufacturer) ? $assetmodel->manufacturer->name.' ' : '');
             }
 
-            $assetmodel->use_text .=  e($assetmodel->name);
+            $assetmodel->use_text .=  $assetmodel->name;
 
             if (($settings->modellistCheckedValue('model_number')) && ($assetmodel->model_number!='')) {
-                $assetmodel->use_text .=  ' (#'.e($assetmodel->model_number).')';
+                $assetmodel->use_text .=  ' (#'.$assetmodel->model_number.')';
             }
 
             $assetmodel->use_image = ($settings->modellistCheckedValue('image') && ($assetmodel->image)) ? Storage::disk('public')->url('models/'.e($assetmodel->image)) : null;

app/Http/Controllers/Api/AssetsController.php

@@ -141,8 +141,6 @@ class AssetsController extends Controller
         }
 
         $request->filled('order_number') ? $assets = $assets->where('assets.order_number', '=', e($request->get('order_number'))) : '';
-        $offset = (($assets) && (request('offset') > $assets->count())) ? 0 : request('offset', 0);
-
 
         // Set the offset to the API call's offset, unless the offset is higher than the actual count of items in which
         // case we override with the actual count, so we should return 0 items.
@@ -812,7 +810,7 @@ class AssetsController extends Controller
                 $asset->location_id = $request->input('location_id');
             }
 
-            $asset->last_audit_date = date('Y-m-d h:i:s');
+            $asset->last_audit_date = date('Y-m-d H:i:s');
 
             if ($asset->save()) {
                 $log = $asset->logAudit(request('note'),request('location_id'));

app/Http/Controllers/Api/DepreciationsController.php

@@ -20,7 +20,7 @@ class DepreciationsController extends Controller
     public function index(Request $request)
     {
         $this->authorize('view', Depreciation::class);
-        $allowed_columns = ['id','name','created_at'];
+        $allowed_columns = ['id','name','months','created_at'];
 
         $depreciations = Depreciation::select('id','name','months','user_id','created_at','updated_at');
 

app/Http/Controllers/Api/LicensesController.php

@@ -103,11 +103,33 @@ class LicensesController extends Controller
             case 'category':
                 $licenses = $licenses->leftJoin('categories', 'licenses.category_id', '=', 'categories.id')->orderBy('categories.name', $order);
                 break;
+            case 'depreciation':
+                $licenses = $licenses->leftJoin('depreciations', 'licenses.depreciation_id', '=', 'depreciations.id')->orderBy('depreciations.name', $order);
+                break;
             case 'company':
                 $licenses = $licenses->leftJoin('companies', 'licenses.company_id', '=', 'companies.id')->orderBy('companies.name', $order);
                 break;
             default:
-                $allowed_columns = ['id','name','purchase_cost','expiration_date','purchase_order','order_number','notes','purchase_date','serial','company','category','license_name','license_email','free_seats_count','seats'];
+                $allowed_columns =
+                    [
+                        'id',
+                        'name',
+                        'purchase_cost',
+                        'expiration_date',
+                        'purchase_order',
+                        'order_number',
+                        'notes',
+                        'purchase_date',
+                        'serial',
+                        'company',
+                        'category',
+                        'license_name',
+                        'license_email',
+                        'free_seats_count',
+                        'seats',
+                        'termination_date',
+                        'depreciation_id'
+                    ];
                 $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'created_at';
                 $licenses = $licenses->orderBy($sort, $order);
                 break;

app/Http/Controllers/Api/UsersController.php

@@ -185,16 +185,16 @@ class UsersController extends Controller
         foreach ($users as $user) {
             $name_str = '';
             if ($user->last_name!='') {
-                $name_str .= e($user->last_name).', ';
+                $name_str .= $user->last_name.', ';
             }
-            $name_str .= e($user->first_name);
+            $name_str .= $user->first_name;
 
             if ($user->username!='') {
-                $name_str .= ' ('.e($user->username).')';
+                $name_str .= ' ('.$user->username.')';
             }
 
             if ($user->employee_num!='') {
-                $name_str .= ' - #'.e($user->employee_num);
+                $name_str .= ' - #'.$user->employee_num;
             }
 
             $user->use_text = $name_str;

app/Http/Controllers/Assets/AssetCheckoutController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Assets;
 
 
 use App\Exceptions\CheckoutNotAllowed;
+use App\Helpers\Helper;
 use App\Http\Controllers\CheckInOutRequest;
 use App\Http\Controllers\Controller;
 use App\Http\Requests\AssetCheckoutRequest;
@@ -33,7 +34,8 @@ class AssetCheckoutController extends Controller
         $this->authorize('checkout', $asset);
 
         if ($asset->availableForCheckout()) {
-            return view('hardware/checkout', compact('asset'));
+            return view('hardware/checkout', compact('asset'))
+                ->with('statusLabel_list', Helper::deployableStatusLabelList());
         }
         return redirect()->route('hardware.index')->with('error', trans('admin/hardware/message.checkout.not_available'));
 
@@ -75,6 +77,10 @@ class AssetCheckoutController extends Controller
                 $expected_checkin = $request->get('expected_checkin');
             }
 
+            if ($request->filled('status_id')) {
+                $asset->status_id = $request->get('status_id');
+            }
+
             if ($asset->checkOut($target, $admin, $checkout_at, $expected_checkin, e($request->get('note')), $request->get('name'))) {
                 return redirect()->route("hardware.index")->with('success', trans('admin/hardware/message.checkout.success'));
             }

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 {
@@ -189,8 +206,8 @@ class LoginController extends Controller
             return redirect()->back()->withInput()->withErrors($validator);
         }
 
-        $this->maxLoginAttempts = config('auth.throttle.max_attempts');
-        $this->lockoutTime = config('auth.throttle.lockout_duration');
+        $this->maxLoginAttempts = config('auth.passwords.users.throttle.max_attempts');
+        $this->lockoutTime = config('auth.passwords.users.throttle.lockout_duration');
 
         if ($lockedOut = $this->hasTooManyLoginAttempts($request)) {
             $this->fireLockoutEvent($request);
@@ -452,8 +469,8 @@ class LoginController extends Controller
      */
     protected function hasTooManyLoginAttempts(Request $request)
     {
-        $lockoutTime = config('auth.throttle.lockout_duration');
-        $maxLoginAttempts = config('auth.throttle.max_attempts');
+        $lockoutTime = config('auth.passwords.users.throttle.lockout_duration');
+        $maxLoginAttempts = config('auth.passwords.users.throttle.max_attempts');
 
         return $this->limiter()->tooManyAttempts(
             $this->throttleKey($request),

app/Http/Controllers/HealthController.php

@@ -0,0 +1,23 @@
+<?php
+namespace App\Http\Controllers;
+
+use Illuminate\Routing\Controller as BaseController;
+
+
+/**
+ * This controller provide the healthz route  for
+ * the Snipe-IT Asset Management application.
+ *
+ * @version    v1.0
+ */
+class HealthController extends BaseController
+{
+    /**
+     * Returns a fixed JSON content ({ "status": "ok"}) which indicate the app is up and running
+     */
+    public function get() {
+        return response()->json([
+            "status" => "ok"
+        ]);
+    }
+}

app/Http/Controllers/ReportsController.php

@@ -632,6 +632,14 @@ class ReportsController extends Controller
             if (($request->filled('expected_checkin_start')) && ($request->filled('expected_checkin_end'))) {
                 $assets->whereBetween('assets.expected_checkin', [$request->input('expected_checkin_start'), $request->input('expected_checkin_end')]);
             }
+
+            if (($request->filled('last_audit_start')) && ($request->filled('last_audit_end'))) {
+                $assets->whereBetween('assets.last_audit_date', [$request->input('last_audit_start'), $request->input('last_audit_end')]);
+            }
+
+            if (($request->filled('next_audit_start')) && ($request->filled('next_audit_end'))) {
+                $assets->whereBetween('assets.next_audit_date', [$request->input('next_audit_start'), $request->input('next_audit_end')]);
+            }
             
             $assets->orderBy('assets.created_at', 'ASC')->chunk(20, function($assets) use($handle, $customfields, $request) {
 

app/Http/Controllers/SettingsController.php

@@ -1142,6 +1142,7 @@ class SettingsController extends Controller
      */
     public function getPurge()
     {
+        \Log::warning('User ID '.Auth::user()->id.' is attempting a PURGE');
         return view('settings.purge-form');
     }
 
@@ -1158,6 +1159,8 @@ class SettingsController extends Controller
     {
         if (! config('app.lock_passwords')) {
             if ('DELETE' == $request->input('confirm_purge')) {
+
+                \Log::warning('User ID '.Auth::user()->id.' initiated a PURGE!');
                 // Run a backup immediately before processing
                 Artisan::call('backup:run');
                 Artisan::call('snipeit:purge', ['--force' => 'true', '--no-interaction' => true]);

app/Http/Controllers/Users/LDAPImportController.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\Controller;
 use App\Services\LdapAd;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
+use App\Models\User; // Note that this is awful close to 'Users' the namespace above; be careful
 
 class LDAPImportController extends Controller
 {
@@ -65,6 +66,7 @@ class LDAPImportController extends Controller
      */
     public function store(Request $request)
     {
+        $this->authorize('update', User::class);
         // Call Artisan LDAP import command.
         $location_id = $request->input('location_id');
         Artisan::call('snipeit:ldap-sync', ['--location_id' => $location_id, '--json_summary' => true]);

app/Http/Controllers/Users/UserFilesController.php

@@ -38,7 +38,7 @@ class UserFilesController extends Controller
                 $filename = 'user-' . $user->id . '-' . str_random(8);
                 $filename .= '-' . str_slug($file->getClientOriginalName()) . '.' . $extension;
                 if (!$file->move($destinationPath, $filename)) {
-                    return JsonResponse::create(["error" => "Unabled to move file"], 500);
+                    return redirect()->back()->with('error', trans('admin/users/message.upload.invalidfiles'));
                 }
                 //Log the uploaded file to the log
                 $logAction = new Actionlog();
@@ -57,10 +57,10 @@ class UserFilesController extends Controller
                 }
                 $logActions[] = $logAction;
             }
-//            dd($logActions);
-            return JsonResponse::create($logActions);
+            // dd($logActions);
+            return redirect()->back()->with('success', trans('admin/users/message.upload.success'));
         }
-        return JsonResponse::create(["error" => "No User associated with this request"], 500);
+        return redirect()->back()->with('error', trans('admin/users/message.upload.nofiles'));
 
     }
 

app/Http/Kernel.php

@@ -14,6 +14,7 @@ class Kernel extends HttpKernel
      * @var array
      */
     protected $middleware = [
+        \App\Http\Middleware\NoSessionStore::class,
         \Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
         \Illuminate\Session\Middleware\StartSession::class,
         \Illuminate\View\Middleware\ShareErrorsFromSession::class,

app/Http/Middleware/CheckForSetup.php

@@ -27,7 +27,7 @@ class CheckForSetup
             }
 
         } else {
-            if (!($request->is('setup*')) && !($request->is('.env'))) {
+            if (!($request->is('setup*')) && !($request->is('.env')) && !($request->is('health'))) {
                 return redirect(url('/').'/setup');
             }
 

app/Http/Middleware/NoSessionStore.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+
+class NoSessionStore
+{
+    protected $except = [
+        'health'
+    ];
+
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request $request
+     * @param  \Closure $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        foreach ($this->except as $except) {
+            if ($request->is($except)) {
+                config()->set('session.driver', 'array');
+            }
+        }
+        return $next($request);
+    }
+}

app/Http/Middleware/VerifyCsrfToken.php

@@ -12,5 +12,6 @@ class VerifyCsrfToken extends BaseVerifier
      * @var array
      */
     protected $except = [
+        'health'
     ];
 }

app/Http/Transformers/LicensesTransformer.php

@@ -29,6 +29,8 @@ class LicensesTransformer
             'order_number' => e($license->order_number),
             'purchase_order' => e($license->purchase_order),
             'purchase_date' => Helper::getFormattedDateObject($license->purchase_date, 'date'),
+            'termination_date' => Helper::getFormattedDateObject($license->termination_date, 'date'),
+            'depreciation' => ($license->depreciation) ? ['id' => (int) $license->depreciation->id,'name'=> e($license->depreciation->name)] : null,
             'purchase_cost' => e($license->purchase_cost),
             'notes' => e($license->notes),
             'expiration_date' => Helper::getFormattedDateObject($license->expiration_date, 'date'),

app/Http/Transformers/SelectlistTransformer.php

@@ -25,15 +25,15 @@ class SelectlistTransformer
         foreach ($select_items as $select_item) {
             $items_array[]= [
                 'id' => (int) $select_item->id,
-                'text' => ($select_item->use_text) ? e($select_item->use_text) : e($select_item->name),
-                'image' => ($select_item->use_image) ?  e($select_item->use_image) : null,
+                'text' => ($select_item->use_text) ? $select_item->use_text : $select_item->name,
+                'image' => ($select_item->use_image) ?  $select_item->use_image : null,
 
             ];
 
         }
 
         $results = [
-            'items' => $items_array,
+            'results' => $items_array,
             'pagination' =>
                 [
                     'more' => ($select_items->currentPage() >= $select_items->lastPage()) ? false : true,

app/Importer/UserImporter.php

@@ -125,7 +125,10 @@ class UserImporter extends ItemImporter
         if ($department) {
             $this->log('A matching department ' . $department_name . ' already exists');
             return $department->id;
+        } else {
+            return null;
         }
+
         $department = new department();
         $department->name = $department_name;
         $department->user_id = $this->user_id;
@@ -134,7 +137,8 @@ class UserImporter extends ItemImporter
             $this->log('department ' . $department_name . ' was created');
             return $department->id;
         }
-        $this->logError($department, 'Company');
+
+        $this->logError($department, 'Department');
         return null;
     }
 

app/Models/Asset.php

@@ -246,13 +246,18 @@ class Asset extends Depreciable
      */
     public function availableForCheckout()
     {
-        if (
-        ((!$this->assignedTo) && ($this->assetstatus->archived == 0)) ||
-            ((empty($this->assigned_to)) &&
-            (empty($this->deleted_at)) &&
-            (($this->assetstatus)  && ($this->assetstatus->deployable == 1))))
-        {
-            return true;
+
+        // This asset is not currently assigned to anyone and is not deleted...
+        if ((!$this->assigned_to) && (!$this->deleted_at)) {
+
+            // The asset status is not archived and is deployable
+            if (($this->assetstatus) && ($this->assetstatus->archived == '0')
+                && ($this->assetstatus->deployable == '1'))
+            {
+
+                return true;
+            }
+
         }
         return false;
     }

app/Models/CustomField.php

@@ -287,7 +287,10 @@ class CustomField extends Model
     {
         $arr = preg_split("/\\r\\n|\\r|\\n/", $this->field_values);
 
-        $result[''] = 'Select '.strtolower($this->format);
+        if (($this->element!='checkbox') && ($this->element!='radio')) {
+            $result[''] = 'Select '.strtolower($this->format);
+        }
+
 
         for ($x = 0; $x < count($arr); $x++) {
             $arr_parts = explode('|', $arr[$x]);

app/Models/License.php

@@ -108,6 +108,7 @@ class License extends Depreciable
       'manufacturer' => ['name'],
       'company'      => ['name'],
       'category'     => ['name'],
+      'depreciation' => ['name'],
     ];
 
     /**

app/Policies/PredefinedKitPolicy.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace App\Policies;
+
+class PredefinedKitPolicy extends SnipePermissionsPolicy
+{
+    protected function columnName()
+    {
+        return 'kits';
+    }
+}

app/Presenters/AssetModelPresenter.php

@@ -8,7 +8,129 @@ namespace App\Presenters;
  */
 class AssetModelPresenter extends Presenter
 {
-    
+    public static function dataTableLayout() {
+
+        $layout = [
+            [
+                "field" => "checkbox",
+                "checkbox" => true
+            ],
+            [
+                "field" => "id",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.id'),
+                "visible" => false
+            ], [
+                "field" => "company",
+                "searchable" => true,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('admin/companies/table.title'),
+                "visible" => false,
+                "formatter" => "companiesLinkObjFormatter"
+            ], [
+                "field" => "name",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => true,
+                "title" => trans('general.name'),
+                "formatter" => "modelsLinkFormatter"
+            ],
+            [
+                "field" => "image",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.image'),
+                "visible" => true,
+                "formatter" => 'imageFormatter',
+            ],
+            [
+                "field" => "manufacturer",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.manufacturer'),
+                "visible" => false,
+                "formatter" => 'manufacturersLinkObjFormatter',
+            ],
+            [
+                "field" => "model_number",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('admin/models/table.modelnumber'),
+                "visible" => true,
+            ],
+            [
+                "field" => "assets_count",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('admin/models/table.numassets'),
+                "visible" => true,
+            ],
+            [
+                "field" => "depreciation",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.depreciation'),
+                "visible" => false,
+                "formatter" => "depreciationsLinkObjFormatter",
+            ],
+            [
+                "field" => "category",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.category'),
+                "visible" => false,
+                "formatter" => "categoriesLinkObjFormatter",
+            ],
+            [
+                "field" => "eol",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.eol'),
+                "visible" => true,
+            ],
+            [
+                "field" => "fieldset",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('admin/models/general.fieldset'),
+                "visible" => true,
+                "formatter" => "fieldsetsLinkObjFormatter",
+            ],
+            [
+                "field" => "notes",
+                "searchable" => true,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.notes'),
+                "visible" => false,
+            ],
+        ];
+
+
+        $layout[] = [
+            "field" => "actions",
+            "searchable" => false,
+            "sortable" => false,
+            "switchable" => false,
+            "title" => trans('table.actions'),
+            "formatter" => "licensesActionsFormatter",
+        ];
+
+
+        return json_encode($layout);
+
+    }
     /**
      * Formatted note for this model
      * @return string

app/Presenters/DepreciationPresenter.php

@@ -8,5 +8,49 @@ namespace App\Presenters;
  */
 class DepreciationPresenter extends Presenter
 {
+    /**
+     * Json Column Layout for bootstrap table
+     * @return string
+     */
+    public static function dataTableLayout()
+    {
+        $layout = [
+            [
+                "field" => "id",
+                "searchable" => false,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('general.id'),
+                "visible" => false
+            ], [
+                "field" => "name",
+                "searchable" => true,
+                "sortable" => true,
+                "title" => trans('general.name'),
+                "visible" => true,
+                "formatter" => 'depreciationsLinkFormatter',
+            ],
+
+            [
+                "field" => "months",
+                "searchable" => true,
+                "sortable" => true,
+                "title" =>  trans('admin/depreciations/table.term'),
+                "visible" => true,
+            ],
+
+            [
+                "field" => "actions",
+                "searchable" => false,
+                "sortable" => false,
+                "switchable" => false,
+                "title" => trans('table.actions'),
+                "visible" => true,
+                "formatter" => "depreciationsActionsFormatter",
+            ]
+        ];
+
+        return json_encode($layout);
+    }
 
 }

app/Presenters/LicensePresenter.php

@@ -97,7 +97,26 @@ class LicensePresenter extends Presenter
                 "visible" => false,
                 "title" => trans('general.purchase_date'),
                 'formatter' => 'dateDisplayFormatter'
-            ], [
+            ],
+            [
+                "field" => "termination_date",
+                "searchable" => true,
+                "sortable" => true,
+                "visible" => false,
+                "title" => trans('admin/licenses/form.termination_date'),
+                'formatter' => 'dateDisplayFormatter'
+            ],
+            [
+                "field" => "depreciation",
+                "searchable" => true,
+                "sortable" => true,
+                "switchable" => true,
+                "title" => trans('admin/hardware/form.depreciation'),
+                "visible" => false,
+                "formatter" => "depreciationsLinkObjFormatter",
+            ],
+
+            [
                 "field" => "maintained",
                 "searchable" => false,
                 "sortable" => true,

app/Providers/AuthServiceProvider.php

@@ -16,6 +16,7 @@ use App\Models\Depreciation;
 use App\Models\License;
 use App\Models\Location;
 use App\Models\Manufacturer;
+use App\Models\PredefinedKit;
 use App\Models\Statuslabel;
 use App\Models\Supplier;
 use App\Models\User;
@@ -33,6 +34,7 @@ use App\Policies\DepreciationPolicy;
 use App\Policies\LicensePolicy;
 use App\Policies\LocationPolicy;
 use App\Policies\ManufacturerPolicy;
+use App\Policies\PredefinedKitPolicy;
 use App\Policies\StatuslabelPolicy;
 use App\Policies\SupplierPolicy;
 use App\Policies\UserPolicy;
@@ -63,6 +65,7 @@ class AuthServiceProvider extends ServiceProvider
         Depreciation::class => DepreciationPolicy::class,
         License::class => LicensePolicy::class,
         Location::class => LocationPolicy::class,
+        PredefinedKit::class => PredefinedKitPolicy::class,
         Statuslabel::class => StatuslabelPolicy::class,
         Supplier::class => SupplierPolicy::class,
         User::class => UserPolicy::class,

composer.json

@@ -11,7 +11,7 @@
   "license": "AGPL-3.0-or-later",
   "type": "project",
   "require": {
-    "php": "^7.2",
+    "php": "^7.2.5",
     "ext-curl": "*",
     "ext-fileinfo": "*",
     "ext-json": "*",
@@ -34,9 +34,9 @@
     "guzzlehttp/guzzle": "^6.5",
     "intervention/image": "^2.5",
     "javiereguiluz/easyslugger": "^1.0",
-    "laravel/framework": "^6.0",
+    "laravel/framework": "^6.20",
     "laravel/helpers": "^1.2",
-    "laravel/passport": "^8.4",
+    "laravel/passport": "^9.3.2",
     "laravel/slack-notification-channel": "^2.0",
     "laravel/tinker": "^2.4",
     "laravelcollective/html": "^6.0",
@@ -110,7 +110,7 @@
     "optimize-autoloader": true,
     "process-timeout": 3000,
     "platform": {
-      "php": "7.2"
+      "php": "7.2.5"
     }
   }
-}
+}

config/app.php

@@ -279,7 +279,7 @@ return [
     |
     */
 
-    'min_php' => '7.1.3',
+    'min_php' => '7.2.5',
 
 
     /*

config/auth.php

@@ -103,7 +103,10 @@ return [
             'email' => 'auth.emails.password',
             'table' => 'password_resets',
             'expire' => env('RESET_PASSWORD_LINK_EXPIRES', 900),
-            'throttle' => env('LOGIN_MAX_ATTEMPTS', 60),
+            'throttle' => [
+                'max_attempts' => env('LOGIN_MAX_ATTEMPTS', 5),
+                'lockout_duration' => env('LOGIN_LOCKOUT_DURATION', 60)
+            ],
         ],
     ],
 

config/version.php

@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.0.12',
-  'full_app_version' => 'v5.0.12 - build 5705-gf1d0d1bfe',
-  'build_version' => '5705',
+  'app_version' => 'v5.1.0',
+  'full_app_version' => 'v5.1.0 - build 5772-g124343911',
+  'build_version' => '5772',
   'prerelease_version' => '',
-  'hash_version' => 'gf1d0d1bfe',
-  'full_hash' => 'v5.0.12-8-gf1d0d1bfe',
+  'hash_version' => 'g124343911',
+  'full_hash' => 'v5.1.0-46-g124343911',
   'branch' => 'master',
 );

database/migrations/2020_12_18_090026_swap_target_type_index_order.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class SwapTargetTypeIndexOrder extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('action_logs', function (Blueprint $table) {
+            $table->dropIndex(['target_id', 'target_type']);
+        });
+
+        Schema::table('action_logs', function (Blueprint $table) {
+            $table->index(['target_type', 'target_id']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('action_logs', function (Blueprint $table) {
+            $table->dropIndex(['target_type', 'target_id']);
+        });
+
+        Schema::table('action_logs', function (Blueprint $table) {
+            $table->index(['target_id', 'target_type']);
+        });
+    }
+}

database/migrations/2020_12_21_210105_fix_bad_ldap_server_url_for_v5.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class FixBadLdapServerUrlForV5 extends Migration
+{
+    /**
+     * Under v4 and previous versions of Snipe-IT, we permitted users to incorrectly specify LDAP URL's in their settings, and Snipe-IT 
+     * would silently permit that.
+     * 
+     * v5's LDAP system is not so lenient, and requires either ldap:// or ldaps:// in front of the server's URL. This migration tries
+     * to find misconfigured LDAP URL's and prepend 'ldap://' to them. (That's what we assumed if we *didn't* see ldaps://)
+     */
+    
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        // UPDATE settings SET ldap_server = CONCAT('ldap://',ldap_server) WHERE ldap_server NOT LIKE 'ldap://%' AND ldap_server NOT LIKE 'ldaps://%'
+        $settings = App\Models\Setting::where("ldap_server","not like","ldap://%")->where("ldap_server","not like","ldaps://%");
+        foreach($settings->get() AS $setting) { // we don't formally support having multiple settings records, but just in case they come up...
+            $setting->ldap_server = "ldap://".$setting->ldap_server;
+            $setting->save();
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // Since previous versions supported ldap:// URL's just fine, we don't need to migrate these changes back out on rollback.
+    }
+}

public/css/build/signature-pad.min.css

@@ -0,0 +1 @@
+

public/css/dist/skins/skin-black.css

@@ -1,176 +1 @@
-/*
- * Skin: Black
- * ----------
- */
-.skin-black .main-header .navbar {
-  background-color: #111;
-}
-.skin-black .main-header .navbar .nav > li > a {
-  color: #fff;
-}
-.skin-black .main-header .navbar .nav > li > a:hover,
-.skin-black .main-header .navbar .nav > li > a:active,
-.skin-black .main-header .navbar .nav > li > a:focus,
-.skin-black .main-header .navbar .nav .open > a,
-.skin-black .main-header .navbar .nav .open > a:hover,
-.skin-black .main-header .navbar .nav .open > a:focus,
-.skin-black .main-header .navbar .nav > .active > a {
-  background: rgba(0, 0, 0, 0.1);
-  color: #f6f6f6;
-}
-.skin-black .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-black .main-header .navbar .sidebar-toggle:hover {
-  color: #f6f6f6;
-  background: rgba(0, 0, 0, 0.1);
-}
-.skin-black .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-black .main-header .navbar .sidebar-toggle:hover {
-  background-color: #040404;
-}
-@media (max-width: 767px) {
-  .skin-black .main-header .navbar .dropdown-menu li.divider {
-    background-color: rgba(255, 255, 255, 0.1);
-  }
-  .skin-black .main-header .navbar .dropdown-menu li a {
-    color: #fff;
-  }
-  .skin-black .main-header .navbar .dropdown-menu li a:hover {
-    background: #040404;
-  }
-}
-.skin-black .main-header li.user-header {
-  background-color: #111;
-}
-.skin-black .content-header {
-  background: transparent;
-}
-.skin-black .wrapper,
-.skin-black .main-sidebar,
-.skin-black .left-side {
-  background-color: #222d32;
-}
-.skin-black .user-panel > .info,
-.skin-black .user-panel > .info > a {
-  color: #fff;
-}
-.skin-black .sidebar-menu > li.header {
-  color: #4b646f;
-  background: #1a2226;
-}
-.skin-black .sidebar-menu > li > a {
-  border-left: 3px solid transparent;
-}
-.skin-black .sidebar-menu > li:hover > a,
-.skin-black .sidebar-menu > li.active > a {
-  color: #fff;
-  background: #1e282c;
-  border-left-color: #111;
-}
-.skin-black .sidebar-menu > li > .treeview-menu {
-  margin: 0 1px;
-  background: #2c3b41;
-}
-.skin-black .sidebar a {
-  color: #b8c7ce;
-}
-.skin-black .sidebar a:hover {
-  text-decoration: none;
-}
-.skin-black .treeview-menu > li > a {
-  color: #8aa4af;
-}
-.skin-black .treeview-menu > li.active > a,
-.skin-black .treeview-menu > li > a:hover {
-  color: #fff;
-}
-.skin-black .sidebar-form {
-  border-radius: 3px;
-  border: 1px solid #374850;
-  margin: 10px 10px;
-}
-.skin-black .sidebar-form input[type="text"],
-.skin-black .sidebar-form .btn {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  background-color: #374850;
-  border: 1px solid transparent;
-  height: 35px;
-  -webkit-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
-}
-.skin-black .sidebar-form input[type="text"] {
-  color: #666;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 2px;
-}
-.skin-black .sidebar-form input[type="text"]:focus,
-.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  background-color: #fff;
-  color: #666;
-}
-.skin-black .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  border-left-color: #fff;
-}
-.skin-black .sidebar-form .btn {
-  color: #999;
-  border-top-left-radius: 0;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-  border-bottom-left-radius: 0;
-}
-.skin-black.layout-top-nav .main-header > .logo .logo-variant {
-  background-color: none;
-}
-.btn,
-.btn:hover {
-  text-decoration: none;
-}
-.btn.btn-primary,
-.btn:hover.btn-primary,
-.btn .btn-primary:link,
-.btn:hover .btn-primary:link {
-  background-color: #505156;
-  border-color: #b5bbc8;
-  color: #fff;
-}
-.btna.btn-primary:hover,
-.btn:hovera.btn-primary:hover {
-  background-color: #111;
-  border-color: #1f1f21;
-  color: #fff;
-}
-.btn.btn-white:link,
-.btn:hover.btn-white:link {
-  color: #fff;
-}
-.btn.btn-white:hover,
-.btn:hover.btn-white:hover {
-  color: #fff;
-}
-.btn.btn-white:visited,
-.btn:hover.btn-white:visited {
-  color: #fff;
-}
-a {
-  color: #111;
-  text-decoration: underline;
-}
-a:hover {
-  color: #000000;
-}
-a:visited {
-  color: #111;
-}
-.text-primary {
-  color: #000000;
-}
-.skin-black .main-header .navbar .nav > li > a,
-.skin-black .main-header .navbar .nav > li > a {
-  text-decoration: none;
-}
+.skin-black .main-header .navbar{background-color:#111}.skin-black .main-header .navbar .nav>li>a{color:#fff}.skin-black .main-header .navbar .nav .open>a,.skin-black .main-header .navbar .nav .open>a:focus,.skin-black .main-header .navbar .nav .open>a:hover,.skin-black .main-header .navbar .nav>.active>a,.skin-black .main-header .navbar .nav>li>a:active,.skin-black .main-header .navbar .nav>li>a:focus,.skin-black .main-header .navbar .nav>li>a:hover,.skin-black .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-black .main-header .navbar .sidebar-toggle{color:#fff}.skin-black .main-header .navbar .sidebar-toggle:hover{background-color:#040404}@media (max-width:767px){.skin-black .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-black .main-header .navbar .dropdown-menu li a{color:#fff}.skin-black .main-header .navbar .dropdown-menu li a:hover{background:#040404}}.skin-black .main-header li.user-header{background-color:#111}.skin-black .content-header{background:transparent}.skin-black .left-side,.skin-black .main-sidebar,.skin-black .wrapper{background-color:#222d32}.skin-black .user-panel>.info,.skin-black .user-panel>.info>a{color:#fff}.skin-black .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-black .sidebar-menu>li>a{border-left:3px solid transparent}.skin-black .sidebar-menu>li.active>a,.skin-black .sidebar-menu>li:hover>a{color:#fff;background:#1e282c;border-left-color:#111}.skin-black .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-black .sidebar a{color:#b8c7ce}.skin-black .sidebar a:hover{text-decoration:none}.skin-black .treeview-menu>li>a{color:#8aa4af}.skin-black .treeview-menu>li.active>a,.skin-black .treeview-menu>li>a:hover{color:#fff}.skin-black .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px}.skin-black .sidebar-form .btn,.skin-black .sidebar-form input[type=text]{-webkit-box-shadow:none;box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-black .sidebar-form input[type=text]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-black .sidebar-form input[type=text]:focus,.skin-black .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-black .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-black .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-black.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn,.btn:hover{text-decoration:none}.btn.btn-primary,.btn .btn-primary:link,.btn:hover.btn-primary,.btn:hover .btn-primary:link{background-color:#505156;border-color:#b5bbc8;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#111;border-color:#1f1f21;color:#fff}.btn.btn-white:hover,.btn.btn-white:link,.btn.btn-white:visited,.btn:hover.btn-white:hover,.btn:hover.btn-white:link,.btn:hover.btn-white:visited{color:#fff}a{color:#111;text-decoration:underline}a:hover{color:#000}a:visited{color:#111}.text-primary{color:#000}.skin-black .main-header .navbar .nav>li>a{text-decoration:none}

public/css/dist/skins/skin-blue.css

@@ -1,191 +1 @@
-/*
- * Skin: Blue
- * ----------
- */
-.skin-blue .main-header .navbar {
-  background-color: #3c8dbc;
-}
-.skin-blue .main-header .navbar .nav > li > a {
-  color: #fff;
-}
-.skin-blue .main-header .navbar .nav > li > a:hover,
-.skin-blue .main-header .navbar .nav > li > a:active,
-.skin-blue .main-header .navbar .nav > li > a:focus,
-.skin-blue .main-header .navbar .nav .open > a,
-.skin-blue .main-header .navbar .nav .open > a:hover,
-.skin-blue .main-header .navbar .nav .open > a:focus,
-.skin-blue .main-header .navbar .nav > .active > a {
-  background: rgba(0, 0, 0, 0.1);
-  color: #f6f6f6;
-}
-.skin-blue .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-blue .main-header .navbar .sidebar-toggle:hover {
-  color: #f6f6f6;
-  background: rgba(0, 0, 0, 0.1);
-}
-.skin-blue .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-blue .main-header .navbar .sidebar-toggle:hover {
-  background-color: #367fa9;
-}
-@media (max-width: 767px) {
-  .skin-blue .main-header .navbar .dropdown-menu li.divider {
-    background-color: rgba(255, 255, 255, 0.1);
-  }
-  .skin-blue .main-header .navbar .dropdown-menu li a {
-    color: #fff;
-  }
-  .skin-blue .main-header .navbar .dropdown-menu li a:hover {
-    background: #367fa9;
-  }
-}
-.skin-blue .main-header li.user-header {
-  background-color: #3c8dbc;
-}
-.skin-blue .content-header {
-  background: transparent;
-}
-.skin-blue .wrapper,
-.skin-blue .main-sidebar,
-.skin-blue .left-side {
-  background-color: #222d32;
-}
-.skin-blue .user-panel > .info,
-.skin-blue .user-panel > .info > a {
-  color: #fff;
-}
-.skin-blue .sidebar-menu > li.header {
-  color: #4b646f;
-  background: #1a2226;
-}
-.skin-blue .sidebar-menu > li > a {
-  border-left: 3px solid transparent;
-}
-.skin-blue .sidebar-menu > li:hover > a,
-.skin-blue .sidebar-menu > li.active > a {
-  color: #fff;
-  background: #1e282c;
-  border-left-color: #3c8dbc;
-}
-.skin-blue .sidebar-menu > li > .treeview-menu {
-  margin: 0 1px;
-  background: #2c3b41;
-}
-.skin-blue .sidebar a {
-  color: #b8c7ce;
-}
-.skin-blue .sidebar a:hover {
-  text-decoration: none;
-}
-.skin-blue .treeview-menu > li > a {
-  color: #8aa4af;
-}
-.skin-blue .treeview-menu > li.active > a,
-.skin-blue .treeview-menu > li > a:hover {
-  color: #fff;
-}
-.skin-blue .sidebar-form {
-  border-radius: 3px;
-  border: 1px solid #374850;
-  margin: 10px 10px;
-}
-.skin-blue .sidebar-form input[type="text"],
-.skin-blue .sidebar-form .btn {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  background-color: #374850;
-  border: 1px solid transparent;
-  height: 35px;
-  -webkit-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
-}
-.skin-blue .sidebar-form input[type="text"] {
-  color: #666;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 2px;
-}
-.skin-blue .sidebar-form input[type="text"]:focus,
-.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  background-color: #fff;
-  color: #666;
-}
-.skin-blue .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  border-left-color: #fff;
-}
-.skin-blue .sidebar-form .btn {
-  color: #999;
-  border-top-left-radius: 0;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-  border-bottom-left-radius: 0;
-}
-.skin-blue.layout-top-nav .main-header > .logo .logo-variant {
-  background-color: none;
-}
-.btn.btn-primary,
-btn-sm.btn-primary,
-.btn:hover.btn-primary,
-.btn .btn-primary:link,
-btn-sm .btn-primary:link,
-.btn:hover .btn-primary:link {
-  background-color: #307095;
-  border-color: #23536f;
-  color: #fff;
-}
-.btna.btn-primary:hover,
-btn-sma.btn-primary:hover,
-.btn:hovera.btn-primary:hover {
-  background-color: #23536f;
-  border-color: #23536f;
-  color: #fff;
-}
-.btn.btn-white:link,
-btn-sm.btn-white:link,
-.btn:hover.btn-white:link {
-  background-color: #307095;
-  color: #fff;
-}
-.btn.btn-white:hover,
-btn-sm.btn-white:hover,
-.btn:hover.btn-white:hover {
-  background-color: #173648;
-  color: #fff;
-}
-.btn.btn-white:visited,
-btn-sm.btn-white:visited,
-.btn:hover.btn-white:visited {
-  background-color: #173648;
-  color: #fff;
-}
-.btn-warning,
-.btn-warning:link,
-a.btn-warning:hover,
-.btn-warning:link,
-.btn-warning:visited,
-.btn-danger,
-.btn-danger:link,
-a.btn-danger:hover,
-.btn-danger:link,
-.btn-danger:visited {
-  color: #fff;
-}
-a {
-  color: #3c8dbc;
-}
-a:hover {
-  color: #23536f;
-}
-a:visited {
-  color: #3c8dbc;
-}
-.text-primary {
-  color: #23536f;
-}
-.fixed-table-container tbody .selected td {
-  background-color: #fff8af;
-}
+.skin-blue .main-header .navbar{background-color:#3c8dbc}.skin-blue .main-header .navbar .nav>li>a{color:#fff}.skin-blue .main-header .navbar .nav .open>a,.skin-blue .main-header .navbar .nav .open>a:focus,.skin-blue .main-header .navbar .nav .open>a:hover,.skin-blue .main-header .navbar .nav>.active>a,.skin-blue .main-header .navbar .nav>li>a:active,.skin-blue .main-header .navbar .nav>li>a:focus,.skin-blue .main-header .navbar .nav>li>a:hover,.skin-blue .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-blue .main-header .navbar .sidebar-toggle{color:#fff}.skin-blue .main-header .navbar .sidebar-toggle:hover{background-color:#367fa9}@media (max-width:767px){.skin-blue .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-blue .main-header .navbar .dropdown-menu li a{color:#fff}.skin-blue .main-header .navbar .dropdown-menu li a:hover{background:#367fa9}}.skin-blue .main-header li.user-header{background-color:#3c8dbc}.skin-blue .content-header{background:transparent}.skin-blue .left-side,.skin-blue .main-sidebar,.skin-blue .wrapper{background-color:#222d32}.skin-blue .user-panel>.info,.skin-blue .user-panel>.info>a{color:#fff}.skin-blue .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-blue .sidebar-menu>li>a{border-left:3px solid transparent}.skin-blue .sidebar-menu>li.active>a,.skin-blue .sidebar-menu>li:hover>a{color:#fff;background:#1e282c;border-left-color:#3c8dbc}.skin-blue .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-blue .sidebar a{color:#b8c7ce}.skin-blue .sidebar a:hover{text-decoration:none}.skin-blue .treeview-menu>li>a{color:#8aa4af}.skin-blue .treeview-menu>li.active>a,.skin-blue .treeview-menu>li>a:hover{color:#fff}.skin-blue .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px}.skin-blue .sidebar-form .btn,.skin-blue .sidebar-form input[type=text]{-webkit-box-shadow:none;box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-blue .sidebar-form input[type=text]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-blue .sidebar-form input[type=text]:focus,.skin-blue .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-blue .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-blue .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-blue.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn.btn-primary,.btn .btn-primary:link,.btn:hover.btn-primary,.btn:hover .btn-primary:link,btn-sm.btn-primary,btn-sm .btn-primary:link{background-color:#307095;border-color:#23536f;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover,btn-sma.btn-primary:hover{background-color:#23536f;border-color:#23536f;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link,btn-sm.btn-white:link{background-color:#307095;color:#fff}.btn.btn-white:hover,.btn.btn-white:visited,.btn:hover.btn-white:hover,.btn:hover.btn-white:visited,btn-sm.btn-white:hover,btn-sm.btn-white:visited{background-color:#173648;color:#fff}.btn-danger,.btn-danger:link,.btn-danger:visited,.btn-warning,.btn-warning:link,.btn-warning:visited,a.btn-danger:hover,a.btn-warning:hover{color:#fff}a{color:#3c8dbc}a:hover{color:#23536f}a:visited{color:#3c8dbc}.text-primary{color:#23536f}.fixed-table-container tbody .selected td{background-color:#fff8af}

public/css/dist/skins/skin-contrast.css

@@ -1,220 +1 @@
-/*
- * Skin: Contrast
- * ----------
- */
-.skin-contrast .main-header .navbar {
-  background-color: #001F3F;
-}
-.skin-contrast .main-header .navbar .nav > li > a {
-  color: #fff;
-}
-.skin-contrast .main-header .navbar .nav > li > a:hover,
-.skin-contrast .main-header .navbar .nav > li > a:active,
-.skin-contrast .main-header .navbar .nav > li > a:focus,
-.skin-contrast .main-header .navbar .nav .open > a,
-.skin-contrast .main-header .navbar .nav .open > a:hover,
-.skin-contrast .main-header .navbar .nav .open > a:focus,
-.skin-contrast .main-header .navbar .nav > .active > a {
-  background: rgba(0, 0, 0, 0.1);
-  color: #f6f6f6;
-}
-.skin-contrast .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-contrast .main-header .navbar .sidebar-toggle:hover {
-  color: #f6f6f6;
-  background: rgba(0, 0, 0, 0.1);
-}
-.skin-contrast .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-contrast .main-header .navbar .sidebar-toggle:hover {
-  background-color: #001226;
-}
-@media (max-width: 767px) {
-  .skin-contrast .main-header .navbar .dropdown-menu li.divider {
-    background-color: rgba(255, 255, 255, 0.1);
-  }
-  .skin-contrast .main-header .navbar .dropdown-menu li a {
-    color: #fff;
-  }
-  .skin-contrast .main-header .navbar .dropdown-menu li a:hover {
-    background: #001226;
-  }
-}
-.skin-contrast .main-header li.user-header {
-  background-color: #001F3F;
-}
-.skin-contrast .content-header {
-  background: transparent;
-}
-.skin-contrast .wrapper,
-.skin-contrast .main-sidebar,
-.skin-contrast .left-side {
-  background-color: #222d32;
-}
-.skin-contrast .user-panel > .info,
-.skin-contrast .user-panel > .info > a {
-  color: #fff;
-}
-.skin-contrast .sidebar-menu > li.header {
-  color: #4b646f;
-  background: #1a2226;
-}
-.skin-contrast .sidebar-menu > li > a {
-  border-left: 3px solid transparent;
-}
-.skin-contrast .sidebar-menu > li:hover > a,
-.skin-contrast .sidebar-menu > li.active > a {
-  color: #fff;
-  background: #1e282c;
-  border-left-color: #001F3F;
-}
-.skin-contrast .sidebar-menu > li > .treeview-menu {
-  margin: 0 1px;
-  background: #2c3b41;
-}
-.skin-contrast .sidebar a {
-  color: #b8c7ce;
-}
-.skin-contrast .sidebar a:hover {
-  text-decoration: none;
-}
-.skin-contrast .treeview-menu > li > a {
-  color: #8aa4af;
-}
-.skin-contrast .treeview-menu > li.active > a,
-.skin-contrast .treeview-menu > li > a:hover {
-  color: #fff;
-}
-.skin-contrast .sidebar-form {
-  border-radius: 3px;
-  border: 1px solid #374850;
-  margin: 10px 10px;
-}
-.skin-contrast .sidebar-form input[type="text"],
-.skin-contrast .sidebar-form .btn {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  background-color: #374850;
-  border: 1px solid transparent;
-  height: 35px;
-  -webkit-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
-}
-.skin-contrast .sidebar-form input[type="text"] {
-  color: #666;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 2px;
-}
-.skin-contrast .sidebar-form input[type="text"]:focus,
-.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  background-color: #fff;
-  color: #666;
-}
-.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  border-left-color: #fff;
-}
-.skin-contrast .sidebar-form .btn {
-  color: #999;
-  border-top-left-radius: 0;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-  border-bottom-left-radius: 0;
-}
-.skin-contrast.layout-top-nav .main-header > .logo .logo-variant {
-  background-color: none;
-}
-.btn.btn-primary,
-.btn:hover.btn-primary,
-.btn .btn-primary:link,
-.btn:hover .btn-primary:link {
-  background-color: #00060c;
-  border-color: #000000;
-  color: #fff;
-}
-.btna.btn-primary:hover,
-.btn:hovera.btn-primary:hover {
-  background-color: #000000;
-  border-color: #000000;
-  color: #fff;
-}
-.btn.btn-white:link,
-.btn:hover.btn-white:link {
-  background-color: #00060c;
-  color: #fff;
-}
-.btn.btn-white:hover,
-.btn:hover.btn-white:hover {
-  background-color: #000000;
-  color: #fff;
-}
-a {
-  color: #001F3F;
-}
-a:hover {
-  color: #001F3F;
-  text-decoration: underline;
-}
-a:visited {
-  color: #001F3F;
-}
-a.btn:hover {
-  color: #fff;
-  text-decoration: underline;
-}
-a.btn:visited {
-  color: #fff;
-}
-.text-primary {
-  color: #000000;
-}
-.skin-contrast .treeview-menu > li > a {
-  color: #FFF;
-}
-.bg-teal {
-  background-color: #1b6a6a !important;
-}
-.bg-orange {
-  background-color: #995400 !important;
-}
-.bg-purple {
-  background-color: #3a3767 !important;
-}
-.bg-maroon {
-  background-color: #7d1038 !important;
-}
-.pagination > li > a {
-  color: #00060c !important;
-}
-.pagination > .active > a {
-  background-color: #001F3F;
-  color: #FFF!important;
-}
-btn-success {
-  background-color: #000d07;
-}
-input::-webkit-input-placeholder {
-  /* Chrome/Opera/Safari */
-  color: #b5bbc8 !important;
-}
-input::-moz-placeholder {
-  /* Firefox 19+ */
-  color: #b5bbc8 !important;
-}
-input::-ms-input-placeholder {
-  /* IE 10+ */
-  color: #b5bbc8 !important;
-}
-.select2-default,
-.select2-selection__placeholder {
-  color: #37383c !important;
-}
-.callout.callout-info {
-  background-color: #003351 !important;
-}
-.fixed-table-container tbody .selected td {
-  background-color: #fff8af;
-}
+.skin-contrast .main-header .navbar{background-color:#001f3f}.skin-contrast .main-header .navbar .nav>li>a{color:#fff}.skin-contrast .main-header .navbar .nav .open>a,.skin-contrast .main-header .navbar .nav .open>a:focus,.skin-contrast .main-header .navbar .nav .open>a:hover,.skin-contrast .main-header .navbar .nav>.active>a,.skin-contrast .main-header .navbar .nav>li>a:active,.skin-contrast .main-header .navbar .nav>li>a:focus,.skin-contrast .main-header .navbar .nav>li>a:hover,.skin-contrast .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-contrast .main-header .navbar .sidebar-toggle{color:#fff}.skin-contrast .main-header .navbar .sidebar-toggle:hover{background-color:#001226}@media (max-width:767px){.skin-contrast .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-contrast .main-header .navbar .dropdown-menu li a{color:#fff}.skin-contrast .main-header .navbar .dropdown-menu li a:hover{background:#001226}}.skin-contrast .main-header li.user-header{background-color:#001f3f}.skin-contrast .content-header{background:transparent}.skin-contrast .left-side,.skin-contrast .main-sidebar,.skin-contrast .wrapper{background-color:#222d32}.skin-contrast .user-panel>.info,.skin-contrast .user-panel>.info>a{color:#fff}.skin-contrast .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-contrast .sidebar-menu>li>a{border-left:3px solid transparent}.skin-contrast .sidebar-menu>li.active>a,.skin-contrast .sidebar-menu>li:hover>a{color:#fff;background:#1e282c;border-left-color:#001f3f}.skin-contrast .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-contrast .sidebar a{color:#b8c7ce}.skin-contrast .sidebar a:hover{text-decoration:none}.skin-contrast .treeview-menu>li>a{color:#8aa4af}.skin-contrast .treeview-menu>li.active>a,.skin-contrast .treeview-menu>li>a:hover{color:#fff}.skin-contrast .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px}.skin-contrast .sidebar-form .btn,.skin-contrast .sidebar-form input[type=text]{-webkit-box-shadow:none;box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-contrast .sidebar-form input[type=text]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-contrast .sidebar-form input[type=text]:focus,.skin-contrast .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-contrast .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-contrast .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-contrast.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn.btn-primary,.btn .btn-primary:link,.btn:hover.btn-primary,.btn:hover .btn-primary:link{background-color:#00060c;border-color:#000;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#000;border-color:#000;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#00060c;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#000;color:#fff}a,a:hover{color:#001f3f}a:hover{text-decoration:underline}a:visited{color:#001f3f}a.btn:hover{color:#fff;text-decoration:underline}a.btn:visited{color:#fff}.text-primary{color:#000}.skin-contrast .treeview-menu>li>a{color:#fff}.bg-teal{background-color:#1b6a6a!important}.bg-orange{background-color:#995400!important}.bg-purple{background-color:#3a3767!important}.bg-maroon{background-color:#7d1038!important}.pagination>li>a{color:#00060c!important}.pagination>.active>a{background-color:#001f3f;color:#fff!important}btn-success{background-color:#000d07}input::-webkit-input-placeholder{color:#b5bbc8!important}input::-moz-placeholder{color:#b5bbc8!important}input::-ms-input-placeholder{color:#b5bbc8!important}.select2-default,.select2-selection__placeholder{color:#37383c!important}.callout.callout-info{background-color:#003351!important}.fixed-table-container tbody .selected td{background-color:#fff8af}

public/css/dist/skins/skin-contrast.min.css

@@ -1,220 +1 @@
-/*
- * Skin: Contrast
- * ----------
- */
-.skin-contrast .main-header .navbar {
-  background-color: #001F3F;
-}
-.skin-contrast .main-header .navbar .nav > li > a {
-  color: #fff;
-}
-.skin-contrast .main-header .navbar .nav > li > a:hover,
-.skin-contrast .main-header .navbar .nav > li > a:active,
-.skin-contrast .main-header .navbar .nav > li > a:focus,
-.skin-contrast .main-header .navbar .nav .open > a,
-.skin-contrast .main-header .navbar .nav .open > a:hover,
-.skin-contrast .main-header .navbar .nav .open > a:focus,
-.skin-contrast .main-header .navbar .nav > .active > a {
-  background: rgba(0, 0, 0, 0.1);
-  color: #f6f6f6;
-}
-.skin-contrast .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-contrast .main-header .navbar .sidebar-toggle:hover {
-  color: #f6f6f6;
-  background: rgba(0, 0, 0, 0.1);
-}
-.skin-contrast .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-contrast .main-header .navbar .sidebar-toggle:hover {
-  background-color: #001226;
-}
-@media (max-width: 767px) {
-  .skin-contrast .main-header .navbar .dropdown-menu li.divider {
-    background-color: rgba(255, 255, 255, 0.1);
-  }
-  .skin-contrast .main-header .navbar .dropdown-menu li a {
-    color: #fff;
-  }
-  .skin-contrast .main-header .navbar .dropdown-menu li a:hover {
-    background: #001226;
-  }
-}
-.skin-contrast .main-header li.user-header {
-  background-color: #001F3F;
-}
-.skin-contrast .content-header {
-  background: transparent;
-}
-.skin-contrast .wrapper,
-.skin-contrast .main-sidebar,
-.skin-contrast .left-side {
-  background-color: #222d32;
-}
-.skin-contrast .user-panel > .info,
-.skin-contrast .user-panel > .info > a {
-  color: #fff;
-}
-.skin-contrast .sidebar-menu > li.header {
-  color: #4b646f;
-  background: #1a2226;
-}
-.skin-contrast .sidebar-menu > li > a {
-  border-left: 3px solid transparent;
-}
-.skin-contrast .sidebar-menu > li:hover > a,
-.skin-contrast .sidebar-menu > li.active > a {
-  color: #fff;
-  background: #1e282c;
-  border-left-color: #001F3F;
-}
-.skin-contrast .sidebar-menu > li > .treeview-menu {
-  margin: 0 1px;
-  background: #2c3b41;
-}
-.skin-contrast .sidebar a {
-  color: #b8c7ce;
-}
-.skin-contrast .sidebar a:hover {
-  text-decoration: none;
-}
-.skin-contrast .treeview-menu > li > a {
-  color: #8aa4af;
-}
-.skin-contrast .treeview-menu > li.active > a,
-.skin-contrast .treeview-menu > li > a:hover {
-  color: #fff;
-}
-.skin-contrast .sidebar-form {
-  border-radius: 3px;
-  border: 1px solid #374850;
-  margin: 10px 10px;
-}
-.skin-contrast .sidebar-form input[type="text"],
-.skin-contrast .sidebar-form .btn {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  background-color: #374850;
-  border: 1px solid transparent;
-  height: 35px;
-  -webkit-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
-}
-.skin-contrast .sidebar-form input[type="text"] {
-  color: #666;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 2px;
-}
-.skin-contrast .sidebar-form input[type="text"]:focus,
-.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  background-color: #fff;
-  color: #666;
-}
-.skin-contrast .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  border-left-color: #fff;
-}
-.skin-contrast .sidebar-form .btn {
-  color: #999;
-  border-top-left-radius: 0;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-  border-bottom-left-radius: 0;
-}
-.skin-contrast.layout-top-nav .main-header > .logo .logo-variant {
-  background-color: none;
-}
-.btn.btn-primary,
-.btn:hover.btn-primary,
-.btn .btn-primary:link,
-.btn:hover .btn-primary:link {
-  background-color: #00060c;
-  border-color: #000000;
-  color: #fff;
-}
-.btna.btn-primary:hover,
-.btn:hovera.btn-primary:hover {
-  background-color: #000000;
-  border-color: #000000;
-  color: #fff;
-}
-.btn.btn-white:link,
-.btn:hover.btn-white:link {
-  background-color: #00060c;
-  color: #fff;
-}
-.btn.btn-white:hover,
-.btn:hover.btn-white:hover {
-  background-color: #000000;
-  color: #fff;
-}
-a {
-  color: #001F3F;
-}
-a:hover {
-  color: #001F3F;
-  text-decoration: underline;
-}
-a:visited {
-  color: #001F3F;
-}
-a.btn:hover {
-  color: #fff;
-  text-decoration: underline;
-}
-a.btn:visited {
-  color: #fff;
-}
-.text-primary {
-  color: #000000;
-}
-.skin-contrast .treeview-menu > li > a {
-  color: #FFF;
-}
-.bg-teal {
-  background-color: #1b6a6a !important;
-}
-.bg-orange {
-  background-color: #995400 !important;
-}
-.bg-purple {
-  background-color: #3a3767 !important;
-}
-.bg-maroon {
-  background-color: #7d1038 !important;
-}
-.pagination > li > a {
-  color: #00060c !important;
-}
-.pagination > .active > a {
-  background-color: #001F3F;
-  color: #FFF!important;
-}
-btn-success {
-  background-color: #000d07;
-}
-input::-webkit-input-placeholder {
-  /* Chrome/Opera/Safari */
-  color: #b5bbc8 !important;
-}
-input::-moz-placeholder {
-  /* Firefox 19+ */
-  color: #b5bbc8 !important;
-}
-input::-ms-input-placeholder {
-  /* IE 10+ */
-  color: #b5bbc8 !important;
-}
-.select2-default,
-.select2-selection__placeholder {
-  color: #37383c !important;
-}
-.callout.callout-info {
-  background-color: #003351 !important;
-}
-.fixed-table-container tbody .selected td {
-  background-color: #fff8af;
-}
+.skin-contrast .main-header .navbar{background-color:#001f3f}.skin-contrast .main-header .navbar .nav>li>a{color:#fff}.skin-contrast .main-header .navbar .nav .open>a,.skin-contrast .main-header .navbar .nav .open>a:focus,.skin-contrast .main-header .navbar .nav .open>a:hover,.skin-contrast .main-header .navbar .nav>.active>a,.skin-contrast .main-header .navbar .nav>li>a:active,.skin-contrast .main-header .navbar .nav>li>a:focus,.skin-contrast .main-header .navbar .nav>li>a:hover,.skin-contrast .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-contrast .main-header .navbar .sidebar-toggle{color:#fff}.skin-contrast .main-header .navbar .sidebar-toggle:hover{background-color:#001226}@media (max-width:767px){.skin-contrast .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-contrast .main-header .navbar .dropdown-menu li a{color:#fff}.skin-contrast .main-header .navbar .dropdown-menu li a:hover{background:#001226}}.skin-contrast .main-header li.user-header{background-color:#001f3f}.skin-contrast .content-header{background:0 0}.skin-contrast .left-side,.skin-contrast .main-sidebar,.skin-contrast .wrapper{background-color:#222d32}.skin-contrast .user-panel>.info,.skin-contrast .user-panel>.info>a{color:#fff}.skin-contrast .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-contrast .sidebar-menu>li>a{border-left:3px solid transparent}.skin-contrast .sidebar-menu>li.active>a,.skin-contrast .sidebar-menu>li:hover>a{color:#fff;background:#1e282c;border-left-color:#001f3f}.skin-contrast .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-contrast .sidebar a{color:#b8c7ce}.skin-contrast .sidebar a:hover{text-decoration:none}.skin-contrast .treeview-menu>li>a{color:#8aa4af}.skin-contrast .treeview-menu>li.active>a,.skin-contrast .treeview-menu>li>a:hover{color:#fff}.skin-contrast .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px}.skin-contrast .sidebar-form .btn,.skin-contrast .sidebar-form input[type=text]{-webkit-box-shadow:none;box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-contrast .sidebar-form input[type=text]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-contrast .sidebar-form input[type=text]:focus,.skin-contrast .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-contrast .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-contrast .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-contrast.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-primary:link,.btn.btn-primary,.btn:hover .btn-primary:link,.btn:hover.btn-primary{background-color:#00060c;border-color:#000;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#000;border-color:#000;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#00060c;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#000;color:#fff}a,a:hover{color:#001f3f}a:hover{text-decoration:underline}a:visited{color:#001f3f}a.btn:hover{color:#fff;text-decoration:underline}a.btn:visited{color:#fff}.text-primary{color:#000}.skin-contrast .treeview-menu>li>a{color:#fff}.bg-teal{background-color:#1b6a6a!important}.bg-orange{background-color:#995400!important}.bg-purple{background-color:#3a3767!important}.bg-maroon{background-color:#7d1038!important}.pagination>li>a{color:#00060c!important}.pagination>.active>a{background-color:#001f3f;color:#fff!important}btn-success{background-color:#000d07}input::-webkit-input-placeholder{color:#b5bbc8!important}input::-moz-placeholder{color:#b5bbc8!important}input::-ms-input-placeholder{color:#b5bbc8!important}.select2-default,.select2-selection__placeholder{color:#37383c!important}.callout.callout-info{background-color:#003351!important}.fixed-table-container tbody .selected td{background-color:#fff8af}

public/css/dist/skins/skin-green.css

@@ -1,168 +1 @@
-/*
- * Skin: Green
- * ----------
- */
-.skin-green .main-header .navbar {
-  background-color: #00a65a;
-}
-.skin-green .main-header .navbar .nav > li > a {
-  color: #fff;
-}
-.skin-green .main-header .navbar .nav > li > a:hover,
-.skin-green .main-header .navbar .nav > li > a:active,
-.skin-green .main-header .navbar .nav > li > a:focus,
-.skin-green .main-header .navbar .nav .open > a,
-.skin-green .main-header .navbar .nav .open > a:hover,
-.skin-green .main-header .navbar .nav .open > a:focus,
-.skin-green .main-header .navbar .nav > .active > a {
-  background: rgba(0, 0, 0, 0.1);
-  color: #f6f6f6;
-}
-.skin-green .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-green .main-header .navbar .sidebar-toggle:hover {
-  color: #f6f6f6;
-  background: rgba(0, 0, 0, 0.1);
-}
-.skin-green .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-green .main-header .navbar .sidebar-toggle:hover {
-  background-color: #008d4c;
-}
-@media (max-width: 767px) {
-  .skin-green .main-header .navbar .dropdown-menu li.divider {
-    background-color: rgba(255, 255, 255, 0.1);
-  }
-  .skin-green .main-header .navbar .dropdown-menu li a {
-    color: #fff;
-  }
-  .skin-green .main-header .navbar .dropdown-menu li a:hover {
-    background: #008d4c;
-  }
-}
-.skin-green .main-header li.user-header {
-  background-color: #00a65a;
-}
-.skin-green .content-header {
-  background: transparent;
-}
-.skin-green .wrapper,
-.skin-green .main-sidebar,
-.skin-green .left-side {
-  background-color: #222d32;
-}
-.skin-green .user-panel > .info,
-.skin-green .user-panel > .info > a {
-  color: #fff;
-}
-.skin-green .sidebar-menu > li.header {
-  color: #4b646f;
-  background: #1a2226;
-}
-.skin-green .sidebar-menu > li > a {
-  border-left: 3px solid transparent;
-}
-.skin-green .sidebar-menu > li:hover > a,
-.skin-green .sidebar-menu > li.active > a {
-  color: #fff;
-  background: #1e282c;
-  border-left-color: #00a65a;
-}
-.skin-green .sidebar-menu > li > .treeview-menu {
-  margin: 0 1px;
-  background: #2c3b41;
-}
-.skin-green .sidebar a {
-  color: #b8c7ce;
-}
-.skin-green .sidebar a:hover {
-  text-decoration: none;
-}
-.skin-green .treeview-menu > li > a {
-  color: #8aa4af;
-}
-.skin-green .treeview-menu > li.active > a,
-.skin-green .treeview-menu > li > a:hover {
-  color: #fff;
-}
-.skin-green .sidebar-form {
-  border-radius: 3px;
-  border: 1px solid #374850;
-  margin: 10px 10px;
-}
-.skin-green .sidebar-form input[type="text"],
-.skin-green .sidebar-form .btn {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  background-color: #374850;
-  border: 1px solid transparent;
-  height: 35px;
-  -webkit-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
-}
-.skin-green .sidebar-form input[type="text"] {
-  color: #666;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 2px;
-}
-.skin-green .sidebar-form input[type="text"]:focus,
-.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  background-color: #fff;
-  color: #666;
-}
-.skin-green .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  border-left-color: #fff;
-}
-.skin-green .sidebar-form .btn {
-  color: #999;
-  border-top-left-radius: 0;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-  border-bottom-left-radius: 0;
-}
-.skin-green.layout-top-nav .main-header > .logo .logo-variant {
-  background-color: none;
-}
-.btn.btn-primary,
-.btn:hover.btn-primary,
-.btn .btn-primary:link,
-.btn:hover .btn-primary:link {
-  background-color: #00733e;
-  border-color: #004023;
-  color: #fff;
-}
-.btna.btn-primary:hover,
-.btn:hovera.btn-primary:hover {
-  background-color: #004023;
-  border-color: #004023;
-  color: #fff;
-}
-.btn.btn-white:link,
-.btn:hover.btn-white:link {
-  background-color: #00733e;
-  color: #fff;
-}
-.btn.btn-white:hover,
-.btn:hover.btn-white:hover {
-  background-color: #000d07;
-  color: #fff;
-}
-a {
-  color: #00a65a;
-}
-a:hover {
-  color: #004023;
-}
-a:visited {
-  color: #00a65a;
-}
-.text-primary {
-  color: #004023;
-}
-.fixed-table-container tbody .selected td {
-  background-color: #fff8af;
-}
+.skin-green .main-header .navbar{background-color:#00a65a}.skin-green .main-header .navbar .nav>li>a{color:#fff}.skin-green .main-header .navbar .nav .open>a,.skin-green .main-header .navbar .nav .open>a:focus,.skin-green .main-header .navbar .nav .open>a:hover,.skin-green .main-header .navbar .nav>.active>a,.skin-green .main-header .navbar .nav>li>a:active,.skin-green .main-header .navbar .nav>li>a:focus,.skin-green .main-header .navbar .nav>li>a:hover,.skin-green .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-green .main-header .navbar .sidebar-toggle{color:#fff}.skin-green .main-header .navbar .sidebar-toggle:hover{background-color:#008d4c}@media (max-width:767px){.skin-green .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-green .main-header .navbar .dropdown-menu li a{color:#fff}.skin-green .main-header .navbar .dropdown-menu li a:hover{background:#008d4c}}.skin-green .main-header li.user-header{background-color:#00a65a}.skin-green .content-header{background:transparent}.skin-green .left-side,.skin-green .main-sidebar,.skin-green .wrapper{background-color:#222d32}.skin-green .user-panel>.info,.skin-green .user-panel>.info>a{color:#fff}.skin-green .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-green .sidebar-menu>li>a{border-left:3px solid transparent}.skin-green .sidebar-menu>li.active>a,.skin-green .sidebar-menu>li:hover>a{color:#fff;background:#1e282c;border-left-color:#00a65a}.skin-green .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-green .sidebar a{color:#b8c7ce}.skin-green .sidebar a:hover{text-decoration:none}.skin-green .treeview-menu>li>a{color:#8aa4af}.skin-green .treeview-menu>li.active>a,.skin-green .treeview-menu>li>a:hover{color:#fff}.skin-green .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px}.skin-green .sidebar-form .btn,.skin-green .sidebar-form input[type=text]{-webkit-box-shadow:none;box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-green .sidebar-form input[type=text]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-green .sidebar-form input[type=text]:focus,.skin-green .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-green .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-green .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-green.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn.btn-primary,.btn .btn-primary:link,.btn:hover.btn-primary,.btn:hover .btn-primary:link{background-color:#00733e;border-color:#004023;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#004023;border-color:#004023;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#00733e;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#000d07;color:#fff}a{color:#00a65a}a:hover{color:#004023}a:visited{color:#00a65a}.text-primary{color:#004023}.fixed-table-container tbody .selected td{background-color:#fff8af}

public/css/dist/skins/skin-orange.css

@@ -1,168 +1 @@
-/*
- * Skin: Orange
- * ----------
- */
-.skin-orange .main-header .navbar {
-  background-color: #FF8C00;
-}
-.skin-orange .main-header .navbar .nav > li > a {
-  color: #fff;
-}
-.skin-orange .main-header .navbar .nav > li > a:hover,
-.skin-orange .main-header .navbar .nav > li > a:active,
-.skin-orange .main-header .navbar .nav > li > a:focus,
-.skin-orange .main-header .navbar .nav .open > a,
-.skin-orange .main-header .navbar .nav .open > a:hover,
-.skin-orange .main-header .navbar .nav .open > a:focus,
-.skin-orange .main-header .navbar .nav > .active > a {
-  background: rgba(0, 0, 0, 0.1);
-  color: #f6f6f6;
-}
-.skin-orange .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-orange .main-header .navbar .sidebar-toggle:hover {
-  color: #f6f6f6;
-  background: rgba(0, 0, 0, 0.1);
-}
-.skin-orange .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-orange .main-header .navbar .sidebar-toggle:hover {
-  background-color: #e67e00;
-}
-@media (max-width: 767px) {
-  .skin-orange .main-header .navbar .dropdown-menu li.divider {
-    background-color: rgba(255, 255, 255, 0.1);
-  }
-  .skin-orange .main-header .navbar .dropdown-menu li a {
-    color: #fff;
-  }
-  .skin-orange .main-header .navbar .dropdown-menu li a:hover {
-    background: #e67e00;
-  }
-}
-.skin-orange .main-header li.user-header {
-  background-color: #FF8C00;
-}
-.skin-orange .content-header {
-  background: transparent;
-}
-.skin-orange .wrapper,
-.skin-orange .main-sidebar,
-.skin-orange .left-side {
-  background-color: #222d32;
-}
-.skin-orange .user-panel > .info,
-.skin-orange .user-panel > .info > a {
-  color: #fff;
-}
-.skin-orange .sidebar-menu > li.header {
-  color: #4b646f;
-  background: #1a2226;
-}
-.skin-orange .sidebar-menu > li > a {
-  border-left: 3px solid transparent;
-}
-.skin-orange .sidebar-menu > li:hover > a,
-.skin-orange .sidebar-menu > li.active > a {
-  color: #fff;
-  background: #1e282c;
-  border-left-color: #FF8C00;
-}
-.skin-orange .sidebar-menu > li > .treeview-menu {
-  margin: 0 1px;
-  background: #2c3b41;
-}
-.skin-orange .sidebar a {
-  color: #b8c7ce;
-}
-.skin-orange .sidebar a:hover {
-  text-decoration: none;
-}
-.skin-orange .treeview-menu > li > a {
-  color: #8aa4af;
-}
-.skin-orange .treeview-menu > li.active > a,
-.skin-orange .treeview-menu > li > a:hover {
-  color: #fff;
-}
-.skin-orange .sidebar-form {
-  border-radius: 3px;
-  border: 1px solid #374850;
-  margin: 10px 10px;
-}
-.skin-orange .sidebar-form input[type="text"],
-.skin-orange .sidebar-form .btn {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  background-color: #374850;
-  border: 1px solid transparent;
-  height: 35px;
-  -webkit-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
-}
-.skin-orange .sidebar-form input[type="text"] {
-  color: #666;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 2px;
-}
-.skin-orange .sidebar-form input[type="text"]:focus,
-.skin-orange .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  background-color: #fff;
-  color: #666;
-}
-.skin-orange .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  border-left-color: #fff;
-}
-.skin-orange .sidebar-form .btn {
-  color: #999;
-  border-top-left-radius: 0;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-  border-bottom-left-radius: 0;
-}
-.skin-orange.layout-top-nav .main-header > .logo .logo-variant {
-  background-color: none;
-}
-.btn.btn-primary,
-.btn:hover.btn-primary,
-.btn .btn-primary:link,
-.btn:hover .btn-primary:link {
-  background-color: #cc7000;
-  border-color: #995400;
-  color: #fff;
-}
-.btna.btn-primary:hover,
-.btn:hovera.btn-primary:hover {
-  background-color: #995400;
-  border-color: #995400;
-  color: #fff;
-}
-.btn.btn-white:link,
-.btn:hover.btn-white:link {
-  background-color: #cc7000;
-  color: #fff;
-}
-.btn.btn-white:hover,
-.btn:hover.btn-white:hover {
-  background-color: #663800;
-  color: #fff;
-}
-a {
-  color: #FF8C00;
-}
-a:hover {
-  color: #995400;
-}
-a:visited {
-  color: #FF8C00;
-}
-.text-primary {
-  color: #995400;
-}
-.fixed-table-container tbody .selected td {
-  background-color: #fff8af;
-}
+.skin-orange .main-header .navbar{background-color:#ff8c00}.skin-orange .main-header .navbar .nav>li>a{color:#fff}.skin-orange .main-header .navbar .nav .open>a,.skin-orange .main-header .navbar .nav .open>a:focus,.skin-orange .main-header .navbar .nav .open>a:hover,.skin-orange .main-header .navbar .nav>.active>a,.skin-orange .main-header .navbar .nav>li>a:active,.skin-orange .main-header .navbar .nav>li>a:focus,.skin-orange .main-header .navbar .nav>li>a:hover,.skin-orange .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-orange .main-header .navbar .sidebar-toggle{color:#fff}.skin-orange .main-header .navbar .sidebar-toggle:hover{background-color:#e67e00}@media (max-width:767px){.skin-orange .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-orange .main-header .navbar .dropdown-menu li a{color:#fff}.skin-orange .main-header .navbar .dropdown-menu li a:hover{background:#e67e00}}.skin-orange .main-header li.user-header{background-color:#ff8c00}.skin-orange .content-header{background:transparent}.skin-orange .left-side,.skin-orange .main-sidebar,.skin-orange .wrapper{background-color:#222d32}.skin-orange .user-panel>.info,.skin-orange .user-panel>.info>a{color:#fff}.skin-orange .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-orange .sidebar-menu>li>a{border-left:3px solid transparent}.skin-orange .sidebar-menu>li.active>a,.skin-orange .sidebar-menu>li:hover>a{color:#fff;background:#1e282c;border-left-color:#ff8c00}.skin-orange .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-orange .sidebar a{color:#b8c7ce}.skin-orange .sidebar a:hover{text-decoration:none}.skin-orange .treeview-menu>li>a{color:#8aa4af}.skin-orange .treeview-menu>li.active>a,.skin-orange .treeview-menu>li>a:hover{color:#fff}.skin-orange .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px}.skin-orange .sidebar-form .btn,.skin-orange .sidebar-form input[type=text]{-webkit-box-shadow:none;box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-orange .sidebar-form input[type=text]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-orange .sidebar-form input[type=text]:focus,.skin-orange .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-orange .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-orange .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-orange.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn.btn-primary,.btn .btn-primary:link,.btn:hover.btn-primary,.btn:hover .btn-primary:link{background-color:#cc7000;border-color:#995400;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#995400;border-color:#995400;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#cc7000;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#663800;color:#fff}a{color:#ff8c00}a:hover{color:#995400}a:visited{color:#ff8c00}.text-primary{color:#995400}.fixed-table-container tbody .selected td{background-color:#fff8af}

public/css/dist/skins/skin-purple.css

@@ -1,168 +1 @@
-/*
- * Skin: Purple
- * ----------
- */
-.skin-purple .main-header .navbar {
-  background-color: #605ca8;
-}
-.skin-purple .main-header .navbar .nav > li > a {
-  color: #fff;
-}
-.skin-purple .main-header .navbar .nav > li > a:hover,
-.skin-purple .main-header .navbar .nav > li > a:active,
-.skin-purple .main-header .navbar .nav > li > a:focus,
-.skin-purple .main-header .navbar .nav .open > a,
-.skin-purple .main-header .navbar .nav .open > a:hover,
-.skin-purple .main-header .navbar .nav .open > a:focus,
-.skin-purple .main-header .navbar .nav > .active > a {
-  background: rgba(0, 0, 0, 0.1);
-  color: #f6f6f6;
-}
-.skin-purple .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-purple .main-header .navbar .sidebar-toggle:hover {
-  color: #f6f6f6;
-  background: rgba(0, 0, 0, 0.1);
-}
-.skin-purple .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-purple .main-header .navbar .sidebar-toggle:hover {
-  background-color: #555299;
-}
-@media (max-width: 767px) {
-  .skin-purple .main-header .navbar .dropdown-menu li.divider {
-    background-color: rgba(255, 255, 255, 0.1);
-  }
-  .skin-purple .main-header .navbar .dropdown-menu li a {
-    color: #fff;
-  }
-  .skin-purple .main-header .navbar .dropdown-menu li a:hover {
-    background: #555299;
-  }
-}
-.skin-purple .main-header li.user-header {
-  background-color: #605ca8;
-}
-.skin-purple .content-header {
-  background: transparent;
-}
-.skin-purple .wrapper,
-.skin-purple .main-sidebar,
-.skin-purple .left-side {
-  background-color: #222d32;
-}
-.skin-purple .user-panel > .info,
-.skin-purple .user-panel > .info > a {
-  color: #fff;
-}
-.skin-purple .sidebar-menu > li.header {
-  color: #4b646f;
-  background: #1a2226;
-}
-.skin-purple .sidebar-menu > li > a {
-  border-left: 3px solid transparent;
-}
-.skin-purple .sidebar-menu > li:hover > a,
-.skin-purple .sidebar-menu > li.active > a {
-  color: #fff;
-  background: #1e282c;
-  border-left-color: #605ca8;
-}
-.skin-purple .sidebar-menu > li > .treeview-menu {
-  margin: 0 1px;
-  background: #2c3b41;
-}
-.skin-purple .sidebar a {
-  color: #b8c7ce;
-}
-.skin-purple .sidebar a:hover {
-  text-decoration: none;
-}
-.skin-purple .treeview-menu > li > a {
-  color: #8aa4af;
-}
-.skin-purple .treeview-menu > li.active > a,
-.skin-purple .treeview-menu > li > a:hover {
-  color: #fff;
-}
-.skin-purple .sidebar-form {
-  border-radius: 3px;
-  border: 1px solid #374850;
-  margin: 10px 10px;
-}
-.skin-purple .sidebar-form input[type="text"],
-.skin-purple .sidebar-form .btn {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  background-color: #374850;
-  border: 1px solid transparent;
-  height: 35px;
-  -webkit-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
-}
-.skin-purple .sidebar-form input[type="text"] {
-  color: #666;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 2px;
-}
-.skin-purple .sidebar-form input[type="text"]:focus,
-.skin-purple .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  background-color: #fff;
-  color: #666;
-}
-.skin-purple .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  border-left-color: #fff;
-}
-.skin-purple .sidebar-form .btn {
-  color: #999;
-  border-top-left-radius: 0;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-  border-bottom-left-radius: 0;
-}
-.skin-purple.layout-top-nav .main-header > .logo .logo-variant {
-  background-color: none;
-}
-.btn.btn-primary,
-.btn:hover.btn-primary,
-.btn .btn-primary:link,
-.btn:hover .btn-primary:link {
-  background-color: #4c4988;
-  border-color: #3a3767;
-  color: #fff;
-}
-.btna.btn-primary:hover,
-.btn:hovera.btn-primary:hover {
-  background-color: #3a3767;
-  border-color: #3a3767;
-  color: #fff;
-}
-.btn.btn-white:link,
-.btn:hover.btn-white:link {
-  background-color: #4c4988;
-  color: #fff;
-}
-.btn.btn-white:hover,
-.btn:hover.btn-white:hover {
-  background-color: #272546;
-  color: #fff;
-}
-a {
-  color: #605ca8;
-}
-a:hover {
-  color: #3a3767;
-}
-a:visited {
-  color: #605ca8;
-}
-.text-primary {
-  color: #3a3767;
-}
-.fixed-table-container tbody .selected td {
-  background-color: #fff8af;
-}
+.skin-purple .main-header .navbar{background-color:#605ca8}.skin-purple .main-header .navbar .nav>li>a{color:#fff}.skin-purple .main-header .navbar .nav .open>a,.skin-purple .main-header .navbar .nav .open>a:focus,.skin-purple .main-header .navbar .nav .open>a:hover,.skin-purple .main-header .navbar .nav>.active>a,.skin-purple .main-header .navbar .nav>li>a:active,.skin-purple .main-header .navbar .nav>li>a:focus,.skin-purple .main-header .navbar .nav>li>a:hover,.skin-purple .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-purple .main-header .navbar .sidebar-toggle{color:#fff}.skin-purple .main-header .navbar .sidebar-toggle:hover{background-color:#555299}@media (max-width:767px){.skin-purple .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-purple .main-header .navbar .dropdown-menu li a{color:#fff}.skin-purple .main-header .navbar .dropdown-menu li a:hover{background:#555299}}.skin-purple .main-header li.user-header{background-color:#605ca8}.skin-purple .content-header{background:transparent}.skin-purple .left-side,.skin-purple .main-sidebar,.skin-purple .wrapper{background-color:#222d32}.skin-purple .user-panel>.info,.skin-purple .user-panel>.info>a{color:#fff}.skin-purple .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-purple .sidebar-menu>li>a{border-left:3px solid transparent}.skin-purple .sidebar-menu>li.active>a,.skin-purple .sidebar-menu>li:hover>a{color:#fff;background:#1e282c;border-left-color:#605ca8}.skin-purple .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-purple .sidebar a{color:#b8c7ce}.skin-purple .sidebar a:hover{text-decoration:none}.skin-purple .treeview-menu>li>a{color:#8aa4af}.skin-purple .treeview-menu>li.active>a,.skin-purple .treeview-menu>li>a:hover{color:#fff}.skin-purple .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px}.skin-purple .sidebar-form .btn,.skin-purple .sidebar-form input[type=text]{-webkit-box-shadow:none;box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-purple .sidebar-form input[type=text]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-purple .sidebar-form input[type=text]:focus,.skin-purple .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-purple .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-purple .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-purple.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn.btn-primary,.btn .btn-primary:link,.btn:hover.btn-primary,.btn:hover .btn-primary:link{background-color:#4c4988;border-color:#3a3767;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#3a3767;border-color:#3a3767;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#4c4988;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#272546;color:#fff}a{color:#605ca8}a:hover{color:#3a3767}a:visited{color:#605ca8}.text-primary{color:#3a3767}.fixed-table-container tbody .selected td{background-color:#fff8af}

public/css/dist/skins/skin-red.css

@@ -1,168 +1 @@
-/*
- * Skin: Red
- * ----------
- */
-.skin-red .main-header .navbar {
-  background-color: #dd4b39;
-}
-.skin-red .main-header .navbar .nav > li > a {
-  color: #fff;
-}
-.skin-red .main-header .navbar .nav > li > a:hover,
-.skin-red .main-header .navbar .nav > li > a:active,
-.skin-red .main-header .navbar .nav > li > a:focus,
-.skin-red .main-header .navbar .nav .open > a,
-.skin-red .main-header .navbar .nav .open > a:hover,
-.skin-red .main-header .navbar .nav .open > a:focus,
-.skin-red .main-header .navbar .nav > .active > a {
-  background: rgba(0, 0, 0, 0.1);
-  color: #f6f6f6;
-}
-.skin-red .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-red .main-header .navbar .sidebar-toggle:hover {
-  color: #f6f6f6;
-  background: rgba(0, 0, 0, 0.1);
-}
-.skin-red .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-red .main-header .navbar .sidebar-toggle:hover {
-  background-color: #d73925;
-}
-@media (max-width: 767px) {
-  .skin-red .main-header .navbar .dropdown-menu li.divider {
-    background-color: rgba(255, 255, 255, 0.1);
-  }
-  .skin-red .main-header .navbar .dropdown-menu li a {
-    color: #fff;
-  }
-  .skin-red .main-header .navbar .dropdown-menu li a:hover {
-    background: #d73925;
-  }
-}
-.skin-red .main-header li.user-header {
-  background-color: #dd4b39;
-}
-.skin-red .content-header {
-  background: transparent;
-}
-.skin-red .wrapper,
-.skin-red .main-sidebar,
-.skin-red .left-side {
-  background-color: #222d32;
-}
-.skin-red .user-panel > .info,
-.skin-red .user-panel > .info > a {
-  color: #fff;
-}
-.skin-red .sidebar-menu > li.header {
-  color: #4b646f;
-  background: #1a2226;
-}
-.skin-red .sidebar-menu > li > a {
-  border-left: 3px solid transparent;
-}
-.skin-red .sidebar-menu > li:hover > a,
-.skin-red .sidebar-menu > li.active > a {
-  color: #fff;
-  background: #1e282c;
-  border-left-color: #dd4b39;
-}
-.skin-red .sidebar-menu > li > .treeview-menu {
-  margin: 0 1px;
-  background: #2c3b41;
-}
-.skin-red .sidebar a {
-  color: #b8c7ce;
-}
-.skin-red .sidebar a:hover {
-  text-decoration: none;
-}
-.skin-red .treeview-menu > li > a {
-  color: #8aa4af;
-}
-.skin-red .treeview-menu > li.active > a,
-.skin-red .treeview-menu > li > a:hover {
-  color: #fff;
-}
-.skin-red .sidebar-form {
-  border-radius: 3px;
-  border: 1px solid #374850;
-  margin: 10px 10px;
-}
-.skin-red .sidebar-form input[type="text"],
-.skin-red .sidebar-form .btn {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  background-color: #374850;
-  border: 1px solid transparent;
-  height: 35px;
-  -webkit-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
-}
-.skin-red .sidebar-form input[type="text"] {
-  color: #666;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 2px;
-}
-.skin-red .sidebar-form input[type="text"]:focus,
-.skin-red .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  background-color: #fff;
-  color: #666;
-}
-.skin-red .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  border-left-color: #fff;
-}
-.skin-red .sidebar-form .btn {
-  color: #999;
-  border-top-left-radius: 0;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-  border-bottom-left-radius: 0;
-}
-.skin-red.layout-top-nav .main-header > .logo .logo-variant {
-  background-color: none;
-}
-.btn.btn-primary,
-.btn:hover.btn-primary,
-.btn .btn-primary:link,
-.btn:hover .btn-primary:link {
-  background-color: #c23321;
-  border-color: #96271a;
-  color: #fff;
-}
-.btna.btn-primary:hover,
-.btn:hovera.btn-primary:hover {
-  background-color: #96271a;
-  border-color: #96271a;
-  color: #fff;
-}
-.btn.btn-white:link,
-.btn:hover.btn-white:link {
-  background-color: #c23321;
-  color: #fff;
-}
-.btn.btn-white:hover,
-.btn:hover.btn-white:hover {
-  background-color: #6b1c12;
-  color: #fff;
-}
-a {
-  color: #dd4b39;
-}
-a:hover {
-  color: #96271a;
-}
-a:visited {
-  color: #dd4b39;
-}
-.text-primary {
-  color: #96271a;
-}
-.fixed-table-container tbody .selected td {
-  background-color: #fff8af;
-}
+.skin-red .main-header .navbar{background-color:#dd4b39}.skin-red .main-header .navbar .nav>li>a{color:#fff}.skin-red .main-header .navbar .nav .open>a,.skin-red .main-header .navbar .nav .open>a:focus,.skin-red .main-header .navbar .nav .open>a:hover,.skin-red .main-header .navbar .nav>.active>a,.skin-red .main-header .navbar .nav>li>a:active,.skin-red .main-header .navbar .nav>li>a:focus,.skin-red .main-header .navbar .nav>li>a:hover,.skin-red .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-red .main-header .navbar .sidebar-toggle{color:#fff}.skin-red .main-header .navbar .sidebar-toggle:hover{background-color:#d73925}@media (max-width:767px){.skin-red .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-red .main-header .navbar .dropdown-menu li a{color:#fff}.skin-red .main-header .navbar .dropdown-menu li a:hover{background:#d73925}}.skin-red .main-header li.user-header{background-color:#dd4b39}.skin-red .content-header{background:transparent}.skin-red .left-side,.skin-red .main-sidebar,.skin-red .wrapper{background-color:#222d32}.skin-red .user-panel>.info,.skin-red .user-panel>.info>a{color:#fff}.skin-red .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-red .sidebar-menu>li>a{border-left:3px solid transparent}.skin-red .sidebar-menu>li.active>a,.skin-red .sidebar-menu>li:hover>a{color:#fff;background:#1e282c;border-left-color:#dd4b39}.skin-red .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-red .sidebar a{color:#b8c7ce}.skin-red .sidebar a:hover{text-decoration:none}.skin-red .treeview-menu>li>a{color:#8aa4af}.skin-red .treeview-menu>li.active>a,.skin-red .treeview-menu>li>a:hover{color:#fff}.skin-red .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px}.skin-red .sidebar-form .btn,.skin-red .sidebar-form input[type=text]{-webkit-box-shadow:none;box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-red .sidebar-form input[type=text]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-red .sidebar-form input[type=text]:focus,.skin-red .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-red .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-red .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-red.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn.btn-primary,.btn .btn-primary:link,.btn:hover.btn-primary,.btn:hover .btn-primary:link{background-color:#c23321;border-color:#96271a;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#96271a;border-color:#96271a;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#c23321;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#6b1c12;color:#fff}a{color:#dd4b39}a:hover{color:#96271a}a:visited{color:#dd4b39}.text-primary{color:#96271a}.fixed-table-container tbody .selected td{background-color:#fff8af}

public/css/dist/skins/skin-yellow.css

@@ -1,168 +1 @@
-/*
- * Skin: Yellow
- * ----------
- */
-.skin-yellow .main-header .navbar {
-  background-color: #f39c12;
-}
-.skin-yellow .main-header .navbar .nav > li > a {
-  color: #fff;
-}
-.skin-yellow .main-header .navbar .nav > li > a:hover,
-.skin-yellow .main-header .navbar .nav > li > a:active,
-.skin-yellow .main-header .navbar .nav > li > a:focus,
-.skin-yellow .main-header .navbar .nav .open > a,
-.skin-yellow .main-header .navbar .nav .open > a:hover,
-.skin-yellow .main-header .navbar .nav .open > a:focus,
-.skin-yellow .main-header .navbar .nav > .active > a {
-  background: rgba(0, 0, 0, 0.1);
-  color: #f6f6f6;
-}
-.skin-yellow .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-yellow .main-header .navbar .sidebar-toggle:hover {
-  color: #f6f6f6;
-  background: rgba(0, 0, 0, 0.1);
-}
-.skin-yellow .main-header .navbar .sidebar-toggle {
-  color: #fff;
-}
-.skin-yellow .main-header .navbar .sidebar-toggle:hover {
-  background-color: #e08e0b;
-}
-@media (max-width: 767px) {
-  .skin-yellow .main-header .navbar .dropdown-menu li.divider {
-    background-color: rgba(255, 255, 255, 0.1);
-  }
-  .skin-yellow .main-header .navbar .dropdown-menu li a {
-    color: #fff;
-  }
-  .skin-yellow .main-header .navbar .dropdown-menu li a:hover {
-    background: #e08e0b;
-  }
-}
-.skin-yellow .main-header li.user-header {
-  background-color: #f39c12;
-}
-.skin-yellow .content-header {
-  background: transparent;
-}
-.skin-yellow .wrapper,
-.skin-yellow .main-sidebar,
-.skin-yellow .left-side {
-  background-color: #222d32;
-}
-.skin-yellow .user-panel > .info,
-.skin-yellow .user-panel > .info > a {
-  color: #fff;
-}
-.skin-yellow .sidebar-menu > li.header {
-  color: #4b646f;
-  background: #1a2226;
-}
-.skin-yellow .sidebar-menu > li > a {
-  border-left: 3px solid transparent;
-}
-.skin-yellow .sidebar-menu > li:hover > a,
-.skin-yellow .sidebar-menu > li.active > a {
-  color: #fff;
-  background: #1e282c;
-  border-left-color: #f39c12;
-}
-.skin-yellow .sidebar-menu > li > .treeview-menu {
-  margin: 0 1px;
-  background: #2c3b41;
-}
-.skin-yellow .sidebar a {
-  color: #b8c7ce;
-}
-.skin-yellow .sidebar a:hover {
-  text-decoration: none;
-}
-.skin-yellow .treeview-menu > li > a {
-  color: #8aa4af;
-}
-.skin-yellow .treeview-menu > li.active > a,
-.skin-yellow .treeview-menu > li > a:hover {
-  color: #fff;
-}
-.skin-yellow .sidebar-form {
-  border-radius: 3px;
-  border: 1px solid #374850;
-  margin: 10px 10px;
-}
-.skin-yellow .sidebar-form input[type="text"],
-.skin-yellow .sidebar-form .btn {
-  -webkit-box-shadow: none;
-          box-shadow: none;
-  background-color: #374850;
-  border: 1px solid transparent;
-  height: 35px;
-  -webkit-transition: all 0.3s ease-in-out;
-  transition: all 0.3s ease-in-out;
-}
-.skin-yellow .sidebar-form input[type="text"] {
-  color: #666;
-  border-top-left-radius: 2px;
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0;
-  border-bottom-left-radius: 2px;
-}
-.skin-yellow .sidebar-form input[type="text"]:focus,
-.skin-yellow .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  background-color: #fff;
-  color: #666;
-}
-.skin-yellow .sidebar-form input[type="text"]:focus + .input-group-btn .btn {
-  border-left-color: #fff;
-}
-.skin-yellow .sidebar-form .btn {
-  color: #999;
-  border-top-left-radius: 0;
-  border-top-right-radius: 2px;
-  border-bottom-right-radius: 2px;
-  border-bottom-left-radius: 0;
-}
-.skin-yellow.layout-top-nav .main-header > .logo .logo-variant {
-  background-color: none;
-}
-.btn.btn-primary,
-.btn:hover.btn-primary,
-.btn .btn-primary:link,
-.btn:hover .btn-primary:link {
-  background-color: #c87f0a;
-  border-color: #976008;
-  color: #fff;
-}
-.btna.btn-primary:hover,
-.btn:hovera.btn-primary:hover {
-  background-color: #976008;
-  border-color: #976008;
-  color: #fff;
-}
-.btn.btn-white:link,
-.btn:hover.btn-white:link {
-  background-color: #c87f0a;
-  color: #fff;
-}
-.btn.btn-white:hover,
-.btn:hover.btn-white:hover {
-  background-color: #674105;
-  color: #fff;
-}
-a {
-  color: #f39c12;
-}
-a:hover {
-  color: #976008;
-}
-a:visited {
-  color: #f39c12;
-}
-.text-primary {
-  color: #976008;
-}
-.fixed-table-container tbody .selected td {
-  background-color: #fff8af;
-}
+.skin-yellow .main-header .navbar{background-color:#f39c12}.skin-yellow .main-header .navbar .nav>li>a{color:#fff}.skin-yellow .main-header .navbar .nav .open>a,.skin-yellow .main-header .navbar .nav .open>a:focus,.skin-yellow .main-header .navbar .nav .open>a:hover,.skin-yellow .main-header .navbar .nav>.active>a,.skin-yellow .main-header .navbar .nav>li>a:active,.skin-yellow .main-header .navbar .nav>li>a:focus,.skin-yellow .main-header .navbar .nav>li>a:hover,.skin-yellow .main-header .navbar .sidebar-toggle:hover{background:rgba(0,0,0,.1);color:#f6f6f6}.skin-yellow .main-header .navbar .sidebar-toggle{color:#fff}.skin-yellow .main-header .navbar .sidebar-toggle:hover{background-color:#e08e0b}@media (max-width:767px){.skin-yellow .main-header .navbar .dropdown-menu li.divider{background-color:hsla(0,0%,100%,.1)}.skin-yellow .main-header .navbar .dropdown-menu li a{color:#fff}.skin-yellow .main-header .navbar .dropdown-menu li a:hover{background:#e08e0b}}.skin-yellow .main-header li.user-header{background-color:#f39c12}.skin-yellow .content-header{background:transparent}.skin-yellow .left-side,.skin-yellow .main-sidebar,.skin-yellow .wrapper{background-color:#222d32}.skin-yellow .user-panel>.info,.skin-yellow .user-panel>.info>a{color:#fff}.skin-yellow .sidebar-menu>li.header{color:#4b646f;background:#1a2226}.skin-yellow .sidebar-menu>li>a{border-left:3px solid transparent}.skin-yellow .sidebar-menu>li.active>a,.skin-yellow .sidebar-menu>li:hover>a{color:#fff;background:#1e282c;border-left-color:#f39c12}.skin-yellow .sidebar-menu>li>.treeview-menu{margin:0 1px;background:#2c3b41}.skin-yellow .sidebar a{color:#b8c7ce}.skin-yellow .sidebar a:hover{text-decoration:none}.skin-yellow .treeview-menu>li>a{color:#8aa4af}.skin-yellow .treeview-menu>li.active>a,.skin-yellow .treeview-menu>li>a:hover{color:#fff}.skin-yellow .sidebar-form{border-radius:3px;border:1px solid #374850;margin:10px}.skin-yellow .sidebar-form .btn,.skin-yellow .sidebar-form input[type=text]{-webkit-box-shadow:none;box-shadow:none;background-color:#374850;border:1px solid transparent;height:35px;-webkit-transition:all .3s ease-in-out;transition:all .3s ease-in-out}.skin-yellow .sidebar-form input[type=text]{color:#666;border-top-left-radius:2px;border-top-right-radius:0;border-bottom-right-radius:0;border-bottom-left-radius:2px}.skin-yellow .sidebar-form input[type=text]:focus,.skin-yellow .sidebar-form input[type=text]:focus+.input-group-btn .btn{background-color:#fff;color:#666}.skin-yellow .sidebar-form input[type=text]:focus+.input-group-btn .btn{border-left-color:#fff}.skin-yellow .sidebar-form .btn{color:#999;border-top-left-radius:0;border-top-right-radius:2px;border-bottom-right-radius:2px;border-bottom-left-radius:0}.skin-yellow.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn.btn-primary,.btn .btn-primary:link,.btn:hover.btn-primary,.btn:hover .btn-primary:link{background-color:#c87f0a;border-color:#976008;color:#fff}.btn:hovera.btn-primary:hover,.btna.btn-primary:hover{background-color:#976008;border-color:#976008;color:#fff}.btn.btn-white:link,.btn:hover.btn-white:link{background-color:#c87f0a;color:#fff}.btn.btn-white:hover,.btn:hover.btn-white:hover{background-color:#674105;color:#fff}a{color:#f39c12}a:hover{color:#976008}a:visited{color:#f39c12}.text-primary{color:#976008}.fixed-table-container tbody .selected td{background-color:#fff8af}

public/mix-manifest.json

@@ -1,38 +1,38 @@
 {
-    "/js/build/app.js": "/js/build/app.js?id=0f2b56f59544e601131b",
-    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=5d8ce6b758f170008cd6",
-    "/css/build/app.css": "/css/build/app.css?id=9b6ddbece1a3cfc99036",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=0a65220cdae6fbb6d913",
-    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=07ea041939045be9f35e",
-    "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=9f62f7b52ce7bc11ddfd",
-    "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=cf23e72b9c963c5ab23a",
-    "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=77ce26763889742cbb58",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=b0e148606607e0b37024",
-    "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=87b54289d2c1370974d1",
-    "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=1d7bbdce51b6f4499215",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=c9e2feba8a06c5b23311",
-    "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=3e904c2867143e27aebf",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=da3b392add13bd3a718a",
-    "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=11813086909e31b3d753",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=9ef2dc916a64083f9c1c",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=775e088af6b1151ec134",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=3f1d75db372eb87d8d51",
-    "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=d1cda85cbff0723be5f7",
-    "/css/dist/all.css": "/css/dist/all.css?id=fc64989106daf3be016b",
+    "/js/build/app.js": "/js/build/app.js?id=547172c6f8c07ebbfc3f",
+    "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=59413334823616b81341",
+    "/css/build/app.css": "/css/build/app.css?id=032fd8c3fce99c7fd862",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=0b4aefd7ef0c117ef23a",
+    "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=9fa704134cfacfacab93",
+    "/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=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=1a1ebcc437f2de698c27",
+    "/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=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=46311efe6c78ad08a7ce",
+    "/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=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=b0e148606607e0b37024",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=1d7bbdce51b6f4499215",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=775e088af6b1151ec134",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=9ef2dc916a64083f9c1c",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=c9e2feba8a06c5b23311",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=da3b392add13bd3a718a",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=3f1d75db372eb87d8d51",
-    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=cf23e72b9c963c5ab23a",
+    "/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=1a1ebcc437f2de698c27",
+    "/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=46311efe6c78ad08a7ce",
+    "/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=3acc03e5a20757aa08ca",
+    "/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",
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=1e77fde04b3f42432581",
     "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=58d95c93430f2ae33392",
-    "/js/dist/all.js": "/js/dist/all.js?id=7a853099c33e2d354767"
+    "/js/dist/all.js": "/js/dist/all.js?id=8443e32cebc5ad69befd"
 }

resources/assets/js/snipeit.js

@@ -212,7 +212,7 @@ $(document).ready(function () {
                     };
                     return data;
                 },
-                processResults: function (data, params) {
+                /* processResults: function (data, params) {
 
                     params.page = params.page || 1;
 
@@ -224,12 +224,12 @@ $(document).ready(function () {
                     };
 
                     return answer;
-                },
+                }, */
                 cache: true
             },
-            escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
-            templateResult: formatDatalist,
-            templateSelection: formatDataSelection
+            //escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
+            templateResult: formatDatalistSafe,
+            //templateSelection: formatDataSelection
         });
 
     });
@@ -331,12 +331,12 @@ $(document).ready(function () {
             return loading_markup;
         }
 
-        var markup = "<div class='clearfix'>" ;
-        markup +="<div class='pull-left' style='padding-right: 10px;'>";
+        var markup = '<div class="clearfix">' ;
+        markup += '<div class="pull-left" style="padding-right: 10px;">';
         if (datalist.image) {
             markup += "<div style='width: 30px;'><img src='" + datalist.image + "' style='max-height: 20px; max-width: 30px;' alt='" +  datalist.text + "'></div>";
         } else {
-            markup += "<div style='height: 20px; width: 30px;'></div>";
+            markup += '<div style="height: 20px; width: 30px;"></div>';
         }
 
         markup += "</div><div>" + datalist.text + "</div>";
@@ -344,6 +344,58 @@ $(document).ready(function () {
         return markup;
     }
 
+    function formatDatalistSafe(datalist) {
+        // console.warn("What in the hell is going on with Select2?!?!!?!?");
+        // console.warn($.select2);
+        if (datalist.loading) {
+            return $('<i class="fa fa-spinner fa-spin" aria-hidden="true"></i> Loading...');
+        }
+
+        var root_div = $("<div class='clearfix'>") ;
+        var left_pull = $("<div class='pull-left' style='padding-right: 10px;'>");
+        if (datalist.image) {
+            var inner_div = $("<div style='width: 30px;'>");
+            /******************************************************************
+             * 
+             * We are specifically chosing empty alt-text below, because this 
+             * image conveys no additional information, relative to the text
+             * that will *always* be there in any select2 list that is in use
+             * in Snipe-IT. If that changes, we would probably want to change
+             * some signatures of some functions, but right now, we don't want
+             * screen readers to say "HP SuperJet 5000, .... picture of HP 
+             * SuperJet 5000..." and so on, for every single row in a list of
+             * assets or models or whatever.
+             * 
+             *******************************************************************/
+            var img = $("<img src='' style='max-height: 20px; max-width: 30px;' alt=''>");
+            // console.warn("Img is: ");
+            // console.dir(img);
+            // console.warn("Strigularly, that's: ");
+            // console.log(img);
+            img.attr("src", datalist.image );
+            inner_div.append(img)
+        } else {
+            var inner_div=$("<div style='height: 20px; width: 30px;'></div>");
+        }
+        left_pull.append(inner_div);
+        root_div.append(left_pull);
+        var name_div = $("<div>");
+        name_div.text(datalist.text);
+        root_div.append(name_div)
+        var safe_html = root_div.get(0).outerHTML;
+        var old_html = formatDatalist(datalist);
+        if(safe_html != old_html) {
+            console.log("HTML MISMATCH: ");
+            console.log("FormatDatalistSafe: ");
+            // console.dir(root_div.get(0));
+            console.log(safe_html);
+            console.log("FormatDataList: ");
+            console.log(old_html);
+        }
+        return root_div;
+
+    }
+
     function formatDataSelection (datalist) {
         // This a heinous workaround for a known bug in Select2.
         // Without this, the rich selectlists are vulnerable to XSS.

resources/assets/js/snipeit_modals.js

@@ -69,7 +69,7 @@ $(function () {
                         };
                         return data;
                     },
-                    processResults: function (data, params) {
+                    /*processResults: function (data, params) {
 
                         params.page = params.page || 1;
 
@@ -81,12 +81,12 @@ $(function () {
                         };
 
                         return answer;
-                    },
+                    },*/
                     cache: true
                 },
-                escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
-                templateResult: formatDatalist,
-                templateSelection: formatDataSelection
+                //escapeMarkup: function (markup) { return markup; }, // let our custom formatter work
+                templateResult: formatDatalistSafe,
+                //templateSelection: formatDataSelection
             });
         });
       });

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-sub: #BBB;
-  --link: lighten(@black, 50%); /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --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);
-}
-.popover-title {
-  background-color: #111;
+
+a:link {
+  color: var(--link);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:visited {
+  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);
 }
@@ -159,22 +185,28 @@ body {
 }
 .box-body, .box-footer, .box-header {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  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(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
-.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
+.btn-primary, .btn-primary.hover, .btn-primary:active, .text-black {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -201,16 +233,20 @@ 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);
   color: var(--text-main);
 }
+.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 h1, h2, h3, h4, h5, h6, p {
   color: var(--text-main);
 }
@@ -299,20 +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(--link);
-  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--link);
+    color: var(--visited-link)
   }
 }
 

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

@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@blue, 15%);
+  --button-primary: darken(@blue, 25%);
+  --button-hover: darken(@blue, 30%);
   --header: @blue; /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: lighten(@blue, 50%); /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: lighten(@blue, 30%); /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@blue, 40%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@blue, 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);
 }
 
@@ -132,9 +141,31 @@ a {
   color: var(--text-main);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:link {
+  color: var(--link);
 }
+
+a:visited {
+  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);
 }
@@ -154,22 +185,28 @@ body {
 }
 .box-body, .box-footer, .box-header {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  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(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
 .btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -196,16 +233,20 @@ 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);
   color: var(--text-main);
 }
+.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 h1, h2, h3, h4, h5, h6, p {
   color: var(--text-main);
 }
@@ -294,20 +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(--link);
-  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--link);
+    color: var(--visited-link)
   }
 }
 

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

@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@green, 15%);
+  --button-primary: darken(@green, 25%);
+  --button-hover: darken(@green, 30%);
   --header: @green; /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: lighten(@green, 50%); /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: lighten(@green, 30%); /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@green, 40%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@green, 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,29 +140,42 @@ a {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.popover {
-  background-color:var(--back-main);
-}
-.popover-title {
-  background-color: #00a65a;
+
+a:link {
+  color: var(--link);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:visited {
+  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);
 }
-#assetsListingTable>tbody>tr>td {
-  color: var(--link);
-}
-
 body {
   color: var(--text-main);
 }
@@ -163,22 +185,28 @@ body {
 }
 .box-body, .box-footer, .box-header {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  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(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
-.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
+.btn-primary, .btn-primary.hover, .btn-primary:active, .text-green {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -205,23 +233,20 @@ 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);
-}
-.dynamic-form-row{
-  color: @green;
-}
-
-.select2-container--default .select2-selection--single .select2-selection__rendered {
-  color: var(--header);
+  color: var(--nav-link);
 }
 .form-control {
   background-color: var(--back-main);
   color: var(--text-main);
 }
+.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 h1, h2, h3, h4, h5, h6, p {
   color: var(--text-main);
 }
@@ -236,9 +261,6 @@ input[type=text], input[type=search] {
   background-color: var(--back-sub)!important;
   color: var(--text-main);
 }
-li.select2-results__option{
-  color:@green;
-}
 #licensesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
@@ -313,22 +335,25 @@ li.select2-results__option{
 .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);
 }
-#webui>#app>.row>.col-md-12>.box>.box-body>.row>.col-md-12 {
-  color:@green;
+
+.box-header.with-border {
+  border-bottom: #000;
 }
+
 a {
   color: var(--link);
+
   &:link {
-    color: var(--link);
-  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--link);
+    color: var(--visited-link)
   }
 }
 
@@ -358,3 +383,4 @@ a {
   border-top: 1px solid #dddddd;
   display: table-cell;
 }
+

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

@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@orange, 15%);
+  --button-primary: darken(@orange, 25%);
+  --button-hover: darken(@orange, 30%);
   --header: @orange; /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: lighten(@orange, 50%); /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: lighten(@orange, 30%); /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@orange, 40%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@orange, 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);
-}
-.popover-title {
-  background-color: #ff8c00;
+
+a:link {
+  color: var(--link);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:visited {
+  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);
 }
@@ -159,22 +185,28 @@ body {
 }
 .box-body, .box-footer, .box-header {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  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(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
-.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
+.btn-primary, .btn-primary.hover, .btn-primary:active, .text-orange {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -201,16 +233,20 @@ 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);
   color: var(--text-main);
 }
+.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 h1, h2, h3, h4, h5, h6, p {
   color: var(--text-main);
 }
@@ -299,20 +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(--link);
-  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--link);
+    color: var(--visited-link)
   }
 }
 

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

@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@purple, 15%);
+  --button-primary: darken(@purple, 25%);
+  --button-hover: darken(@purple, 30%);
   --header: @purple; /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: lighten(@purple, 50%); /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: lighten(@purple, 30%); /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@purple, 40%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@purple, 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);
-}
-.popover-title {
-  background-color: #605ca8;
+
+a:link {
+  color: var(--link);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:visited {
+  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);
 }
@@ -159,22 +185,28 @@ body {
 }
 .box-body, .box-footer, .box-header {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  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(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
-.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
+.btn-primary, .btn-primary.hover, .btn-primary:active, .text-purple {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -201,16 +233,20 @@ 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);
   color: var(--text-main);
 }
+.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 h1, h2, h3, h4, h5, h6, p {
   color: var(--text-main);
 }
@@ -299,20 +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(--link);
-  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--link);
+    color: var(--visited-link)
   }
 }
 

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

@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@red, 15%);
+  --button-primary: darken(@red, 25%);
+  --button-hover: darken(@red, 30%);
   --header: @red; /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: lighten(@red, 50%); /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: lighten(@red, 30%); /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@red, 40%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@red, 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);
 }
 
@@ -132,15 +141,38 @@ a {
   color: var(--text-main);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:link {
+  color: var(--link);
 }
+
+a:visited {
+  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);
 }
@@ -153,22 +185,28 @@ body {
 }
 .box-body, .box-footer, .box-header {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  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(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
-.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
+.btn-primary, .btn-primary.hover, .btn-primary:active, .text-red {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -195,16 +233,20 @@ 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);
   color: var(--text-main);
 }
+.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 h1, h2, h3, h4, h5, h6, p {
   color: var(--text-main);
 }
@@ -258,12 +300,6 @@ input[type=text], input[type=search] {
   background-color: var(--back-main);
   color: var(--header);
 }
-.popover {
-  background-color:var(--back-main);
-}
-.popover-title {
-  background-color: #dd4b39;
-}
 .select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {
   background-color: var(--back-sub);
   color: var(--header);
@@ -299,20 +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(--link);
-  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--link);
+    color: var(--visited-link)
   }
 }
 

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

@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@yellow, 15%);
+  --button-primary: darken(@yellow, 25%);
+  --button-hover: darken(@yellow, 30%);
   --header: @yellow; /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: lighten(@yellow, 50%); /* 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 */
 }
@@ -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);
 }
 
@@ -132,15 +141,38 @@ a {
   color: var(--text-main);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:link {
+  color: var(--link);
 }
+
+a:visited {
+  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);
 }
@@ -153,22 +185,28 @@ body {
 }
 .box-body, .box-footer, .box-header {
   background-color: var(--back-sub);
-  color: var(--text-main);
+  color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  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(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
-.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
+.btn-primary, .btn-primary.hover, .btn-primary:active, .text-yellow {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -195,16 +233,20 @@ 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);
   color: var(--text-main);
 }
+.form-control[disabled], .form-control[readonly], fieldset[disabled] .form-control{
+  background-color: var(--back-main);
+  color: var(--text-main);
+}
 h1, h2, h3, h4, h5, h6, p {
   color: var(--text-main);
 }
@@ -258,12 +300,6 @@ input[type=text], input[type=search] {
   background-color: var(--back-main);
   color: var(--header);
 }
-.popover {
-  background-color:var(--back-main);
-}
-.popover-title {
-  background-color: #f39c12;
-}
 .select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {
   background-color: var(--back-sub);
   color: var(--header);
@@ -299,20 +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(--link);
-  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--link);
+    color: var(--visited-link)
   }
 }
 

resources/lang/en/auth/general.php

@@ -8,6 +8,9 @@ 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/lang/en/general.php

@@ -243,5 +243,7 @@
     'i_accept'              => 'I accept',
     'i_decline'             => 'I decline',
     'sign_tos'              => 'Sign below to indicate that you agree to the terms of service:',
-    'clear_signature'       => 'Clear Signature'
+    'clear_signature'       => 'Clear Signature',
+    'show_help'             => 'Show help',
+    'hide_help'             => 'Hide help',
     ];

resources/views/auth/login.blade.php

@@ -17,7 +17,7 @@
                 <div class="col-md-4 col-md-offset-4">
 
                     <div class="box login-box">
-                        <div class="box-header">
+                        <div class="box-header with-border">
                             <h1 class="box-title"> {{ trans('auth/general.login_prompt')  }}</h1>
                         </div>
 
@@ -43,18 +43,18 @@
                                     <fieldset>
 
                                         <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
-                                            <label for="username">{{ trans('admin/users/table.username')  }}</label>
+                                            <label for="username"><i class="fa fa-user" aria-hidden="true"></i> {{ trans('admin/users/table.username')  }}</label>
                                             <input class="form-control" placeholder="{{ trans('admin/users/table.username')  }}" name="username" type="text" id="username" autocomplete="off" autofocus>
                                             {!! $errors->first('username', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
                                         </div>
                                         <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
-                                            <label for="password">{{ trans('admin/users/table.password')  }}</label>
+                                            <label for="password"><i class="fa fa-key" aria-hidden="true"></i> {{ trans('admin/users/table.password')  }}</label>
                                             <input class="form-control" placeholder="{{ trans('admin/users/table.password')  }}" name="password" type="password" id="password" autocomplete="off">
                                             {!! $errors->first('password', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
                                         </div>
                                         <div class="checkbox">
-                                            <label>
-                                                <input name="remember" type="checkbox" value="1">{{ trans('auth/general.remember_me')  }}
+                                            <label style="margin-left: -20px;">
+                                                <input name="remember" type="checkbox" value="1" class="minimal"> {{ trans('auth/general.remember_me')  }}
                                             </label>
                                         </div>
                                     </fieldset>

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

@@ -4,27 +4,48 @@
 {{-- Page content --}}
 @section('content')
 
+
     @if ($snipeSettings->custom_forgot_pass_url)
-        <a href="{{ $snipeSettings->custom_forgot_pass_url  }}" rel="noopener">{{ trans('auth/general.forgot_password')  }}</a>
+        <!--  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.ldap_reset_password')  }}
+                    </a>
+                </h3>
+            </div>
+        </div>
+
     @else
 
+
     <form class="form" role="form" method="POST" action="{{ url('/password/email') }}">
         {!! csrf_field() !!}
     <div class="container">
         <div class="row">
 
-
-
             <div class="col-md-4 col-md-offset-4">
 
                 <div class="box login-box" style="width: 100%">
-                        <div class="box-header">
+                        <div class="box-header with-border">
                             <h2 class="box-title"> {{ trans('auth/general.send_password_link')  }}</h2>
                         </div>
 
 
                         <div class="login-box-body">
                             <div class="row">
+                                <div class="col-md-12">
+                                    <div class="alert alert-info">
+                                        <i class="fa fa-info-circle" aria-hidden="true"></i>
+                                        {!! trans('auth/general.username_help_top') !!}
+                                    </div>
+                                </div>
+
+
+                            </div>
+                            <div class="row">
+
 
                                 <!-- Notifications -->
                                 @include('notifications')
@@ -34,19 +55,41 @@
                                     <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
 
                                         <div class="col-md-12">
+                                            <label for="username"><i class="fa fa-user" aria-hidden="true"></i> {{ trans('admin/users/table.username') }} </label>
                                             <input type="text" class="form-control" name="username" value="{{ old('username') }}" placeholder="{{ trans('admin/users/table.username') }}" aria-label="username">
                                             {!! $errors->first('username', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
                                         </div>
                                     </div>
+                            </div>
 
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <br>
+                                    <!-- show help text toggle -->
+                                    <a href="#" id="show">
+                                        <i class="fa fa-caret-right"></i>
+                                        {{ trans('general.show_help') }}
+                                    </a>
 
+                                    <!-- hide help text toggle -->
+                                    <a href="#" id="hide" style="display:none">
+                                        <i class="fa fa-caret-up"></i>
+                                        {{ trans('general.hide_help') }}
+                                    </a>
 
+                                    <!-- help text  -->
+                                    <p class="help-block" id="help-text" style="display:none">
+                                        {!! trans('auth/general.username_help_bottom') !!}
+                                    </p>
+
+                                </div>
                             </div>
                         </div>
+
                         <div class="box-footer">
                             <button type="submit" class="btn btn-lg btn-primary btn-block">
                                 {{ trans('auth/general.email_reset_password')  }}
-                                </button>
+                            </button>
                         </div>
 
                     </div>
@@ -59,3 +102,21 @@
     @endif
 @stop
 
+@push('js')
+    <script nonce="{{ csrf_token() }}">
+        $(document).ready(function () {
+            $("#show").click(function(){
+                $("#help-text").fadeIn(500);
+                $("#show").hide();
+                $("#hide").show();
+            });
+
+            $("#hide").click(function(){
+                $("#help-text").fadeOut(300);
+                $("#show").show();
+                $("#hide").hide();
+            });
+        });
+    </script>
+@endpush
+

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

@@ -16,7 +16,7 @@
                 <div class="col-md-6 col-md-offset-3">
 
                     <div class="box login-box" style="width: 100%">
-                        <div class="box-header">
+                        <div class="box-header with-border">
                             <h2 class="box-title"> {{ trans('auth/general.reset_password')  }}</h2>
                         </div>
 
@@ -32,7 +32,7 @@
                                     <input type="hidden" name="token" value="{{ $token }}">
 
                                     <div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
-                                        <label class="col-md-4 control-label">{{ trans('admin/users/table.username')  }}</label>
+                                        <label class="col-md-4 control-label"><i class="fa fa-user" aria-hidden="true"></i> {{ trans('admin/users/table.username')  }}</label>
 
                                         <div class="col-md-6">
                                             <input type="text" class="form-control" name="username" value="{{ old('username', $username) }}">
@@ -42,7 +42,7 @@
                         </div>
 
                         <div class="form-group{{ $errors->has('password') ? ' has-error' : '' }}">
-                            <label class="col-md-4 control-label" for="password">{{ trans('admin/users/table.password')  }}</label>
+                            <label class="col-md-4 control-label" for="password"><i class="fa fa-key" aria-hidden="true"></i> {{ trans('admin/users/table.password')  }}</label>
 
                             <div class="col-md-6">
                                 <input type="password" class="form-control" name="password" aria-label="password">
@@ -51,7 +51,7 @@
                         </div>
 
                         <div class="form-group{{ $errors->has('password_confirmation') ? ' has-error' : '' }}">
-                            <label class="col-md-4 control-label" for="password_confirmation">{{ trans('admin/users/table.password_confirm')  }}</label>
+                            <label class="col-md-4 control-label" for="password_confirmation"><i class="fa fa-key" aria-hidden="true"></i> {{ trans('admin/users/table.password_confirm')  }}</label>
                             <div class="col-md-6">
                                 <input type="password" class="form-control" name="password_confirmation" aria-label="password_confirmation">
                                 {!! $errors->first('password_confirmation', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}

resources/views/custom_fields/fields/edit.blade.php

@@ -70,7 +70,7 @@
           </div>
 
           <!-- Format -->
-          <div class="form-group {{ $errors->has('format') ? ' has-error' : '' }}">
+          <div class="form-group {{ $errors->has('format') ? ' has-error' : '' }}" id="format_values">
             <label for="format" class="col-md-4 control-label">
               {{ trans('admin/custom_fields/general.field_format') }}
             </label>
@@ -168,6 +168,17 @@
             });
         }).change();
 
+        // If the element is a radiobutton, doesn't show the format input box
+        $(".field_element").change(function(){
+            $(this).find("option:selected").each(function(){
+                if (($(this).attr("value") != "radio")){
+                    $("#format_values").show();
+                } else{
+                    $("#format_values").hide();
+                }
+            });
+        }).change();
+
         // Only display the field element if the type is not text
         $(".field_element").change(function(){
             $(this).find("option:selected").each(function(){

resources/views/depreciations/index.blade.php

@@ -2,7 +2,7 @@
 
 {{-- Page title --}}
 @section('title')
-Asset Depreciations
+  Depreciations
 @parent
 @stop
 
@@ -22,6 +22,7 @@ Asset Depreciations
         <div class="table-responsive">
 
           <table
+                  data-columns="{{ \App\Presenters\DepreciationPresenter::dataTableLayout() }}"
                   data-cookie-id-table="depreciationsTable"
                   data-pagination="true"
                   data-id-table="depreciationsTable"
@@ -39,14 +40,6 @@ Asset Depreciations
                     "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
                     }'>
 
-            <thead>
-              <tr>
-                <th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
-                <th data-sortable="true" data-field="name">{{ trans('admin/depreciations/table.title') }}</th>
-                <th data-sortable="false" data-field="months">{{ trans('admin/depreciations/table.term') }}</th>
-                <th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions"  data-formatter="depreciationsActionsFormatter">{{ trans('table.actions') }}</th>
-              </tr>
-            </thead>
           </table>
         </div>
       </div>

resources/views/depreciations/view.blade.php

@@ -3,14 +3,21 @@
 {{-- Page title --}}
 @section('title')
 
-    {{ trans('general.depreciation') }}
-    : {{ $depreciation->name }}
+    {{ trans('general.depreciation') }}: {{ $depreciation->name }} ({{ $depreciation->months }} {{ trans('general.months') }})
 
     @parent
 @stop
 
 @section('header_right')
-    <a href="{{ route('depreciations.edit', ['depreciation' => $depreciation->id]) }}" class="btn btn-sm btn-primary pull-right">{{ trans('admin/depreciations/table.update') }} </a>
+    <div class="btn-group pull-right">
+        <button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
+            <span class="caret"></span>
+        </button>
+        <ul class="dropdown-menu">
+            <li><a href="{{ route('depreciations.edit', ['depreciation' => $depreciation->id]) }}">{{ trans('general.update') }}</a></li>
+            <li><a href="{{ route('depreciations.create') }}">{{ trans('general.create') }}</a></li>
+        </ul>
+    </div>
 @stop
 
 {{-- Page content --}}
@@ -18,37 +25,147 @@
 
     <div class="row">
         <div class="col-md-12">
-            <div class="box box-default">
-                <div class="box-body">
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="table table-responsive">
-                                <table
-                                        name="location_users"
-                                        id="table-users"
-                                        class="table table-striped snipe-table"
-                                        data-url="{{ route('api.assets.index',['depreciation'=> $depreciation->id]) }}"
-                                        data-cookie="true"
-                                        data-click-to-select="true"
-                                        data-cookie-id-table="department_usersDetailTable">
-                                    <thead>
 
-                                </table>
+
+            <!-- Custom Tabs -->
+            <div class="nav-tabs-custom">
+                <ul class="nav nav-tabs">
+                    <li class="active"><a href="#assets" data-toggle="tab">{{ trans('general.assets') }}</a></li>
+                    <li><a href="#licenses" data-toggle="tab">{{ trans('general.licenses') }}</a></li>
+                    <li><a href="#models" data-toggle="tab">{{ trans('general.asset_models') }}</a></li>
+                    </ul>
+
+                <div class="tab-content">
+
+                    <div class="tab-pane active" id="assets">
+
+
+                        <table
+                                data-columns="{{ \App\Presenters\AssetPresenter::dataTableLayout() }}"
+                                data-cookie-id-table="depreciationsAssetTable"
+                                data-id-table="depreciationsAssetTable"
+                                id="depreciationsAssetTable"
+                                data-pagination="true"
+                                data-search="true"
+                                data-side-pagination="server"
+                                data-show-columns="true"
+                                data-show-export="true"
+                                data-show-refresh="true"
+                                data-sort-order="asc"
+                                data-sort-name="name"
+                                class="table table-striped snipe-table"
+                                data-url="{{ route('api.assets.index',['depreciation_id'=> $depreciation->id]) }}"
+                                data-export-options='{
+                        "fileName": "export-depreciations-{{ date('Y-m-d') }}",
+                        "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                        }'>
+                        </table>
+
+                    </div> <!-- end tab-pane -->
+
+                    <!-- tab-pane -->
+                    <div class="tab-pane" id="licenses">
+                        <div class="row">
+                            <div class="col-md-12">
+
+                                <div class="table-responsive">
+
+                                    <table
+                                            data-columns="{{ \App\Presenters\LicensePresenter::dataTableLayout() }}"
+                                            data-cookie-id-table="depreciationsLicenseTable"
+                                            data-id-table="depreciationsLicenseTable"
+                                            id="depreciationsLicenseTable"
+                                            data-pagination="true"
+                                            data-search="true"
+                                            data-side-pagination="server"
+                                            data-show-columns="true"
+                                            data-show-export="true"
+                                            data-show-refresh="true"
+                                            data-sort-order="asc"
+                                            data-sort-name="name"
+                                            class="table table-striped snipe-table"
+                                            data-url="{{ route('api.licenses.index',['depreciation_id'=> $depreciation->id]) }}"
+                                            data-export-options='{
+                        "fileName": "export-depreciations-{{ date('Y-m-d') }}",
+                        "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                        }'>
+                                    </table>
+
+                                </div>
+
                             </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
+
+                        </div> <!--/.row-->
+                    </div> <!-- /.tab-pane -->
+
+                    <!-- tab-pane -->
+                    <div class="tab-pane" id="models">
+
+                        <div class="row">
+                            {{ Form::open(
+                                      [
+                                     'method' => 'POST',
+                                     'route' => ['models.bulkedit.index'],
+                                     'class' => 'form-inline',
+                                      'id' => 'bulkForm']
+                                      ) }}
+                            <div class="col-md-12">
+                                <div id="toolbar">
+                                    <label for="bulk_actions" class="sr-only">Bulk Actions</label>
+                                    <select name="bulk_actions" class="form-control select2" aria-label="bulk_actions" style="width: 300px;">
+                                        <option value="edit">Bulk Edit</option>
+                                        <option value="delete">Bulk Delete</option>
+                                    </select>
+                                    <button class="btn btn-primary" id="bulkEdit" disabled>Go</button>
+                                </div>
+
+                                <div class="table-responsive">
+                                    <table
+                                            data-columns="{{ \App\Presenters\AssetModelPresenter::dataTableLayout() }}"
+                                            data-cookie-id-table="depreciationsModelsTable"
+                                            data-id-table="depreciationsModelsTable"
+                                            id="depreciationsModelsTable"
+                                            data-pagination="true"
+                                            data-search="true"
+                                            data-toolbar="#toolbar"
+                                            data-side-pagination="server"
+                                            data-show-columns="true"
+                                            data-show-export="true"
+                                            data-show-refresh="true"
+                                            data-sort-order="asc"
+                                            data-sort-name="name"
+                                            class="table table-striped snipe-table"
+                                            data-url="{{ route('api.models.index',['depreciation_id'=> $depreciation->id]) }}"
+                                            data-export-options='{
+                        "fileName": "export-depreciations-bymodel-{{ date('Y-m-d') }}",
+                        "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                        }'>
+                                    </table>
+
+
+                                </div>
+
+                            </div>
+                            {{ Form::close() }}
+
+                        </div> <!--/.row-->
+                    </div> <!-- /.tab-pane -->
+
+                </div> <!-- /.tab-content -->
+
+
+
+            </div> <!-- /.tab-content -->
+            </div> <!-- nav-tabs-custom -->
+
+
         </div>
+
     </div>
 
 @stop
 
 @section('moar_scripts')
-    @include ('partials.bootstrap-table', [
-        'exportFile' => 'assets-export',
-        'search' => true,
-        'columns' => \App\Presenters\AssetPresenter::dataTableLayout()
-    ])
+    @include ('partials.bootstrap-table')
 
 @stop

resources/views/hardware/checkout.blade.php

@@ -51,6 +51,16 @@
                                 {!! $errors->first('name', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
                         </div>
+
+                        <!-- Status -->
+                        <div class="form-group {{ $errors->has('status_id') ? 'error' : '' }}">
+                            {{ Form::label('status_id', trans('admin/hardware/form.status'), array('class' => 'col-md-3 control-label')) }}
+                            <div class="col-md-7 required">
+                                {{ Form::select('status_id', $statusLabel_list, $asset->status_id, array('class'=>'select2', 'style'=>'width:100%','', 'aria-label'=>'status_id')) }}
+                                {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
+                            </div>
+                        </div>
+
                     @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true'])
 
                     @include ('partials.forms.edit.user-select', ['translated_name' => trans('general.user'), 'fieldname' => 'assigned_user', 'required'=>'true'])
@@ -67,7 +77,7 @@
                             {{ Form::label('checkout_at', trans('admin/hardware/form.checkout_date'), array('class' => 'col-md-3 control-label')) }}
                             <div class="col-md-8">
                                 <div class="input-group date col-md-7" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-end-date="0d">
-                                    <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ old('checkout_at') }}">
+                                    <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="checkout_at" id="checkout_at" value="{{ old('checkout_at', date('Y-m-d')) }}">
                                     <span class="input-group-addon"><i class="fa fa-calendar" aria-hidden="true"></i></span>
                                 </div>
                                 {!! $errors->first('checkout_at', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}

resources/views/hardware/edit.blade.php

@@ -66,15 +66,14 @@
   </div>
 
   @include ('partials.forms.edit.status', [ 'required' => 'true'])
-
   @if (!$item->id)
       @include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true', 'style' => 'display:none;'])
-
       @include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_user', 'style' => 'display:none;', 'required' => 'false'])
-
-  @include ('partials.forms.edit.asset-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_asset', 'style' => 'display:none;', 'required' => 'false'])
-
-  @include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_location', 'style' => 'display:none;', 'required' => 'false'])
+      @include ('partials.forms.edit.asset-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_asset', 'style' => 'display:none;', 'required' => 'false'])
+      @include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_location', 'style' => 'display:none;', 'required' => 'false'])
+  @elseif (($item->assignedTo) && ($item->deleted_at==''))
+      <!-- This is an asset and it's currently deployed, so let them edit the expected checkin date -->
+      @include ('partials.forms.edit.datepicker', ['translated_name' => trans('admin/hardware/form.expected_checkin'),'fieldname' => 'expected_checkin'])
   @endif
 
   @include ('partials.forms.edit.name', ['translated_name' => trans('admin/hardware/form.name')])
@@ -230,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 = '';
                 }

resources/views/layouts/basic.blade.php

@@ -11,11 +11,16 @@
     <link rel="shortcut icon" type="image/ico" href="{{ ($snipeSettings) && ($snipeSettings->favicon!='') ?  Storage::disk('public')->url('').e($snipeSettings->favicon) : 'favicon.ico' }} ">
     {{-- stylesheets --}}
     <link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
-
-
-    <link rel="stylesheet" href="{{ url('css/dist/all.css') }}">
     <link rel="shortcut icon" type="image/ico" href="{{ url(asset('favicon.ico')) }}">
 
+    <script nonce="{{ csrf_token() }}">
+        window.snipeit = {
+            settings: {
+                "per_page": 50
+            }
+        };
+    </script>
+
 
     @if (($snipeSettings) && ($snipeSettings->header_color))
         <style>
@@ -64,6 +69,11 @@
     @endif
     </div>
 
+    {{-- Javascript files --}}
+    <script src="{{ url(mix('js/dist/all.js')) }}" nonce="{{ csrf_token() }}"></script>
+
+
+    @stack('js')
 </body>
 
 </html>

resources/views/licenses/view.blade.php

@@ -167,11 +167,24 @@
                     </strong>
                   </div>
                   <div class="col-md-8">
-                    {{ $license->expiration_date }}
+                    {{ \App\Helpers\Helper::getFormattedDateObject($license->expiration_date, 'date', false) }}
                   </div>
                 </div>
                 @endif
 
+                @if ($license->termination_date)
+                  <div class="row">
+                    <div class="col-md-4">
+                      <strong>
+                        {{ trans('admin/licenses/form.termination_date') }}
+                      </strong>
+                    </div>
+                    <div class="col-md-8">
+                      {{ \App\Helpers\Helper::getFormattedDateObject($license->termination_date, 'date', false) }}
+                    </div>
+                  </div>
+                @endif
+
 
                 @if ($license->depreciation)
                 <div class="row">
@@ -188,8 +201,6 @@
                   </div>
                 </div>
 
-
-
                 <div class="row">
                   <div class="col-md-4">
                     <strong>
@@ -197,7 +208,7 @@
                     </strong>
                   </div>
                   <div class="col-md-8">
-                    {{ $license->depreciated_date()->format("Y-m-d") }}
+                    {{ \App\Helpers\Helper::getFormattedDateObject($license->depreciated_date(), 'date', false) }}
                   </div>
                 </div>
 
@@ -233,13 +244,14 @@
                   @endif
 
 
-                  @if (isset($license->purchase_date))
+                @if (isset($license->purchase_date))
                 <div class="row">
                   <div class="col-md-4">
                     <strong>{{ trans('general.purchase_date') }}</strong>
                   </div>
                   <div class="col-md-8">
-                    {{ $license->purchase_date }}
+                    {{ \App\Helpers\Helper::getFormattedDateObject($license->purchase_date, 'date', false) }}
+
                   </div>
                 </div>
                   @endif

resources/views/models/bulk-edit.blade.php

@@ -22,43 +22,60 @@
 
                 <div class="box box-default">
                     <div class="box-header with-border">
-                        @foreach ($models as $model)
-                            <span class="box-title"><strong>{{ $model->display_name }}</strong> ({{ $model->model_number }})</span><br />
-                        @endforeach
+                        <div class="box-title"><i class="fa fa-warning"></i> You are about to edit the following: </div>
                     </div>
                     <div class="box-body">
-                        <!-- manufacturer -->
-                        @include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id'])
-
-                        <!-- category -->
-                        @include ('partials.forms.edit.category-select', ['translated_name' => trans('admin/categories/general.category_name'), 'fieldname' => 'category_id', 'required' => 'true', 'category_type' => 'asset'])
-
-                        <!-- custom fields -->
-                        <div class="form-group {{ $errors->has('fieldset_id') ? ' has-error' : '' }}">
-                            <label for="category_id" class="col-md-3 control-label">
-                                {{ trans('admin/models/general.fieldset') }}
-                            </label>
-                            <div class="col-md-7">
-                                {{ Form::select('fieldset_id', $fieldset_list , old('fieldset_id', 'NC'), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px')) }}
-                                {!! $errors->first('fieldset_id', '<span class="alert-msg" aria-hidden="true"><br><i class="fa fa-times"></i> :message</span>') !!}
-                            </div>
-                        </div>
-
-                        <!-- depreciation -->
-
-                        <div class="form-group {{ $errors->has('depreciation_id') ? ' has-error' : '' }}">
-                            <label for="category_id" class="col-md-3 control-label">
-                                {{ trans('general.depreciation') }}
-                            </label>
-                            <div class="col-md-7">
-                                {{ Form::select('depreciation_id', $depreciation_list , old('depreciation_id', 'NC'), array('class'=>'select2', 'style'=>'width:350px')) }}
-                                {!! $errors->first('depreciation_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
-                            </div>
-                        </div>
 
+                        <table class="table">
+                            <tbody>
                         @foreach ($models as $model)
-                            <input type="hidden" name="ids[{{ $model->id }}]" value="{{ $model->id }}">
+
+                            <tr{!!  (($model->assets_count > 0 ) ? ' class="warning"' : ' class="success"') !!}>
+                                    <td>
+                                        <i class="fa {!!  (($model->assets_count > 0 ) ? 'fa-warning info' : 'fa-check success') !!}"></i>
+                                        {{ $model->display_name }}  ({{ $model->model_number }})
+                                        </td>
+                                        <td>{{ $model->assets_count }} assets
+                                    </td>
+                            </tr>
+
                         @endforeach
+                        </table>
+
+                        <div class="col-md-12" style="padding-top: 20px;">
+                            <!-- manufacturer -->
+                            @include ('partials.forms.edit.manufacturer-select', ['translated_name' => trans('general.manufacturer'), 'fieldname' => 'manufacturer_id'])
+
+                            <!-- category -->
+                            @include ('partials.forms.edit.category-select', ['translated_name' => trans('admin/categories/general.category_name'), 'fieldname' => 'category_id', 'required' => 'true', 'category_type' => 'asset'])
+
+                            <!-- custom fields -->
+                            <div class="form-group {{ $errors->has('fieldset_id') ? ' has-error' : '' }}">
+                                <label for="category_id" class="col-md-3 control-label">
+                                    {{ trans('admin/models/general.fieldset') }}
+                                </label>
+                                <div class="col-md-7">
+                                    {{ Form::select('fieldset_id', $fieldset_list , old('fieldset_id', 'NC'), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px')) }}
+                                    {!! $errors->first('fieldset_id', '<span class="alert-msg" aria-hidden="true"><br><i class="fa fa-times"></i> :message</span>') !!}
+                                </div>
+                            </div>
+
+                            <!-- depreciation -->
+
+                            <div class="form-group {{ $errors->has('depreciation_id') ? ' has-error' : '' }}">
+                                <label for="category_id" class="col-md-3 control-label">
+                                    {{ trans('general.depreciation') }}
+                                </label>
+                                <div class="col-md-7">
+                                    {{ Form::select('depreciation_id', $depreciation_list , old('depreciation_id', 'NC'), array('class'=>'select2', 'style'=>'width:350px')) }}
+                                    {!! $errors->first('depreciation_id', '<span class="alert-msg" aria-hidden="true"><i class="fa fa-times" aria-hidden="true"></i> :message</span>') !!}
+                                </div>
+                            </div>
+
+                            @foreach ($models as $model)
+                                <input type="hidden" name="ids[{{ $model->id }}]" value="{{ $model->id }}">
+                            @endforeach
+                        </div>
                     </div> <!--/.box-body-->
 
                     <div class="box-footer text-right">

resources/views/models/custom_fields_form.blade.php

@@ -21,11 +21,23 @@
 
                       <div>
                           <label>
-                              <input type="checkbox" value="1" name="{{ $field->db_column_name() }}[]" class="minimal" {{ Request::old($field->db_column_name()) != '' ? ' checked="checked"' : '' }}> key: {{ $key }} value: {{ $value }}
+                              <input type="checkbox" value="1" name="{{ $field->db_column_name() }}[]" class="minimal" {{ Request::old($field->db_column_name()) != '' ? ' checked="checked"' : '' }}>
+                              {{ $value }}
                           </label>
                       </div>
                   @endforeach
 
+              @elseif ($field->element=='radio')
+              @foreach ($field->formatFieldValuesAsArray() as $value)
+
+              <div>
+                  <label>
+                      <input type="radio" value="{{ $value }}" name="{{ $field->db_column_name() }}" class="minimal" {{ isset($item) ? ($item->{$field->db_column_name()} == $value ? ' checked="checked"' : '') : (Request::old($field->db_column_name()) != '' ? ' checked="checked"' : '') }}>
+                      {{ $value }}
+                  </label>
+              </div>
+          @endforeach
+
               @endif
 
 

resources/views/models/index.blade.php

@@ -83,7 +83,7 @@
               <th data-sortable="true" data-field="model_number">{{ trans('admin/models/table.modelnumber') }}</th>
               <th data-sortable="true" data-field="assets_count">{{ trans('admin/models/table.numassets') }}</th>
               <th data-sortable="false" data-field="depreciation" data-formatter="depreciationsLinkObjFormatter">{{ trans('general.depreciation') }}</th>
-              <th data-sortable="false" data-field="category" data-formatter="categoriesLinkObjFormatter">{{ trans('general.category') }}</th>
+              <th data-sortable="true" data-field="category" data-formatter="categoriesLinkObjFormatter">{{ trans('general.category') }}</th>
               <th data-sortable="true" data-field="eol">{{ trans('general.eol') }}</th>
               <th data-sortable="false" data-field="fieldset" data-formatter="fieldsetsLinkObjFormatter">{{ trans('admin/models/general.fieldset') }}</th>
               <th data-sortable="true" data-field="notes">{{ trans('general.notes') }}</th>