mirror of
https://github.com/snipe/snipe-it.git
synced 2025-10-29 11:21:21 +00:00
Merge remote-tracking branch 'origin/develop'
# Conflicts: # public/css/build/app.css # public/css/build/app.css.map # public/css/build/overrides.css # public/css/build/overrides.css.map # public/css/dist/all.css # public/css/dist/skins/_all-skins.css # public/css/dist/skins/_all-skins.css.map # public/css/dist/skins/_all-skins.min.css # public/css/dist/skins/skin-contrast.css # public/css/dist/skins/skin-contrast.css.map # public/css/dist/skins/skin-contrast.min.css # public/mix-manifest.json
This commit is contained in:
commit
87fe9d9d3d
@ -195,6 +195,10 @@ class IconHelper
|
||||
case 'note':
|
||||
case 'notes':
|
||||
return 'fas fa-sticky-note';
|
||||
case 'tip':
|
||||
return 'fa-solid fa-lightbulb';
|
||||
case 'highlight':
|
||||
return 'fa-solid fa-highlighter';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
public/css/dist/all.css
vendored
2
public/css/dist/all.css
vendored
File diff suppressed because one or more lines are too long
2
public/css/dist/skins/_all-skins.css
vendored
2
public/css/dist/skins/_all-skins.css
vendored
File diff suppressed because one or more lines are too long
2
public/css/dist/skins/_all-skins.css.map
vendored
2
public/css/dist/skins/_all-skins.css.map
vendored
File diff suppressed because one or more lines are too long
2
public/css/dist/skins/_all-skins.min.css
vendored
2
public/css/dist/skins/_all-skins.min.css
vendored
File diff suppressed because one or more lines are too long
2
public/css/dist/skins/skin-contrast.css
vendored
2
public/css/dist/skins/skin-contrast.css
vendored
@ -1,3 +1,3 @@
|
||||
.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{background:#1a2226;color:#4b646f}.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{background:#1e282c;border-left-color:#001f3f;color:#fff}.skin-contrast .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.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:1px solid #374850;border-radius:3px;margin:10px}.skin-contrast .sidebar-form .btn,.skin-contrast .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-contrast .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.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{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-contrast.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-default:link:hover,.btn .btn-default:link:visited,.btn.btn-default:hover,.btn.btn-default:visited,.btn:hover .btn-default:link:hover,.btn:hover .btn-default:link:visited,.btn:hover.btn-default:hover,.btn:hover.btn-default:visited{color:#00060c}.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.btn.btn-link.text-left{border:1px solid #000;color:#001f3f}a,a.btn.btn-link.text-left:hover,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-decoration:none}.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:#23536f!important}.fixed-table-container tbody .selected td{background-color:#fff8af}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
|
||||
.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{background:#1a2226;color:#4b646f}.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{background:#1e282c;border-left-color:#001f3f;color:#fff}.skin-contrast .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.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:1px solid #374850;border-radius:3px;margin:10px}.skin-contrast .sidebar-form .btn,.skin-contrast .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-contrast .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.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{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-contrast.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-default:link:hover,.btn .btn-default:link:visited,.btn.btn-default:hover,.btn.btn-default:visited,.btn:hover .btn-default:link:hover,.btn:hover .btn-default:link:visited,.btn:hover.btn-default:hover,.btn:hover.btn-default:visited{color:#00060c}.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.btn.btn-link.text-left{border:1px solid #000;color:#001f3f}a,a.btn.btn-link.text-left:hover,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-decoration:none}.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:#23536f!important}.fixed-table-container tbody .selected td{background-color:#fff8af}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
|
||||
|
||||
/*# sourceMappingURL=skin-contrast.css.map*/
|
||||
2
public/css/dist/skins/skin-contrast.css.map
vendored
2
public/css/dist/skins/skin-contrast.css.map
vendored
File diff suppressed because one or more lines are too long
2
public/css/dist/skins/skin-contrast.min.css
vendored
2
public/css/dist/skins/skin-contrast.min.css
vendored
@ -1 +1 @@
|
||||
.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{background:#1a2226;color:#4b646f}.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{background:#1e282c;border-left-color:#001f3f;color:#fff}.skin-contrast .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.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:1px solid #374850;border-radius:3px;margin:10px}.skin-contrast .sidebar-form .btn,.skin-contrast .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-contrast .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.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{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-contrast.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-default:link:hover,.btn .btn-default:link:visited,.btn.btn-default:hover,.btn.btn-default:visited,.btn:hover .btn-default:link:hover,.btn:hover .btn-default:link:visited,.btn:hover.btn-default:hover,.btn:hover.btn-default:visited{color:#00060c}.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.btn.btn-link.text-left{border:1px solid #000;color:#001f3f}a,a.btn.btn-link.text-left:hover,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-decoration:none}.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:#23536f!important}.fixed-table-container tbody .selected td{background-color:#fff8af}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
|
||||
.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{background:#1a2226;color:#4b646f}.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{background:#1e282c;border-left-color:#001f3f;color:#fff}.skin-contrast .sidebar-menu>li>.treeview-menu{background:#2c3b41;margin:0 1px}.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:1px solid #374850;border-radius:3px;margin:10px}.skin-contrast .sidebar-form .btn,.skin-contrast .sidebar-form input[type=text]{background-color:#374850;border:1px solid transparent;box-shadow:none;height:35px;transition:all .3s ease-in-out}.skin-contrast .sidebar-form input[type=text]{border-bottom-left-radius:2px;border-bottom-right-radius:0;border-top-left-radius:2px;border-top-right-radius:0;color:#666}.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{border-bottom-left-radius:0;border-bottom-right-radius:2px;border-top-left-radius:0;border-top-right-radius:2px;color:#999}.skin-contrast.layout-top-nav .main-header>.logo .logo-variant{background-color:none}.btn .btn-default:link:hover,.btn .btn-default:link:visited,.btn.btn-default:hover,.btn.btn-default:visited,.btn:hover .btn-default:link:hover,.btn:hover .btn-default:link:visited,.btn:hover.btn-default:hover,.btn:hover.btn-default:visited{color:#00060c}.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.btn.btn-link.text-left{border:1px solid #000;color:#001f3f}a,a.btn.btn-link.text-left:hover,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-decoration:none}.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:#23536f!important}.fixed-table-container tbody .selected td{background-color:#fff8af}.search-highlight,.search-highlight:hover{background-color:#e9d15b}
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
{
|
||||
"/js/dist/all.js": "/js/dist/all.js?id=5c191843e0bb9292ec6b7f0a3c5765b3",
|
||||
"/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=bf1a348eae3e60c62b8879953f7df14c",
|
||||
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=d796e2b113d8fe2d80d3f991fe2cfd97",
|
||||
"/css/build/overrides.css": "/css/build/overrides.css?id=3f6ab7e6902cca7d96e637b82dc95e65",
|
||||
"/css/build/app.css": "/css/build/app.css?id=5876cf8fb09a66f8f9e0b2472c9cc9f8",
|
||||
"/css/dist/skins/_all-skins.css": "/css/dist/skins/_all-skins.css?id=f712d11cfca345b58c1d8a35df03d38d",
|
||||
"/css/build/overrides.css": "/css/build/overrides.css?id=a4f95b2cd50d7a042bfe7abfd229e8a4",
|
||||
"/css/build/app.css": "/css/build/app.css?id=203a9c485f15a835b74c31d6267cbe5f",
|
||||
"/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=bdf169bc2141f453390614c138cdce95",
|
||||
"/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=e1e6e1c64cf14fc350585aaeb0e42f6b",
|
||||
"/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=08ae1b3e66008966ce5d600ea3ad04a2",
|
||||
@ -15,11 +15,11 @@
|
||||
"/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=71905ff04c78d92dc6f0b8354b458ffd",
|
||||
"/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=d68df5bc23ddddc710f7acf2201b2caf",
|
||||
"/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=436c77b84b2797f9683a7cdc4f8f6b8d",
|
||||
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=f4ca71713136e566279bd5e4de60f4b2",
|
||||
"/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=fbd34e1e2d119358e781195c3fe26b69",
|
||||
"/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=68a92d85c8e351dfb38a835307f126ec",
|
||||
"/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=cbb20ad6182b658f34117bf96a621b63",
|
||||
"/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=84e2ee950ae04444988b37038e5a3951",
|
||||
"/css/dist/all.css": "/css/dist/all.css?id=88a000a091cb26a138368945df92ab83",
|
||||
"/css/dist/all.css": "/css/dist/all.css?id=91a0e92398aae9902ffb0f74a7fd95f1",
|
||||
"/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
|
||||
"/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
|
||||
"/js/select2/i18n/af.js": "/js/select2/i18n/af.js?id=4f6fcd73488ce79fae1b7a90aceaecde",
|
||||
@ -93,12 +93,12 @@
|
||||
"/js/dist/bootstrap-table-locale-all.min.js": "/js/dist/bootstrap-table-locale-all.min.js?id=d300041b9e5038b45b68e036add83be4",
|
||||
"/js/dist/bootstrap-table-en-US.min.js": "/js/dist/bootstrap-table-en-US.min.js?id=6d0de12d91548ba2cd80b868838ce5fa",
|
||||
"/js/dist/Chart.min.js": "/js/dist/Chart.min.js?id=9b1ae20c4c7048d6e4a1b2e1aee7fb31",
|
||||
"/css/dist/skins/_all-skins.min.css": "/css/dist/skins/_all-skins.min.css?id=d796e2b113d8fe2d80d3f991fe2cfd97",
|
||||
"/css/dist/skins/_all-skins.min.css": "/css/dist/skins/_all-skins.min.css?id=f712d11cfca345b58c1d8a35df03d38d",
|
||||
"/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=bf1a348eae3e60c62b8879953f7df14c",
|
||||
"/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=84e2ee950ae04444988b37038e5a3951",
|
||||
"/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=cbb20ad6182b658f34117bf96a621b63",
|
||||
"/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=68a92d85c8e351dfb38a835307f126ec",
|
||||
"/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=f4ca71713136e566279bd5e4de60f4b2",
|
||||
"/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=fbd34e1e2d119358e781195c3fe26b69",
|
||||
"/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=436c77b84b2797f9683a7cdc4f8f6b8d",
|
||||
"/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=d68df5bc23ddddc710f7acf2201b2caf",
|
||||
"/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=71905ff04c78d92dc6f0b8354b458ffd",
|
||||
|
||||
@ -1264,4 +1264,34 @@ caption.tableCaption {
|
||||
|
||||
input[name="columnsSearch"] {
|
||||
width: 120px;
|
||||
}
|
||||
}
|
||||
|
||||
.callout.callout-legend {
|
||||
background-color: #f4f4f4;
|
||||
border-left: 5px solid #959495;
|
||||
padding: 15px 30px 15px 15px;
|
||||
font-size: 100%;
|
||||
border-radius: 0px;
|
||||
}
|
||||
|
||||
.callout.callout-legend h4 {
|
||||
font-size: 16px;
|
||||
font-weight: bold;
|
||||
margin-top: 5px;
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
.callout.callout-legend a {
|
||||
color: #333333;
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
p.callout-subtext {
|
||||
margin-top: 5px;
|
||||
}
|
||||
|
||||
p.callout-subtext a:hover, p.callout-subtext a:visited, p.callout-subtext a:link {
|
||||
color: #31708f;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
@ -157,7 +157,7 @@ a.btn {
|
||||
color: #FFF!important;
|
||||
}
|
||||
|
||||
btn-success {
|
||||
.btn-success {
|
||||
background-color: darken(@green, 30%);
|
||||
}
|
||||
|
||||
@ -181,6 +181,7 @@ input::-ms-input-placeholder { /* IE 10+ */
|
||||
background-color: darken(@blue, 20%)!important;
|
||||
}
|
||||
|
||||
|
||||
.fixed-table-container tbody .selected td {
|
||||
background-color: #fff8af;
|
||||
}
|
||||
|
||||
@ -67,4 +67,5 @@ return [
|
||||
'checkbox' => 'Checkbox',
|
||||
'radio' => 'Radio Buttons',
|
||||
],
|
||||
'general_help_text' => 'Custom fields store additional information not covered by the default asset fields. <a href="https://snipe-it.readme.io/docs/custom-fields#/"><i class="fa fa-external-link"></i></a>.',
|
||||
];
|
||||
|
||||
@ -18,7 +18,7 @@ return [
|
||||
'alert_email' => 'Send alerts to',
|
||||
'alert_email_help' => 'Email addresses or distribution lists you want alerts to be sent to, comma separated.',
|
||||
'alerts_enabled' => 'Email Alerts Enabled',
|
||||
'alert_interval' => 'Expiring Alerts Threshold (in days)',
|
||||
'alert_interval' => 'Expiring Alerts Threshold',
|
||||
'alert_inv_threshold' => 'Inventory Alert Threshold',
|
||||
'allow_user_skin' => 'Allow User Skin',
|
||||
'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.',
|
||||
@ -94,10 +94,12 @@ return [
|
||||
'ldap_settings' => 'LDAP Settings',
|
||||
'ldap_client_tls_cert_help' => 'Client-Side TLS Certificate and Key for LDAP connections are usually only useful in Google Workspace configurations with "Secure LDAP." Both are required.',
|
||||
'ldap_location' => 'LDAP Location Field',
|
||||
'ldap_location_help' => 'The LDAP Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
|
||||
'ldap_location_help' => 'The LDAP Location field should be used if <strong>an OU is not being used in the Base Bind DN.</strong> Leave this blank if an OU search is being used.',
|
||||
'ldap_login_test_help' => 'Enter a valid LDAP username and password from the base DN you specified above to test whether your LDAP login is configured correctly. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
|
||||
'ldap_login_sync_help' => 'This only tests that LDAP can sync and that your fields are mapped correctly. If your LDAP Authentication query is not correct, users may still not be able to login. YOU MUST SAVE YOUR UPDATED LDAP SETTINGS FIRST.',
|
||||
'ldap_manager' => 'LDAP Manager Field',
|
||||
'ldap_mapping_help' => 'If your fields are not syncing correctly, try using the <strong>lower-case version</strong> of the field names. Display Name (<code>displayName</code>) in your LDAP/AD should be mapped here as <code>displayname</code>, <code>givenName</code> should be <code>givenname</code>, <code>sAMAccountName</code> as <code>samaccountname</code>, etc. <a href="https://snipe-it.readme.io/docs/ldap-sync-login#field-mapping-for-syncing"><i class="fa fa-external-link"></i></a>',
|
||||
'save_ldap_first' => 'You must save your LDAP settings before testing. Save your settings on this page and then reload to test LDAP login and/or sync.',
|
||||
'ldap_server' => 'LDAP Server',
|
||||
'ldap_server_help' => 'This should start with ldap:// (for unencrypted) or ldaps:// (for TLS or SSL)',
|
||||
'ldap_server_cert' => 'LDAP SSL certificate validation',
|
||||
@ -487,6 +489,7 @@ return [
|
||||
'server' => 'Server Settings',
|
||||
'scoping' => 'Scoping',
|
||||
'security' => 'Security Preferences',
|
||||
'passwords' => 'Password Security Preferences',
|
||||
],
|
||||
|
||||
|
||||
|
||||
@ -55,7 +55,6 @@
|
||||
|
||||
|
||||
<fieldset name="login" aria-label="login">
|
||||
<legend></legend>
|
||||
|
||||
<div class="form-group{{ $errors->has('username') ? ' has-error' : '' }}">
|
||||
<label for="username">
|
||||
|
||||
5
resources/views/blade/form-legend-help.blade.php
Normal file
5
resources/views/blade/form-legend-help.blade.php
Normal file
@ -0,0 +1,5 @@
|
||||
<!-- Form Legend Help Component -->
|
||||
<p class="callout-subtext">
|
||||
<x-icon type="tip" class="text-info" />
|
||||
{!! $slot !!}
|
||||
</p>
|
||||
15
resources/views/blade/form-legend.blade.php
Normal file
15
resources/views/blade/form-legend.blade.php
Normal file
@ -0,0 +1,15 @@
|
||||
@props([
|
||||
'help_text' => null,
|
||||
])
|
||||
<!-- Form Legend Component -->
|
||||
<legend class="callout callout-legend">
|
||||
<h4>
|
||||
{{ $slot }}
|
||||
</h4>
|
||||
|
||||
@if ($help_text)
|
||||
<x-form-legend-help>
|
||||
{!! $help_text !!}
|
||||
</x-form-legend-help>
|
||||
@endif
|
||||
</legend>
|
||||
@ -38,7 +38,7 @@
|
||||
<!-- Qty -->
|
||||
<div class="form-group {{ $errors->has('checkin_qty') ? 'error' : '' }}">
|
||||
<label for="checkin_qty" class="col-md-2 control-label">{{ trans('general.qty') }}</label>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<input type="text" class="form-control" name="checkin_qty" aria-label="checkin_qty" value="{{ old('assigned_qty', $component_assets->assigned_qty) }}">
|
||||
</div>
|
||||
<div class="col-md-9 col-md-offset-2">
|
||||
|
||||
@ -196,7 +196,7 @@
|
||||
<label for="warranty_months" class="col-md-3 control-label">
|
||||
{{ trans('admin/hardware/form.warranty') }}
|
||||
</label>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<div class="input-group">
|
||||
<input class="col-md-3 form-control" maxlength="4" type="text" name="warranty_months" id="warranty_months" value="{{ old('warranty_months') }}" />
|
||||
<span class="input-group-addon">{{ trans('admin/hardware/form.months') }}</span>
|
||||
|
||||
@ -103,12 +103,12 @@
|
||||
|
||||
<fieldset name="optional-details">
|
||||
|
||||
<legend class="highlight">
|
||||
<x-form-legend>
|
||||
<a id="optional_info">
|
||||
<x-icon type="caret-right" id="optional_info_icon" />
|
||||
{{ trans('admin/hardware/form.optional_infos') }}
|
||||
</a>
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<div id="optional_details" class="col-md-12" style="display:none">
|
||||
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/hardware/form.name')])
|
||||
@ -137,12 +137,12 @@
|
||||
|
||||
<div class="col-md-12 col-sm-12">
|
||||
<fieldset name="order-info">
|
||||
<legend class="highlight">
|
||||
<x-form-legend>
|
||||
<a id="order_info">
|
||||
<x-icon type="caret-right" id="order_info_icon" />
|
||||
{{ trans('admin/hardware/form.order_details') }}
|
||||
</a>
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<div id='order_details' class="col-md-12" style="display:none">
|
||||
@include ('partials.forms.edit.order_number')
|
||||
|
||||
@ -112,7 +112,7 @@
|
||||
<!-- Purchase Order -->
|
||||
<div class="form-group {{ $errors->has('purchase_order') ? ' has-error' : '' }}">
|
||||
<label for="purchase_order" class="col-md-3 control-label">{{ trans('admin/licenses/form.purchase_order') }}</label>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<input class="form-control" type="text" name="purchase_order" id="purchase_order" value="{{ old('purchase_order', $item->purchase_order) }}" maxlength="191" />
|
||||
{!! $errors->first('purchase_order', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
|
||||
</div>
|
||||
|
||||
@ -157,7 +157,7 @@
|
||||
<!-- Asset Maintenance Cost -->
|
||||
<div class="form-group {{ $errors->has('cost') ? ' has-error' : '' }}">
|
||||
<label for="cost" class="col-md-3 control-label">{{ trans('admin/maintenances/form.cost') }}</label>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon">
|
||||
@if (($item->asset) && ($item->asset->location) && ($item->asset->location->currency!=''))
|
||||
|
||||
@ -1,10 +1,12 @@
|
||||
@if (($model) && ($model->fieldset) && $model->fieldset->displayAnyFieldsInForm($show_custom_fields_type ?? ''))
|
||||
<div class="col-md-12 col-sm-12">
|
||||
|
||||
<fieldset name="custom-fields" class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset name="custom-fields">
|
||||
<x-form-legend
|
||||
help_text="{!! trans('admin/custom_fields/general.general_help_text') !!}">
|
||||
|
||||
{{ trans('admin/custom_fields/general.custom_fields') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
@foreach($model->fieldset->fields as $field)
|
||||
@if (!isset($show_custom_fields_type) || ($field->displayFieldInCurrentForm($show_custom_fields_type)))
|
||||
|
||||
@ -13,10 +13,10 @@
|
||||
@endforeach
|
||||
|
||||
@if ($anyModelHasCustomFields > 0)
|
||||
<fieldset name="custom-fields" class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset name="custom-fields"">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/custom_fields/general.custom_fields') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
@endif
|
||||
|
||||
@foreach($models as $model)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
<!-- {{ $logoVariable }}logo image upload -->
|
||||
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label {!! $errors->has($logoVariable) ? 'class="alert-msg"' : '' !!} for="{{ $logoVariable }}">
|
||||
{{ trans($logoLabel) }}
|
||||
</label>
|
||||
|
||||
@ -41,10 +41,10 @@
|
||||
<div class="col-md-12">
|
||||
|
||||
|
||||
<fieldset name="remote-login" class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset name="remote-login"">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.general') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<!-- Menu Alerts Enabled -->
|
||||
<div class="form-group {{ $errors->has('show_alerts_in_menu') ? 'error' : '' }}">
|
||||
@ -68,34 +68,43 @@
|
||||
|
||||
</fieldset>
|
||||
|
||||
<fieldset name="remote-login" class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset name="alert-addresses"">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.email') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<!-- Alert Email -->
|
||||
<div class="form-group {{ $errors->has('alert_email') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="alert_email">{{ trans('admin/settings/general.alert_email') }}</label>
|
||||
</div>
|
||||
<div class="col-md-7">
|
||||
<div class="col-md-8 input-group">
|
||||
<input type="text" name="alert_email" value="{{ old('alert_email', $setting->alert_email) }}" class="form-control" placeholder="admin@yourcompany.com,it@yourcompany.com" maxlength="191">
|
||||
{!! $errors->first('alert_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
|
||||
<span class="input-group-addon">
|
||||
<x-icon type="email" />
|
||||
</span>
|
||||
</div>
|
||||
<div class="col-md-8 col-md-offset-3">
|
||||
<p class="help-block">{{ trans('admin/settings/general.alert_email_help') }}</p>
|
||||
|
||||
{!! $errors->first('alert_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Admin CC Email -->
|
||||
<div class="form-group {{ $errors->has('admin_cc_email') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="admin_cc_email">{{ trans('admin/settings/general.admin_cc_email') }}</label>
|
||||
</div>
|
||||
<div class="col-md-7">
|
||||
<div class="col-md-8 input-group">
|
||||
<input type="email" name="admin_cc_email" value="{{ old('admin_cc_email', $setting->admin_cc_email) }}" class="form-control" placeholder="admin@yourcompany.com" maxlength="191">
|
||||
{!! $errors->first('admin_cc_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
|
||||
<span class="input-group-addon">
|
||||
<x-icon type="email" />
|
||||
</span>
|
||||
</div>
|
||||
<div class="col-md-8 col-md-offset-3">
|
||||
<p class="help-block">{{ trans('admin/settings/general.admin_cc_email_help') }}</p>
|
||||
{!! $errors->first('admin_cc_email', '<span class="alert-msg" aria-hidden="true">:message</span><br>') !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
@ -122,53 +131,55 @@
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<fieldset name="remote-login" class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset name="remote-login"">
|
||||
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.intervals') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
|
||||
<!-- Alert interval -->
|
||||
<div class="form-group {{ $errors->has('alert_interval') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="alert_interval">{{ trans('admin/settings/general.alert_interval') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
<input class="form-control" placeholder="30" maxlength="3" style="width: 70px;" name="alert_interval" type="number" value="{{ old('alert_interval', $setting->alert_interval) }}" id="alert_interval">
|
||||
{!! $errors->first('alert_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Alert threshold -->
|
||||
<!-- Inventory alert threshold -->
|
||||
<div class="form-group {{ $errors->has('alert_threshold') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="alert_threshold">{{ trans('admin/settings/general.alert_inv_threshold') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="5" maxlength="3" style="width: 70px;" name="alert_threshold" type="number" value="{{ old('alert_threshold', $setting->alert_threshold) }}" id="alert_threshold">
|
||||
<input class="form-control" placeholder="5" maxlength="3" style="width: 100px;" name="alert_threshold" type="number" value="{{ old('alert_threshold', $setting->alert_threshold) }}" id="alert_threshold">
|
||||
{!! $errors->first('alert_threshold', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- Audit interval -->
|
||||
<div class="form-group {{ $errors->has('audit_interval') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="audit_interval">{{ trans('admin/settings/general.audit_interval') }}</label>
|
||||
<!-- Inventory alert interval -->
|
||||
<div class="form-group {{ $errors->has('alert_interval') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="alert_interval">{{ trans('admin/settings/general.alert_interval') }}</label>
|
||||
</div>
|
||||
<div class="input-group col-xs-10 col-sm-6 col-md-6 col-lg-3 col-xl-3">
|
||||
<input class="form-control" placeholder="12" maxlength="3" name="audit_interval" type="number" id="audit_interval" value="{{ old('audit_interval', $setting->audit_interval) }}">
|
||||
<span class="input-group-addon">{{ trans('general.months') }}</span>
|
||||
</div>
|
||||
<div class="col-md-8 col-md-offset-3">
|
||||
{!! $errors->first('audit_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||
<p class="help-block">{{ trans('admin/settings/general.audit_interval_help') }}</p>
|
||||
<div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
|
||||
<input class="form-control" placeholder="30" maxlength="3" name="alert_interval" type="number" value="{{ old('alert_interval', $setting->alert_interval) }}" id="alert_interval">
|
||||
<span class="input-group-addon">{{ trans('general.days') }}</span>
|
||||
{!! $errors->first('alert_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Alert threshold -->
|
||||
|
||||
<!-- Due for checkin days -->
|
||||
<div class="form-group {{ $errors->has('due_checkin_days') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="due_checkin_days">{{ trans('admin/settings/general.due_checkin_days') }}</label>
|
||||
</div>
|
||||
<div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
|
||||
<input class="form-control" placeholder="14" maxlength="3" name="due_checkin_days" type="number" id="due_checkin_days" value="{{ old('due_checkin_days', $setting->due_checkin_days) }}">
|
||||
<span class="input-group-addon">{{ trans('general.days') }}</span>
|
||||
</div>
|
||||
<div class="col-md-8 col-md-offset-3">
|
||||
{!! $errors->first('due_checkin_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||
<p class="help-block">{{ trans('admin/settings/general.due_checkin_days_help') }}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Alert warning threshold -->
|
||||
<div class="form-group {{ $errors->has('audit_warning_days') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="audit_warning_days">{{ trans('admin/settings/general.audit_warning_days') }}</label>
|
||||
</div>
|
||||
<div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
|
||||
@ -181,20 +192,23 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Due for checkin days -->
|
||||
<div class="form-group {{ $errors->has('due_checkin_days') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="due_checkin_days">{{ trans('admin/settings/general.due_checkin_days') }}</label>
|
||||
<!-- Audit interval -->
|
||||
<div class="form-group {{ $errors->has('audit_interval') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="audit_interval">{{ trans('admin/settings/general.audit_interval') }}</label>
|
||||
</div>
|
||||
<div class="input-group col-xs-10 col-sm-6 col-md-4 col-lg-3 col-xl-3">
|
||||
<input class="form-control" placeholder="14" maxlength="3" name="due_checkin_days" type="number" id="due_checkin_days" value="{{ old('due_checkin_days', $setting->due_checkin_days) }}">
|
||||
<span class="input-group-addon">{{ trans('general.days') }}</span>
|
||||
<div class="input-group col-xs-10 col-sm-6 col-md-6 col-lg-3 col-xl-3">
|
||||
<input class="form-control" placeholder="12" maxlength="3" name="audit_interval" type="number" id="audit_interval" value="{{ old('audit_interval', $setting->audit_interval) }}">
|
||||
<span class="input-group-addon">{{ trans('general.months') }}</span>
|
||||
</div>
|
||||
<div class="col-md-8 col-md-offset-3">
|
||||
{!! $errors->first('due_checkin_days', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||
<p class="help-block">{{ trans('admin/settings/general.due_checkin_days_help') }}</p>
|
||||
{!! $errors->first('audit_interval', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||
<p class="help-block">
|
||||
{{ trans('admin/settings/general.audit_interval_help') }}
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</fieldset>
|
||||
|
||||
</div>
|
||||
|
||||
@ -51,15 +51,15 @@
|
||||
|
||||
<div class="col-md-12">
|
||||
|
||||
<fieldset name="logo-preferences" class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset name="logo-preferences"">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.logos') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<!-- Site name -->
|
||||
<div class="form-group {{ $errors->has('site_name') ? 'error' : '' }}">
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="site_name">{{ trans('admin/settings/general.site_name') }}</label>
|
||||
</div>
|
||||
<div class="col-md-7 required">
|
||||
@ -81,7 +81,7 @@
|
||||
|
||||
<!-- Branding -->
|
||||
<div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="brand">{{ trans('admin/settings/general.web_brand') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -176,7 +176,7 @@
|
||||
|
||||
<!-- Load gravatar -->
|
||||
<div class="form-group {{ $errors->has('load_remote') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<strong>{{ trans('admin/settings/general.load_remote') }}</strong>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -196,7 +196,7 @@
|
||||
|
||||
<!-- Include logo in print assets -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<strong>{{ trans('admin/settings/general.logo_print_assets') }}</strong>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -211,7 +211,7 @@
|
||||
|
||||
<!-- show urls in emails-->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<strong>{{ trans('admin/settings/general.show_url_in_emails') }}</strong>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -225,14 +225,14 @@
|
||||
</fieldset>
|
||||
<!-- colors and skins -->
|
||||
|
||||
<fieldset name="color-preferences" class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset name="color-preferences"">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.colors') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<!-- Header color -->
|
||||
<div class="form-group {{ $errors->has('header_color') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="header_color">{{ trans('admin/settings/general.header_color') }}</label>
|
||||
</div>
|
||||
<div class="col-md-5 col-xs-5 col-sm-3 col-md-4 col-lg-3 col-xl-3">
|
||||
@ -248,7 +248,7 @@
|
||||
|
||||
<!-- Skin -->
|
||||
<div class="form-group {{ $errors->has('skin') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="skin">{{ trans('general.skin') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -259,7 +259,7 @@
|
||||
|
||||
<!-- Custom css -->
|
||||
<div class="form-group {{ $errors->has('custom_css') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="custom_css">{{ trans('admin/settings/general.custom_css') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -302,14 +302,14 @@
|
||||
|
||||
<!-- colors and skins -->
|
||||
|
||||
<fieldset name="footer-preferences" class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset name="footer-preferences"">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.footer') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<!-- Support Footer -->
|
||||
<div class="form-group {{ $errors->has('support_footer') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="support_footer">{{ trans('admin/settings/general.support_footer') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -343,7 +343,7 @@
|
||||
|
||||
<!-- Version Footer -->
|
||||
<div class="form-group {{ $errors->has('version_footer') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="version_footer">{{ trans('admin/settings/general.version_footer') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -376,7 +376,7 @@
|
||||
|
||||
<!-- Additional footer -->
|
||||
<div class="form-group {{ $errors->has('footer_text') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="footer_text">{{ trans('admin/settings/general.footer_text') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
|
||||
@ -34,10 +34,10 @@
|
||||
|
||||
<div class="col-md-12">
|
||||
|
||||
<fieldset class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.scoping') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
<!-- Full Multiple Companies Support -->
|
||||
<div class="form-group {{ $errors->has('full_multiple_companies_support') ? 'error' : '' }}">
|
||||
<div class="col-md-8 col-md-offset-3">
|
||||
@ -63,14 +63,13 @@
|
||||
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.formats') }}
|
||||
</legend>
|
||||
|
||||
</x-form-legend>
|
||||
<!-- Email domain -->
|
||||
<div class="form-group {{ $errors->has('email_domain') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="email_domain">{{ trans('general.email_domain') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -83,7 +82,7 @@
|
||||
|
||||
<!-- Email format -->
|
||||
<div class="form-group {{ $errors->has('email_format') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="email_format">{{ trans('admin/settings/general.email_formats.email_format') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -99,7 +98,7 @@
|
||||
|
||||
<!-- Username format -->
|
||||
<div class="form-group {{ $errors->has('username_format') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="username_format">{{ trans('admin/settings/general.username_formats.username_format') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -115,10 +114,10 @@
|
||||
</fieldset>
|
||||
|
||||
|
||||
<fieldset class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.profiles') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
<!-- user profile edit checkbox -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-8 col-md-offset-3">
|
||||
@ -131,10 +130,10 @@
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset>
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.eula') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<!-- Require signature for acceptance -->
|
||||
<div class="form-group {{ $errors->has('require_accept_signature') ? 'error' : '' }}">
|
||||
@ -151,7 +150,7 @@
|
||||
|
||||
<!-- Default EULA -->
|
||||
<div class="form-group {{ $errors->has('default_eula_text') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="default_eula_text">{{ trans('admin/settings/general.default_eula_text') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -168,12 +167,14 @@
|
||||
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="bottom-padded">
|
||||
<legend class="highlight">{{ trans('admin/settings/general.legends.misc_display') }}</legend>
|
||||
<fieldset>
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.misc_display') }}
|
||||
</x-form-legend>
|
||||
|
||||
<!-- Thumb Size -->
|
||||
<div class="form-group {{ $errors->has('thumbnail_max_h') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="thumbnail_max_h">{{ trans('admin/settings/general.thumbnail_max_h') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -185,7 +186,7 @@
|
||||
|
||||
<!-- Model List prefs -->
|
||||
<div class="form-group {{ $errors->has('show_in_model_list') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<strong>{{ trans('admin/settings/general.show_in_model_list') }}</strong>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -247,14 +248,14 @@
|
||||
</fieldset>
|
||||
|
||||
|
||||
<fieldset class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset">
|
||||
<x-form-legend>
|
||||
{{ trans('general.email') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<!-- Mail test -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="login_note">{{trans('admin/settings/general.test_mail')}}</label>
|
||||
</div>
|
||||
<div class="col-md-8" id="mailtestrow">
|
||||
@ -291,10 +292,10 @@
|
||||
</fieldset>
|
||||
|
||||
|
||||
<fieldset name="checkin-preferences" class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset name="checkin-preferences"">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.checkin') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<!-- Require Notes on checkin/checkout checkbox -->
|
||||
<div class="form-group">
|
||||
@ -312,14 +313,14 @@
|
||||
|
||||
|
||||
|
||||
<fieldset name="dashboard" class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset name="dashboard">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.dashboard') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<!-- login text -->
|
||||
<div class="form-group {{ $errors->has('login_note') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="login_note">{{ trans('admin/settings/general.login_note') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -338,7 +339,7 @@
|
||||
|
||||
<!-- dash chart -->
|
||||
<div class="form-group {{ $errors->has('dash_chart_type') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="show_in_model_list">{{ trans('general.pie_chart_type') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -353,7 +354,7 @@
|
||||
|
||||
<!-- dashboard text -->
|
||||
<div class="form-group {{ $errors->has('dashboard_message') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="dashboard_message">{{ trans('admin/settings/general.dashboard_message') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -374,14 +375,14 @@
|
||||
</fieldset>
|
||||
|
||||
|
||||
<fieldset class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset>
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.misc') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<!-- Privacy Policy Footer-->
|
||||
<div class="form-group {{ $errors->has('privacy_policy_link') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="privacy_policy_link">{{ trans('admin/settings/general.privacy_policy_link') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -405,7 +406,7 @@
|
||||
|
||||
<!-- Depreciation method -->
|
||||
<div class="form-group {{ $errors->has('depreciation_method') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="depreciation_method">{{ trans('admin/depreciations/general.depreciation_method') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -437,7 +438,7 @@
|
||||
|
||||
<!-- Manager View -->
|
||||
<div class="form-group {{ $errors->has('manager_view_enabled') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<strong>{{ trans('admin/settings/general.manager_view') }}</strong>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
|
||||
@ -421,14 +421,14 @@
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="labels_width" class="control-label">{{ trans('admin/settings/general.label_dimensions') }}</label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<div class="input-group">
|
||||
<input class="form-control" aria-label="labels_width" name="labels_width" type="text" value="{{ old('labels_width', $setting->labels_width) }}" id="labels_width">
|
||||
<div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div>
|
||||
</div>
|
||||
{!! $errors->first('labels_width', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<div class="input-group">
|
||||
<input class="form-control" aria-label="labels_height" name="labels_height" type="text" value="{{ old('labels_height', $setting->labels_height) }}">
|
||||
<div class="input-group-addon">{{ trans('admin/settings/general.height_h') }}</div>
|
||||
@ -441,13 +441,13 @@
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="labels_display_sgutter">{{ trans('admin/settings/general.label_gutters') }}</label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<div class="input-group">
|
||||
<input class="form-control" aria-label="labels_display_sgutter" name="labels_display_sgutter" type="text" value="{{ old('labels_display_sgutter', $setting->labels_display_sgutter) }}" id="labels_display_sgutter">
|
||||
<div class="input-group-addon">{{ trans('admin/settings/general.horizontal') }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<div class="input-group">
|
||||
<input class="form-control" aria-label="labels_display_bgutter" name="labels_display_bgutter" type="text" value="{{ old('labels_display_bgutter', $setting->labels_display_bgutter) }}">
|
||||
<div class="input-group-addon">{{ trans('admin/settings/general.vertical') }}</div>
|
||||
@ -463,7 +463,7 @@
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="labels_pmargin_top">{{ trans('admin/settings/general.page_padding') }}</label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<div class="input-group" style="margin-bottom: 15px;">
|
||||
<input class="form-control" aria-label="labels_pmargin_top" name="labels_pmargin_top" type="text" value="{{ old('labels_pmargin_top', $setting->labels_pmargin_top) }}" id="labels_pmargin_top">
|
||||
<div class="input-group-addon">{{ trans('admin/settings/general.top') }}</div>
|
||||
@ -490,7 +490,7 @@
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="labels_pagewidth" class="control-label">{{ trans('admin/settings/general.page_dimensions') }}</label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<div class="input-group">
|
||||
<input class="form-control" aria-label="labels_pagewidth" name="labels_pagewidth" type="text" value="{{ old('labels_pagewidth', $setting->labels_pagewidth) }}" id="labels_pagewidth">
|
||||
<div class="input-group-addon">{{ trans('admin/settings/general.width_w') }}</div>
|
||||
|
||||
@ -79,13 +79,13 @@
|
||||
|
||||
<div class="col-md-12">
|
||||
|
||||
<fieldset class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset>
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.server') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
<!-- Enable LDAP -->
|
||||
<div class="form-group {{ $errors->has('ldap_integration') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_enabled">{{ trans('admin/settings/general.ldap_integration') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -107,7 +107,7 @@
|
||||
|
||||
<!-- AD Flag -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="is_ad">{{ trans('admin/settings/general.ad') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -133,7 +133,7 @@
|
||||
|
||||
<!-- LDAP Password Sync -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_pw_sync">{{ trans('admin/settings/general.ldap_pw_sync') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -162,7 +162,7 @@
|
||||
|
||||
<!-- AD Domain -->
|
||||
<div class="form-group {{ $errors->has('ad_domain') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ad_domain">{{ trans('admin/settings/general.ad_domain') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -186,7 +186,7 @@
|
||||
|
||||
<!-- LDAP Client-Side TLS key -->
|
||||
<div class="form-group {{ $errors->has('ldap_client_tls_key') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_client_tls_key">
|
||||
{{ trans('admin/settings/general.ldap_client_tls_key') }}
|
||||
</label>
|
||||
@ -215,7 +215,7 @@
|
||||
|
||||
<!-- LDAP Client-Side TLS certificate -->
|
||||
<div class="form-group {{ $errors->has('ldap_client_tls_cert') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_client_tls_cert">{{ trans('admin/settings/general.ldap_client_tls_cert') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -243,7 +243,7 @@
|
||||
|
||||
<!-- LDAP Server -->
|
||||
<div class="form-group {{ $errors->has('ldap_server') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_server">{{ trans('admin/settings/general.ldap_server') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -268,7 +268,7 @@
|
||||
|
||||
<!-- Start TLS -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_tls">{{ trans('admin/settings/general.ldap_tls') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -294,7 +294,7 @@
|
||||
|
||||
<!-- Ignore LDAP Certificate -->
|
||||
<div class="form-group {{ $errors->has('ldap_server_cert_ignore') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_server_cert_ignore">{{ trans('admin/settings/general.ldap_server_cert') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -323,7 +323,7 @@
|
||||
|
||||
<!-- LDAP Username -->
|
||||
<div class="form-group {{ $errors->has('ldap_uname') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_uname">{{ trans('admin/settings/general.ldap_uname') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -346,7 +346,7 @@
|
||||
|
||||
<!-- LDAP pword -->
|
||||
<div class="form-group {{ $errors->has('ldap_pword') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_pword">{{ trans('admin/settings/general.ldap_pword') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -369,7 +369,7 @@
|
||||
|
||||
<!-- LDAP basedn -->
|
||||
<div class="form-group {{ $errors->has('ldap_basedn') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_basedn">{{ trans('admin/settings/general.ldap_basedn') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -392,7 +392,7 @@
|
||||
|
||||
<!-- LDAP filter -->
|
||||
<div class="form-group {{ $errors->has('ldap_filter') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_filter">{{ trans('admin/settings/general.ldap_filter') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -415,7 +415,7 @@
|
||||
|
||||
<!-- LDAP Auth Filter Query -->
|
||||
<div class="form-group {{ $errors->has('ldap_auth_filter_query') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_auth_filter_query">{{ trans('admin/settings/general.ldap_auth_filter_query') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -440,7 +440,7 @@
|
||||
<!-- Default LDAP Permissions Group Select -->
|
||||
|
||||
<div class="form-group{{ $errors->has('group') ? ' has-error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_default_group">{{ trans('admin/settings/general.ldap_default_group') }}</label>
|
||||
</div>
|
||||
|
||||
@ -480,13 +480,17 @@
|
||||
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset>
|
||||
|
||||
<x-form-legend
|
||||
help_text="{!! trans('admin/settings/general.ldap_mapping_help') !!}">
|
||||
{{ trans('admin/settings/general.legends.mapping') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
|
||||
<!-- LDAP username field-->
|
||||
<div class="form-group {{ $errors->has('ldap_username_field') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_username_field">{{ trans('admin/settings/general.ldap_username_field') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -503,7 +507,7 @@
|
||||
|
||||
<!-- LDAP Last Name Field -->
|
||||
<div class="form-group {{ $errors->has('ldap_lname_field') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_lname_field">{{ trans('admin/settings/general.ldap_lname_field') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -520,7 +524,7 @@
|
||||
|
||||
<!-- LDAP First Name field -->
|
||||
<div class="form-group {{ $errors->has('ldap_fname_field') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_fname_field">{{ trans('admin/settings/general.ldap_fname_field') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -537,7 +541,7 @@
|
||||
|
||||
<!-- LDAP Display Name Field -->
|
||||
<div class="form-group {{ $errors->has('ldap_display_name') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_lname_field">{{ trans('admin/settings/general.ldap_display_name') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -553,10 +557,274 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP emp number -->
|
||||
<div class="form-group {{ $errors->has('ldap_emp_num') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_emp_num">{{ trans('admin/settings/general.ldap_emp_num') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'employeenumber/employeeid' }}" name="ldap_emp_num" type="text" id="ldap_emp_num" value="{{ old('ldap_emp_num', $setting->ldap_emp_num) }}">
|
||||
@error('ldap_emp_num')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<!-- LDAP department -->
|
||||
<div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_dept">{{ trans('admin/settings/general.ldap_dept') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'department' }}" name="ldap_dept" type="text" id="ldap_dept" value="{{ old('ldap_dept', $setting->ldap_dept) }}">
|
||||
|
||||
@error('ldap_dept')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<!-- LDAP Manager -->
|
||||
<div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_manager">{{ trans('admin/settings/general.ldap_manager') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder=" {{ trans('general.example') .'manager' }}" name="ldap_manager" type="text" value="{{ old('ldap_manager', $setting->ldap_manager) }}">
|
||||
@error('ldap_manager')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP email -->
|
||||
<div class="form-group {{ $errors->has('ldap_email') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_email">{{ trans('admin/settings/general.ldap_email') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'mail' }}" name="ldap_email" type="text" id="ldap_email" value="{{ old('ldap_email', $setting->ldap_email) }}">
|
||||
@error('ldap_email')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP Phone -->
|
||||
<div class="form-group {{ $errors->has('ldap_phone') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_phone">{{ trans('admin/settings/general.ldap_phone') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'telephonenumber' }}" name="ldap_phone" type="text" id="ldap_phone" value="{{ old('ldap_phone', $setting->ldap_phone_field) }}">
|
||||
@error('ldap_phone')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP Mobile -->
|
||||
<div class="form-group {{ $errors->has('ldap_mobile') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_mobile">{{ trans('admin/settings/general.ldap_mobile') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'mobile' }}" name="ldap_mobile" type="text" id="ldap_mobile" value="{{ old('ldap_mobile', $setting->ldap_mobile) }}">
|
||||
@error('ldap_mobile')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP Job title -->
|
||||
<div class="form-group {{ $errors->has('ldap_jobtitle') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_jobtitle">{{ trans('admin/settings/general.ldap_jobtitle') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'title' }}" name="ldap_jobtitle" type="text" id="ldap_jobtitle" value="{{ old('ldap_jobtitle', $setting->ldap_jobtitle) }}">
|
||||
@error('ldap_jobtitle')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP address -->
|
||||
<div class="form-group {{ $errors->has('ldap_address') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_address">{{ trans('admin/settings/general.ldap_address') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" name="ldap_address" placeholder="{{ trans('general.example') .'streetaddress' }}" type="text" id="ldap_address" value="{{ old('ldap_address', $setting->ldap_address) }}">
|
||||
@error('ldap_address')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP city -->
|
||||
<div class="form-group {{ $errors->has('ldap_city') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_city">{{ trans('admin/settings/general.ldap_city') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'l' }}" name="ldap_city" type="text" id="ldap_city" value="{{ old('ldap_city', $setting->ldap_city) }}">
|
||||
@error('ldap_city')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP state -->
|
||||
<div class="form-group {{ $errors->has('ldap_state') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_state">{{ trans('admin/settings/general.ldap_state') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'st' }}" name="ldap_state" type="text" id="ldap_state" value="{{ old('ldap_state', $setting->ldap_state) }}">
|
||||
@error('ldap_state')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP zip -->
|
||||
<div class="form-group {{ $errors->has('ldap_zip') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_zip">{{ trans('admin/settings/general.ldap_zip') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" name="ldap_zip" type="text" id="ldap_zip" placeholder="{{ trans('general.example') .'postalcode' }}" value="{{ old('ldap_zip', $setting->ldap_zip) }}">
|
||||
@error('ldap_zip')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- LDAP Country -->
|
||||
<div class="form-group {{ $errors->has('ldap_country') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_country">{{ trans('admin/settings/general.ldap_country') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'co' }}" name="ldap_country" type="text" id="ldap_country" value="{{ old('ldap_country', $setting->ldap_country) }}">
|
||||
@error('ldap_country')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP Location -->
|
||||
<div class="form-group {{ $errors->has('ldap_location') ? 'error' : '' }}">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_location">{{ trans('admin/settings/general.ldap_location') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'physicaldeliveryofficename' }}" name="ldap_location" type="text" id="ldap_location" value="{{ old('ldap_location', $setting->ldap_location) }}">
|
||||
<p class="help-block">{!! trans('admin/settings/general.ldap_location_help') !!}</p>
|
||||
@error('ldap_location')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP active flag -->
|
||||
<div class="form-group {{ $errors->has('ldap_active_flag') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_active_flag">{{ trans('admin/settings/general.ldap_active_flag') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -581,7 +849,7 @@
|
||||
|
||||
<!-- LDAP invert active flag -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="ldap_invert_active_flag">
|
||||
{{ trans('admin/settings/general.ldap_invert_active_flag') }}
|
||||
</label>
|
||||
@ -611,282 +879,18 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<!-- LDAP emp number -->
|
||||
<div class="form-group {{ $errors->has('ldap_emp_num') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_emp_num">{{ trans('admin/settings/general.ldap_emp_num') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'employeenumber/employeeid' }}" name="ldap_emp_num" type="text" id="ldap_emp_num" value="{{ old('ldap_emp_num', $setting->ldap_emp_num) }}">
|
||||
@error('ldap_emp_num')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<!-- LDAP department -->
|
||||
<div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_dept">{{ trans('admin/settings/general.ldap_dept') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'department' }}" name="ldap_dept" type="text" id="ldap_dept" value="{{ old('ldap_dept', $setting->ldap_dept) }}">
|
||||
|
||||
@error('ldap_dept')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
<!-- LDAP Manager -->
|
||||
<div class="form-group {{ $errors->has('ldap_dept') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_manager">{{ trans('admin/settings/general.ldap_manager') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder=" {{ trans('general.example') .'manager' }}" name="ldap_manager" type="text" value="{{ old('ldap_manager', $setting->ldap_manager) }}">
|
||||
@error('ldap_manager')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP email -->
|
||||
<div class="form-group {{ $errors->has('ldap_email') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_email">{{ trans('admin/settings/general.ldap_email') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'mail' }}" name="ldap_email" type="text" id="ldap_email" value="{{ old('ldap_email', $setting->ldap_email) }}">
|
||||
@error('ldap_email')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP Phone -->
|
||||
<div class="form-group {{ $errors->has('ldap_phone') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_phone">{{ trans('admin/settings/general.ldap_phone') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'telephonenumber' }}" name="ldap_phone" type="text" id="ldap_phone" value="{{ old('ldap_phone', $setting->ldap_phone_field) }}">
|
||||
@error('ldap_phone')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP Mobile -->
|
||||
<div class="form-group {{ $errors->has('ldap_mobile') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_mobile">{{ trans('admin/settings/general.ldap_mobile') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'mobile' }}" name="ldap_mobile" type="text" id="ldap_mobile" value="{{ old('ldap_mobile', $setting->ldap_mobile) }}">
|
||||
@error('ldap_mobile')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP Job title -->
|
||||
<div class="form-group {{ $errors->has('ldap_jobtitle') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_jobtitle">{{ trans('admin/settings/general.ldap_jobtitle') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'title' }}" name="ldap_jobtitle" type="text" id="ldap_jobtitle" value="{{ old('ldap_jobtitle', $setting->ldap_jobtitle) }}">
|
||||
@error('ldap_jobtitle')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP address -->
|
||||
<div class="form-group {{ $errors->has('ldap_address') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_address">{{ trans('admin/settings/general.ldap_address') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" name="ldap_address" placeholder="{{ trans('general.example') .'streetaddress' }}" type="text" id="ldap_address" value="{{ old('ldap_address', $setting->ldap_address) }}">
|
||||
@error('ldap_address')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP city -->
|
||||
<div class="form-group {{ $errors->has('ldap_city') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_city">{{ trans('admin/settings/general.ldap_city') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'l' }}" name="ldap_city" type="text" id="ldap_city" value="{{ old('ldap_city', $setting->ldap_city) }}">
|
||||
@error('ldap_city')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP state -->
|
||||
<div class="form-group {{ $errors->has('ldap_state') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_state">{{ trans('admin/settings/general.ldap_state') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'st' }}" name="ldap_state" type="text" id="ldap_state" value="{{ old('ldap_state', $setting->ldap_state) }}">
|
||||
@error('ldap_state')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP zip -->
|
||||
<div class="form-group {{ $errors->has('ldap_zip') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_zip">{{ trans('admin/settings/general.ldap_zip') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" name="ldap_zip" type="text" id="ldap_zip" placeholder="{{ trans('general.example') .'postalcode' }}" value="{{ old('ldap_zip', $setting->ldap_zip) }}">
|
||||
@error('ldap_zip')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<!-- LDAP Country -->
|
||||
<div class="form-group {{ $errors->has('ldap_country') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_country">{{ trans('admin/settings/general.ldap_country') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'co' }}" name="ldap_country" type="text" id="ldap_country" value="{{ old('ldap_country', $setting->ldap_country) }}">
|
||||
@error('ldap_country')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- LDAP Location -->
|
||||
<div class="form-group {{ $errors->has('ldap_location') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<label for="ldap_location">{{ trans('admin/settings/general.ldap_location') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
<input class="form-control" placeholder="{{ trans('general.example') .'physicaldeliveryofficename' }}" name="ldap_location" type="text" id="ldap_location" value="{{ old('ldap_location', $setting->ldap_location) }}">
|
||||
<p class="help-block">{!! trans('admin/settings/general.ldap_location_help') !!}</p>
|
||||
@error('ldap_location')
|
||||
<span class="alert-msg">
|
||||
<x-icon type="x" />
|
||||
{{ $message }}
|
||||
</span>
|
||||
@enderror
|
||||
|
||||
@if (config('app.lock_passwords')===true)
|
||||
<p class="text-warning">
|
||||
<x-icon type="locked" />
|
||||
{{ trans('general.feature_disabled') }}
|
||||
</p>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<fieldset class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
{{ trans('admin/settings/general.legends.test') }}
|
||||
</legend>
|
||||
<fieldset id="ldap_test_settings">
|
||||
<x-form-legend
|
||||
help_text="{{ trans('admin/settings/general.save_ldap_first') }}">
|
||||
{{ trans('admin/settings/general.legends.test') }}
|
||||
</x-form-legend>
|
||||
@if ($setting->ldap_enabled)
|
||||
|
||||
<!-- LDAP Login test -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="test_ldap_login"> {{trans('admin/settings/general.ldap_test_login')}} </label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -897,7 +901,7 @@
|
||||
<div class="col-md-4">
|
||||
<input type="password" name="ldaptest_password" id="ldaptest_password" class="form-control" placeholder="{{trans('admin/settings/general.ldap_password_placeholder')}}" autocomplete="off" readonly onfocus="this.removeAttribute('readonly');">
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<a class="btn btn-default btn-sm" id="ldaptestlogin" style="margin-right: 10px;">{{ trans('admin/settings/general.ldap_test') }}</a>
|
||||
</div>
|
||||
|
||||
@ -935,21 +939,19 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@endif
|
||||
|
||||
|
||||
</fieldset>
|
||||
|
||||
|
||||
<fieldset class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset>
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.misc') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<!-- LDAP Forgotten password -->
|
||||
<div class="form-group {{ $errors->has('custom_forgot_pass_url') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="custom_forgot_pass_url">{{ trans('admin/settings/general.custom_forgot_pass_url') }}</label>
|
||||
</div>
|
||||
<div class="col-md-8">
|
||||
@ -1236,7 +1238,7 @@
|
||||
|
||||
$("#ldaptestloginicon").html('');
|
||||
$("#ldaptestloginstatus").addClass('text-danger');
|
||||
$("#ldaptestloginicon").html('<i class="fas fa-exclamation-triangle text-danger"></i>');
|
||||
$("#ldaptestloginicon").html('');
|
||||
|
||||
if (data.status == 500) {
|
||||
$('#ldaptestloginstatus').html('{{ trans('admin/settings/message.ldap.500') }}');
|
||||
@ -1244,13 +1246,17 @@
|
||||
|
||||
if (typeof errors !='string') {
|
||||
|
||||
for (i = 0; i < errors.length; i++) {
|
||||
if (errors[i]) {
|
||||
error_text += '<li>Error: ' + errors[i];
|
||||
if (errors.length > 0) {
|
||||
error_text += '<ul style="list-style: none; padding-left: 5px;">';
|
||||
for (i = 0; i < errors.length; i++) {
|
||||
if (errors[i]) {
|
||||
error_text += '<li><i class="fas fa-exclamation-triangle text-danger"></i> Error: ' + errors[i] + '</li>';
|
||||
}
|
||||
}
|
||||
|
||||
error_text += '</ul>';
|
||||
}
|
||||
|
||||
|
||||
} else {
|
||||
error_text = errors;
|
||||
}
|
||||
|
||||
@ -46,7 +46,7 @@
|
||||
|
||||
<!-- Enable SAML -->
|
||||
<div class="form-group{{ $errors->has('saml_integration') ? ' error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<strong>{{ trans('admin/settings/general.saml_integration') }}</strong>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -108,7 +108,7 @@
|
||||
|
||||
<!-- SAML IdP Metadata -->
|
||||
<div class="form-group {{ $errors->has('saml_idp_metadata') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="saml_idp_metadata">{{ trans('admin/settings/general.saml_idp_metadata') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -131,7 +131,7 @@
|
||||
|
||||
<!-- SAML Attribute Mapping Username -->
|
||||
<div class="form-group {{ $errors->has('saml_attr_mapping_username') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="saml_attr_mapping_username">{{ trans('admin/settings/general.saml_attr_mapping_username') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -143,7 +143,7 @@
|
||||
|
||||
<!-- SAML Force Login -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<strong>{{ trans('admin/settings/general.saml_forcelogin_label') }}</strong>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -159,7 +159,7 @@
|
||||
|
||||
<!-- SAML Single Log Out -->
|
||||
<div class="form-group">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<strong>{{ trans('admin/settings/general.saml_slo_label') }}</strong>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -174,7 +174,7 @@
|
||||
|
||||
<!-- SAML Custom Options -->
|
||||
<div class="form-group {{ $errors->has('saml_custom_settings') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="saml_custom_settings">{{ trans('admin/settings/general.saml_custom_settings') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
|
||||
@ -37,14 +37,14 @@
|
||||
|
||||
<div class="col-md-12">
|
||||
|
||||
<fieldset name="password-preferences" class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset name="password-preferences">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.security') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<!-- Two Factor -->
|
||||
<div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="two_factor_enabled">{{ trans('admin/settings/general.two_factor_enabled_text') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -67,9 +67,13 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.legends.passwords') }}
|
||||
</x-form-legend>
|
||||
|
||||
<!-- Min characters -->
|
||||
<div class="form-group {{ $errors->has('pwd_secure_min') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right text-right">
|
||||
<label for="pwd_secure_min">{{ trans('admin/settings/general.pwd_secure_min') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -85,7 +89,7 @@
|
||||
|
||||
<!-- Common Passwords -->
|
||||
<div class="form-group {{ $errors->has('pwd_secure_complexity.*') ? 'error' : '' }}">
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<label for="pwd_secure_complexity">{{ trans('admin/settings/general.pwd_secure_complexity') }}</label>
|
||||
</div>
|
||||
<div class="col-md-9">
|
||||
@ -124,10 +128,10 @@
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
<fieldset name="remote-login" class="bottom-padded">
|
||||
<legend class="highlight">
|
||||
<fieldset name="remote-login">
|
||||
<x-form-legend>
|
||||
{{ trans('admin/settings/general.login_remote_user_text') }}
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
<!-- Remote User Authentication -->
|
||||
<div class="form-group {{ $errors->has('login_remote_user') ? 'error' : '' }}">
|
||||
|
||||
@ -147,7 +151,7 @@
|
||||
{{ trans('admin/settings/general.login_remote_user_enabled_help') }}
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<!-- Use custom remote user header name -->
|
||||
<label for="login_remote_user_header_name">{{ trans('admin/settings/general.login_remote_user_header_name_text') }}</label>
|
||||
</div>
|
||||
@ -158,7 +162,7 @@
|
||||
{{ trans('admin/settings/general.login_remote_user_header_name_help') }}
|
||||
</p>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<!-- Custom logout url to redirect to authentication provider -->
|
||||
<label for="login_remote_user_custom_logout_url">{{ trans('admin/settings/general.login_remote_user_custom_logout_url_text') }}</label>
|
||||
</div>
|
||||
@ -170,7 +174,7 @@
|
||||
</p>
|
||||
</div>
|
||||
@if ($setting->login_remote_user_enabled == '1')
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<!-- Disable other logins mechanism -->
|
||||
<label class="form-control">
|
||||
<input type="checkbox" name="login_common_disabled" value="1" @checked(old('login_common_disabled', $setting->login_common_disabled)) aria-label="login_common_disabled"/>
|
||||
|
||||
@ -322,12 +322,12 @@
|
||||
|
||||
<fieldset name="optional-details">
|
||||
|
||||
<legend class="highlight">
|
||||
<x-form-legend>
|
||||
<a id="optional_user_info">
|
||||
<x-icon type="caret-right" id="optional_user_info_icon" />
|
||||
{{ trans('admin/hardware/form.optional_infos') }}
|
||||
</a>
|
||||
</legend>
|
||||
</x-form-legend>
|
||||
|
||||
<div id="optional_user_details" class="col-md-12" style="display:none">
|
||||
|
||||
@ -537,7 +537,7 @@
|
||||
<!-- Zip -->
|
||||
<div class="form-group{{ $errors->has('zip') ? ' has-error' : '' }}">
|
||||
<label class="col-md-3 control-label" for="zip">{{ trans('general.zip') }}</label>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3 text-right">
|
||||
<input class="form-control" type="text" name="zip" id="zip" value="{{ old('zip', $user->zip) }}" maxlength="10" />
|
||||
{!! $errors->first('zip', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user