Update architect-ui, bootstrap, javascript and css
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
<div class="modal-content">
|
||||
|
||||
<div class="modal-header">
|
||||
<div class="app-logo"><img class="w-50" src="{{ url('img/logo-h-lg.png') }}"></div>
|
||||
<div class="app-logo"><img class="w-50" src="{{ url('images/logo-h-lg.png') }}"></div>
|
||||
</div>
|
||||
|
||||
<div class="modal-body">
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<strong>{{ config('app.version') }}</strong>
|
||||
</li>
|
||||
@if(($x=Config::get('update_available')) && $x->action !== 'current')
|
||||
<li class="nav-item ml-2">
|
||||
<li class="nav-item ms-2">
|
||||
@switch($x->action)
|
||||
@case('unable')
|
||||
<abbr title="Upstream Version Unavailable"><i class="fas fa-exclamation text-alternate"></i></abbr>
|
||||
@@ -36,7 +36,7 @@
|
||||
{{--
|
||||
<li class="nav-item">
|
||||
<a href="javascript:void(0);" class="nav-link">
|
||||
<div class="badge badge-success mr-1 ml-0">
|
||||
<div class="badge badge-success me-1 ms-0">
|
||||
<small>NEW</small>
|
||||
</div>
|
||||
Footer Link
|
||||
@@ -47,4 +47,4 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -17,13 +17,13 @@
|
||||
@isset($page_actions)
|
||||
<div class="page-title-actions">
|
||||
{{--
|
||||
<button type="button" data-toggle="tooltip" title="Example Tooltip" data-placement="bottom" class="btn-shadow mr-3 btn btn-dark">
|
||||
<button type="button" data-bs-toggle="tooltip" title="Example Tooltip" data-bs-placement="bottom" class="btn-shadow me-3 btn btn-dark">
|
||||
<i class="fas fa-star"></i>
|
||||
</button>
|
||||
--}}
|
||||
<div class="d-inline-block dropdown">
|
||||
<button type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn-shadow dropdown-toggle btn btn-info">
|
||||
<span class="btn-icon-wrapper pr-2 opacity-7">
|
||||
<button type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="btn-shadow dropdown-toggle btn btn-info">
|
||||
<span class="btn-icon-wrapper pe-2 opacity-7">
|
||||
<i class="fas fa-business-time fa-w-20"></i>
|
||||
</span>
|
||||
Item Menu
|
||||
@@ -36,7 +36,7 @@
|
||||
<a href="javascript:void(0);" class="nav-link">
|
||||
<i class="nav-link-icon lnr-inbox"></i>
|
||||
<span>Inbox</span>
|
||||
<div class="ml-auto badge badge-pill badge-secondary">86</div>
|
||||
<div class="ms-auto badge rounded-pill bg-secondary">86</div>
|
||||
</a>
|
||||
</li>
|
||||
--}}
|
||||
@@ -46,4 +46,4 @@
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1,51 +1,27 @@
|
||||
<head>
|
||||
<!--
|
||||
=========================================================
|
||||
* ArchitectUI HTML Theme Dashboard - v1.0.0
|
||||
=========================================================
|
||||
* Product Page: https://dashboardpack.com
|
||||
* Copyright 2019 DashboardPack (https://dashboardpack.com)
|
||||
* Licensed under MIT (https://github.com/DashboardPack/architectui-html-theme-free/blob/master/LICENSE)
|
||||
=========================================================
|
||||
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
|
||||
-->
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta http-equiv="Content-Language" content="en">
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
|
||||
<title>{{ config('app.name') }} - @yield('htmlheader_title','🥇 The BEST ldap admin tool!')</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no, shrink-to-fit=no" />
|
||||
|
||||
<meta name="description" content="phpLDAPadmin - A web interface into LDAP data management">
|
||||
<meta name="msapplication-tap-highlight" content="no">
|
||||
<link rel="shortcut icon" href="{{ config('app.favicon','favicon.ico') }}" />
|
||||
|
||||
<!-- CSRF Token -->
|
||||
<meta name="csrf-token" content="{{ csrf_token() }}">
|
||||
|
||||
<title>{{ config('app.name') }} - @yield('htmlheader_title','🥇 The BEST ldap admin tool!')</title>
|
||||
<link rel="shortcut icon" href="{{ config('app.favicon','favicon.ico') }}" />
|
||||
|
||||
<!-- App CSS -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/app.css') }}">
|
||||
|
||||
<!-- Google Font: Source Sans Pro -->
|
||||
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family={{ str_replace(' ','+',config('app.font') ?: 'IBM Plex Sans') }}:wght@300&display=swap">
|
||||
|
||||
<!-- Bootstrap -->
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
|
||||
|
||||
@if(file_exists('css/print.css'))
|
||||
<!-- Printing Modifications -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
|
||||
@endif
|
||||
|
||||
<!-- Fancy Tree -->
|
||||
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jquery.fancytree/2.36.1/skin-xp/ui.fancytree.min.css">
|
||||
|
||||
<!-- Country Flags -->
|
||||
<link rel="stylesheet" href="{{ url('/css/flags16-both.css') }}">
|
||||
<link rel="stylesheet" href="{{ url('/css/flags32-both.css') }}">
|
||||
|
||||
<!-- Theme style -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/architect.min.css') }}">
|
||||
|
||||
<!-- Select 2 -->
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/css/select2.min.css" />
|
||||
<link rel="stylesheet" href="{{ asset('/css/flags/flags16-both.css') }}">
|
||||
<link rel="stylesheet" href="{{ asset('/css/flags/flags32-both.css') }}">
|
||||
|
||||
@if(file_exists('css/fixes.css'))
|
||||
<!-- CSS Fixes -->
|
||||
@@ -56,4 +32,11 @@
|
||||
<!-- Custom CSS -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/custom.css') }}">
|
||||
@endif
|
||||
|
||||
{{--
|
||||
@if(file_exists('css/print.css'))
|
||||
<!-- Printing Modifications -->
|
||||
<link rel="stylesheet" href="{{ asset('/css/print.css') }}">
|
||||
@endif
|
||||
--}}
|
||||
</head>
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
<script src="{{ asset('/js/app.js') }}" type="text/javascript"></script>
|
||||
<!-- bootstrap -->
|
||||
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.2.1/dist/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
|
||||
<!-- Architect -->
|
||||
<script src="{{ asset('/js/architect.min.js') }}"></script>
|
||||
<!-- Select2 -->
|
||||
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
|
||||
<script type="text/javascript" src="{{ asset('/js/vendor.js') }}"></script>
|
||||
<script type="text/javascript" src="{{ asset('/js/manifest.js') }}"></script>
|
||||
<script type="text/javascript" src="{{ asset('/js/app.js') }}"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
// Our CSRF token to each interaction
|
||||
@@ -14,88 +10,11 @@
|
||||
}
|
||||
});
|
||||
|
||||
$.ArchitectSidebarTweak = {};
|
||||
$.ArchitectSidebarTweak.Open = true;
|
||||
$.ArchitectSidebarTweak.ResizeDelay = 1000;
|
||||
|
||||
$.ArchitectSidebarTweak.options = {
|
||||
EnableRemember: true,
|
||||
//Removes the transition after page reload.
|
||||
NoTransitionAfterReload: false
|
||||
};
|
||||
|
||||
// Work out our timezone.
|
||||
const tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
|
||||
|
||||
/**
|
||||
* Open and close the sidebar
|
||||
* @param state
|
||||
* @param addclass
|
||||
*/
|
||||
function sidebaropenclose(state,addclass) {
|
||||
// Dont do anything if the state hasnt changed.
|
||||
if (state == $.ArchitectSidebarTweak.Open) {
|
||||
return;
|
||||
}
|
||||
|
||||
$.ArchitectSidebarTweak.Open = state;
|
||||
|
||||
if (addclass !== 'undefined')
|
||||
if (state)
|
||||
$(".app-container")
|
||||
.removeClass('closed-sidebar');
|
||||
else
|
||||
$(".app-container")
|
||||
.addClass('closed-sidebar');
|
||||
|
||||
$(this).delay($.ArchitectSidebarTweak.ResizeDelay).queue(function() {
|
||||
window.dispatchEvent(new Event('resize'));
|
||||
$(this).dequeue();
|
||||
});
|
||||
}
|
||||
|
||||
$(function () {
|
||||
"use strict";
|
||||
|
||||
// @todo This event were for AdminLTE.
|
||||
$("body").on("collapsed.lte.pushmenu", function(){
|
||||
if($.ArchitectSidebarTweak.options.EnableRemember) {
|
||||
document.cookie = "toggleState=closed;path=/";
|
||||
|
||||
$("body").queue(sidebaropenclose(false));
|
||||
}
|
||||
});
|
||||
|
||||
$("body").on("shown.lte.pushmenu", function(){
|
||||
if($.ArchitectSidebarTweak.options.EnableRemember){
|
||||
document.cookie = "toggleState=opened;path=/";
|
||||
|
||||
$("body").queue(sidebaropenclose(true));
|
||||
}
|
||||
});
|
||||
|
||||
if($.ArchitectSidebarTweak.options.EnableRemember){
|
||||
var re = new RegExp('toggleState' + "=([^;]+)");
|
||||
var value = re.exec(document.cookie);
|
||||
var toggleState = (value != null) ? unescape(value[1]) : null;
|
||||
if(toggleState == 'closed'){
|
||||
if($.ArchitectSidebarTweak.options.NoTransitionAfterReload){
|
||||
$("body").addClass('sidebar-collapse hold-transition').delay(100).queue(function(){
|
||||
$(this).removeClass('hold-transition');
|
||||
});
|
||||
}else{
|
||||
$("body").queue(sidebaropenclose(false,true));
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
</script>
|
||||
|
||||
<!-- Fancy Tree -->
|
||||
<script src="https://code.jquery.com/ui/1.12.1/jquery-ui.min.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.fancytree/2.36.1/jquery.fancytree-all.min.js"></script>
|
||||
|
||||
@if(file_exists('js/custom.js'))
|
||||
<!-- Any Custom JS -->
|
||||
<script src="{{ asset('js/custom.js') }}"></script>
|
||||
@endif
|
||||
@endif
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="app-sidebar sidebar-shadow">
|
||||
<div class="app-header__logo">
|
||||
<div class="logo-src"></div>
|
||||
<div class="header__pane ml-auto">
|
||||
<div class="header__pane ms-auto">
|
||||
<div>
|
||||
<button type="button" class="hamburger close-sidebar-btn hamburger--elastic" data-class="closed-sidebar">
|
||||
<span class="hamburger-box">
|
||||
@@ -29,19 +29,19 @@
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
<div class="scrollbar-sidebar scrollbar-container">
|
||||
<div class="scrollbar-sidebar">
|
||||
<div class="app-sidebar__inner">
|
||||
<ul class="vertical-nav-menu">
|
||||
<li class="app-sidebar__heading">{{ $server ?? __('Server Name') }}</li>
|
||||
<li>
|
||||
<div class="font-icon-wrapper float-left mr-1 server-icon">
|
||||
<div class="font-icon-wrapper float-start me-1 server-icon">
|
||||
<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('info') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-info"></i></a>
|
||||
</div>
|
||||
<div class="font-icon-wrapper float-left ml-1 mr-1 server-icon">
|
||||
<div class="font-icon-wrapper float-start ms-1 me-1 server-icon">
|
||||
<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('schema') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-fingerprint"></i></a>
|
||||
</div>
|
||||
@env(['local'])
|
||||
<div class="font-icon-wrapper float-right ml-1 server-icon">
|
||||
<div class="font-icon-wrapper float-end ms-1 server-icon">
|
||||
<a class="p-0 m-0" href="{{ LaravelLocalization::localizeUrl('debug') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-toolbox"></i></a>
|
||||
</div>
|
||||
@endenv
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<div class="app-header header-shadow bg-dark header-text-light">
|
||||
<div class="app-header__logo">
|
||||
<div class="logo-src"></div>
|
||||
<div class="header__pane ml-auto">
|
||||
<div class="header__pane ms-auto">
|
||||
<div>
|
||||
<button type="button" class="hamburger close-sidebar-btn hamburger--elastic" data-class="closed-sidebar">
|
||||
<span class="hamburger-box">
|
||||
@@ -36,7 +36,7 @@
|
||||
<input type="text" class="search-input" placeholder="Type to search">
|
||||
<button class="search-icon"><span></span></button>
|
||||
</div>
|
||||
<button class="close"></button>
|
||||
<button class="btn-close"></button>
|
||||
</div>
|
||||
|
||||
<ul class="header-menu nav">
|
||||
@@ -52,13 +52,31 @@
|
||||
|
||||
<div class="app-header-right">
|
||||
@if(! request()->isSecure())
|
||||
<span class="badge badge-danger">WARNING - SESSION NOT SECURE</span>
|
||||
<span class="badge bg-danger">WARNING - SESSION NOT SECURE</span>
|
||||
@endif
|
||||
|
||||
<div class="header-btn-lg pr-0">
|
||||
<div class="header-btn-lg pe-0">
|
||||
<div class="widget-content p-0">
|
||||
<div class="widget-content-wrapper">
|
||||
<div class="widget-content-left ml-3 header-user-info">
|
||||
{{--
|
||||
<div class="widget-content-left">
|
||||
<div class="btn-group">
|
||||
<a data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="p-0 btn">
|
||||
<img width="42" class="rounded-circle" src="assets/images/avatars/1.jpg" alt="">
|
||||
<i class="fa fa-angle-down ms-2 opacity-8"></i>
|
||||
</a>
|
||||
<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
|
||||
<button type="button" tabindex="0" class="dropdown-item">User Account</button>
|
||||
<button type="button" tabindex="0" class="dropdown-item">Settings</button>
|
||||
<h6 tabindex="-1" class="dropdown-header">Header</h6>
|
||||
<button type="button" tabindex="0" class="dropdown-item">Actions</button>
|
||||
<div tabindex="-1" class="dropdown-divider"></div>
|
||||
<button type="button" tabindex="0" class="dropdown-item">Dividers</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
--}}
|
||||
<div class="widget-content-left header-user-info ms-3">
|
||||
<div class="widget-heading">
|
||||
{{ $user->exists ? Arr::get($user->getAttribute('cn'),0,'Anonymous') : 'Anonymous' }}
|
||||
</div>
|
||||
@@ -66,22 +84,23 @@
|
||||
{{ $user->exists ? Arr::get($user->getAttribute('mail'),0,'') : '' }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="widget-content-right">
|
||||
|
||||
<div class="widget-content-left">
|
||||
<div class="btn-group">
|
||||
<a data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="p-0 btn">
|
||||
<i class="fas fa-angle-down ml-2 opacity-8"></i>
|
||||
<img width="35" height="35" class="rounded" src="{{ url('user/image') }}" alt="" style="background-color: #eee;padding: 2px;">
|
||||
<a data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="p-0 btn">
|
||||
<i class="fas fa-angle-down ms-2 opacity-8"></i>
|
||||
<img width="35" height="35" class="rounded-circle" src="{{ url('user/image') }}" alt="" style="background-color: #eee;padding: 2px;">
|
||||
</a>
|
||||
<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
|
||||
@if ($user->exists)
|
||||
<h6 tabindex="-1" class="dropdown-header text-center">User Menu</h6>
|
||||
<div tabindex="-1" class="dropdown-divider"></div>
|
||||
<a href="{{ url('logout') }}" tabindex="0" class="dropdown-item">
|
||||
<i class="fas fa-fw fa-sign-out-alt mr-2"></i> Sign Out
|
||||
<i class="fas fa-fw fa-sign-out-alt me-2"></i> Sign Out
|
||||
</a>
|
||||
@else
|
||||
<a href="{{ url('login') }}" tabindex="0" class="dropdown-item">
|
||||
<i class="fas fa-fw fa-sign-in-alt mr-2"></i> Sign In
|
||||
<i class="fas fa-fw fa-sign-in-alt me-2"></i> Sign In
|
||||
</a>
|
||||
@endif
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user