deon/phpldapadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to using icons when rendering a DN, and move the server icons to the topmenu

Browse Source
This commit is contained in:
Deon George 2025-03-04 23:03:42 +11:00
parent 57b6b8c1f1
commit 070aabfc88
11 changed files with 199 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
public/css/custom.css vendored
View File

@ -28,3 +28,48 @@ input.form-control.input-group-end {
border-bottom-right-radius: 4px !important; border-bottom-right-radius: 4px !important;
border-top-right-radius: 4px !important; border-top-right-radius: 4px !important;
} }
.custom-tooltip-warning {
--bs-tooltip-bg: var(--bs-warning);
--bs-tooltip-color: black;
}
.custom-tooltip-danger {
--bs-tooltip-bg: var(--bs-danger);
}
.tooltip {
font-size: 85%;
}
/*
.custom-tooltip-warning .tooltip-inner {
--bs-tooltip-bg: #ffffff;
--bs-tooltip-color: var(--bs-warning);
--bs-font-size: 85%;
border: 2px solid var(--bs-warning);
border-radius: 6px;
}
.custom-tooltip-warning .tooltip-arrow::before {
--bs-tooltip-bg: var(--bs-warning);
}
.custom-tooltip-danger .tooltip-inner {
--bs-tooltip-bg: #ffffff;
--bs-tooltip-color: var(--bs-danger);
--bs-font-size: 85%;
border: 2px solid var(--bs-danger);
border-radius: 6px;
}
.custom-tooltip-danger .tooltip-arrow::before {
--bs-tooltip-bg: var(--bs-danger);
}
*/
/* hide the site icons when the search is opened */
.search-wrapper.active + .header-menu.nav {
display: none;
}

6
public/css/fixes.css vendored
View File

@ -155,12 +155,6 @@ ul.fancytree-container ul {
} }
/** Server icons **/ /** Server icons **/
.closed-sidebar .server-icon {
display: none;
}
.closed-sidebar .app-sidebar:hover .server-icon, .sidebar-mobile-open .server-icon {
display: flex;
}
.font-icon-wrapper { .font-icon-wrapper {
text-align: center; text-align: center;
border: #e9ecef solid 1px; border: #e9ecef solid 1px;

18
resources/themes/architect/views/layouts/partials/contentfooter.blade.php
View File

@ -6,24 +6,6 @@
<li class="nav-item"> <li class="nav-item">
<strong>{{ config('app.version') }}</strong> <strong>{{ config('app.version') }}</strong>
</li> </li>
@if(($x=Config::get('update_available')) && $x->action !== 'current')
<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>
@break
@case('upgrade')
<abbr title="Update Available: {{ $x->version }}"><i class="fas fa-wrench text-danger"></i></abbr>
@break
@case('mismatch')
<abbr title="Version Issue - Upstream {{ $x->version }}"><i class="fas fa-exclamation text-danger"></i></abbr>
@break
@case('unknown')
<abbr title="Version Issue - Upstream {{ $x->version }}"><i class="fas fa-bolt text-alternate"></i></abbr>
@break
@endswitch
</li>
@endif
{{-- {{--
<li class="nav-item"> <li class="nav-item">
<a href="javascript:void(0);" class="nav-link">Footer Link</a> <a href="javascript:void(0);" class="nav-link">Footer Link</a>

90
resources/themes/architect/views/layouts/partials/contentheader.blade.php
View File

@ -13,53 +13,53 @@
</div> </div>
</div> </div>
@if (isset($page_actions) || old()) <div class="page-title-actions">
<div class="page-title-actions"> <div class="row">
<div class="page-title-actions"> <div class="col">
<div class="d-inline-block dropdown"> <div class="action-buttons float-end">
<button type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="dropdown-toggle btn btn-primary"> <ul class="nav">
<span class="btn-icon-wrapper pe-2 opacity-7"> @if(isset($page_actions) && $page_actions->contains('export'))
<i class="fa fa-business-time fa-w-20"></i> <li>
</span> <span data-bs-toggle="modal" data-bs-target="#entry_export-modal">
@lang('Entry Options') <button class="btn btn-outline-dark p-1 m-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Export')"><i class="fas fa-fw fa-download fs-5"></i></button>
</button> </span>
</li>
<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right"> @endif
<ul class="nav flex-column"> @if(isset($page_actions) && $page_actions->contains('copy'))
@if ((isset($page_actions) && $page_actions->contains('edit')) || old()) <li>
<li class="nav-item"> <button class="btn btn-outline-dark p-1 m-1" id="entry-copy-move" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Copy/Move')"><i class="fas fa-fw fa-copy fs-5"></i></button>
<span class="nav-link pt-0 pb-1"> </li>
<button id="entry-edit" class="p-2 m-0 border-0 btn btn-transition btn-outline-dark w-100 text-start"> @endif
<i class="fas fa-fw fa-edit me-2"></i> @lang('Edit') @if((isset($page_actions) && $page_actions->contains('edit')) || old())
</button> <li>
</span> <button class="btn btn-outline-dark p-1 m-1" id="entry-edit" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Edit Entry')"><i class="fas fa-fw fa-edit fs-5"></i></button>
</li> </li>
@endif @endif
@if(isset($page_actions) && $page_actions->contains('delete'))
@if (isset($page_actions) && $page_actions->contains('export')) <li>
<li class="nav-item"> <button class="btn btn-outline-danger p-1 m-1" id="entry-delete" data-bs-custom-class="custom-tooltip-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Delete Entry')"><i class="fas fa-fw fa-trash-can fs-5"></i></button>
<a class="nav-link pt-0 pb-1"> </li>
<button type="button" class="p-2 m-0 border-0 btn btn-transition btn-outline-dark w-100 text-start" data-bs-toggle="modal" data-bs-target="#entry_export-modal"> @endif
<i class="fas fa-fw fa-file-export me-2"></i> @lang('Export') </ul>
</button>
</a>
</li>
@endif
@if (isset($page_actions) && $page_actions->contains('copy'))
<li class="nav-item">
<a class="nav-link pt-0 pb-1">
<button class="p-2 m-0 border-0 btn btn-transition btn-outline-dark w-100 text-start">
<i class="fas fa-fw fa-truck-moving me-2"></i> @lang('Copy or Move')
</button>
</a>
</li>
@endif
</ul>
</div>
</div> </div>
</div> </div>
</div> </div>
@endif </div>
</div> </div>
</div> </div>
@section('page-scripts')
<script type="text/javascript">
$(document).ready(function() {
console.log($('button[id=entry-edit]'));
$('button[id=entry-edit]').on('click',function(item) {
item.preventDefault();
if ($(this).hasClass('btn-dark'))
return;
editmode();
});
});
</script>
@append

52
resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php
View File

@ -33,23 +33,6 @@
<div class="app-sidebar__inner"> <div class="app-sidebar__inner">
<ul class="vertical-nav-menu"> <ul class="vertical-nav-menu">
<li class="app-sidebar__heading">{{ config('server')->name }}</li> <li class="app-sidebar__heading">{{ config('server')->name }}</li>
<li>
<div class="font-icon-wrapper float-start me-1 server-icon">
<a class="p-0 m-0" href="{{ url('info') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-info"></i></a>
</div>
<div class="font-icon-wrapper float-start ms-1 me-1 server-icon">
<a class="p-0 m-0" href="{{ url('schema') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-fingerprint"></i></a>
</div>
<div class="font-icon-wrapper float-start ms-1 me-1 server-icon">
<a class="p-0 m-0" href="{{ url('import') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-upload"></i></a>
</div>
@env(['local'])
<div class="font-icon-wrapper float-end ms-1 server-icon">
<a class="p-0 m-0" href="{{ url('debug') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-toolbox"></i></a>
</div>
@endenv
<div class="clearfix"></div>
</li>
<li> <li>
<i id="treeicon" class="metismenu-icon fa-fw fas fa-sitemap"></i> <i id="treeicon" class="metismenu-icon fa-fw fas fa-sitemap"></i>
<span class="f16" id="tree"></span> <span class="f16" id="tree"></span>
@ -58,38 +41,3 @@
</div> </div>
</div> </div>
</div> </div>
@section('page-scripts')
<script type="text/javascript">
$(document).ready(function() {
$('.server-icon > a').on('click',function(item) {
var content;
$.ajax({
url: $(this).attr('href'),
method: 'GET',
dataType: 'html',
statusCode: {
404: function() {
$('.main-content').empty().append(content);
}
},
beforeSend: function() {
content = $('.main-content').contents();
$('.main-content').empty().append('<div class="fa-3x"><i class="fas fa-spinner fa-pulse"></i></div>');
}
}).done(function(html) {
$('.main-content').empty().append(html);
}).fail(function() {
alert('Well that didnt work?');
});
item.stopPropagation();
return false;
});
});
</script>
@append

101
resources/themes/architect/views/layouts/partials/topmenu.blade.php
View File

@ -39,21 +39,67 @@
<button class="btn-close"></button> <button class="btn-close"></button>
</div> </div>
<ul class="header-menu nav"> <ul class="header-menu nav server-icon">
{{-- <li>
<li class="nav-item"> <button id="link-info" class="btn btn-light p-1 m-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Server Info')" data-link="{{ url('info') }}">
<a href="javascript:void(0);" class="nav-link"> <i class="fas fa-fw fa-info fs-5"></i>
<i class="nav-link-icon fas fa-database"></i> Link </button>
</a> </li>
<li>
<button id="link-schema" class="btn btn-light p-1 m-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Schema Viewer')" data-link="{{ url('schema') }}">
<i class="fas fa-fw fa-fingerprint fs-5"></i>
</button>
</li>
<li>
<button id="link-import" class="btn btn-light p-1 m-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Import')" data-link="{{ url('import') }}">
<i class="fas fa-fw fa-upload fs-5"></i>
</button>
</li>
<li>
<button id="link-debug" class="btn btn-light p-1 m-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Debug')" data-link="{{ url('debug') }}">
<i class="fas fa-fw fa-toolbox fs-5"></i>
</button>
</li> </li>
--}}
</ul> </ul>
</div> </div>
<div class="app-header-right"> <div class="app-header-right">
@if(! request()->isSecure()) <ul class="header-menu nav">
<span class="badge bg-danger">WARNING - SESSION NOT SECURE</span> @if(! request()->isSecure())
@endif <li>
<button class="btn btn-danger p-1 m-1" data-bs-custom-class="custom-tooltip-danger" data-bs-toggle="tooltip" data-bs-placement="bottom" title="WARNING - SESSION NOT SECURE">
<i class="fas fa-fw fa-unlock-keyhole fs-5"></i>
</button>
</li>
@endif
@if(($x=Config::get('update_available')) && $x->action !== 'current')
<li>
@switch($x->action)
@case('unable')
<button class="btn btn-light opacity-2 p-1 m-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Upstream Version Unavailable">
<i class="fas fa-fw fa-bolt fs-5"></i>
</button>
@break
@case('upgrade')
<button class="btn btn-warning p-1 m-1" data-bs-custom-class="custom-tooltip-warning" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-html="true" title="Update Available:<br>{{ $x->version }}">
<i class="fas fa-fw fa-wrench fs-5"></i>
</button>
@break
@case('mismatch')
<button class="btn btn-light opacity-2 p-1 m-1" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-html="true" title="Version Issue - Upstream<br>{{ $x->version }}">
<i class="fas fa-fw fa-exclamation fs-5"></i>
</button>
@break
@case('unknown')
<button class="btn btn-light opacity-2 p-1 m-1" data-bs-toggle="tooltip" data-bs-placement="bottom" data-bs-html="true" title="Version Issue - Unknown<br>{{ $x->version }}">
<i class="fas fa-fw fa-question fs-5"></i>
</button>
@break
@endswitch
</li>
@endif
</ul>
<div class="header-btn-lg pe-0"> <div class="header-btn-lg pe-0">
<div class="widget-content p-0"> <div class="widget-content p-0">
@ -112,3 +158,38 @@
</div> </div>
</div> </div>
</div> </div>
@section('page-scripts')
<script type="text/javascript">
$(document).ready(function() {
$('button[id^="link-"]').on('click',function(item) {
var content;
$.ajax({
url: $(this).data('link'),
method: 'GET',
dataType: 'html',
statusCode: {
404: function() {
$('.main-content').empty().append(content);
}
},
beforeSend: function() {
content = $('.main-content').contents();
$('.main-content').empty().append('<div class="fa-3x"><i class="fas fa-spinner fa-pulse"></i></div>');
}
}).done(function(html) {
$('.main-content').empty().append(html);
}).fail(function() {
alert('Well that didnt work?');
});
item.stopPropagation();
return false;
});
});
</script>
@append

2
resources/views/components/attribute/password.blade.php
View File

@ -22,7 +22,7 @@
<div class="row"> <div class="row">
<div class="offset-1 col-4 p-2"> <div class="offset-1 col-4 p-2">
<span class="p-0 m-0"> <span class="p-0 m-0">
<button type="button" class="btn btn-transition btn-sm btn-outline-dark mt-3" data-bs-toggle="modal" data-bs-target="#userpassword_check-modal"><i class="fas fa-user-check"></i> @lang('Check Password')</button> <button type="button" class="btn btn-sm btn-outline-dark mt-3" data-bs-toggle="modal" data-bs-target="#userpassword_check-modal"><i class="fas fa-user-check"></i> @lang('Check Password')</button>
</span> </span>
</div> </div>
</div> </div>

4
resources/views/frames/create.blade.php
View File

@ -25,7 +25,7 @@
@switch($step) @switch($step)
@case(1) @case(1)
<div class="row"> <div class="row">
<div class="col-12 col-sm-6"> <div class="col-12 col-md-6">
<x-form.select <x-form.select
id="objectclass" id="objectclass"
name="objectclass[]" name="objectclass[]"
@ -54,7 +54,7 @@
</form> </form>
<div class="row d-none pt-3"> <div class="row d-none pt-3">
<div class="col-12 {{ $step > 1 ? 'offset-sm-2' : '' }} col-sm-4 col-lg-2"> <div class="col-12 {{ $step > 1 ? 'offset-sm-2' : '' }} col-lg-10">
<x-form.reset form="dn-create"/> <x-form.reset form="dn-create"/>
<x-form.submit action="Next" form="dn-create"/> <x-form.submit action="Next" form="dn-create"/>
</div> </div>

13
resources/views/frames/dn.blade.php
View File

@ -149,7 +149,9 @@
function editmode() { function editmode() {
$('#dn-edit input[name="dn"]').val(dn); $('#dn-edit input[name="dn"]').val(dn);
$('button[id=entry-edit]').addClass('active').removeClass('btn-outline-dark').addClass('btn-outline-light'); $('button[id=entry-edit]')
.removeClass('btn-outline-dark')
.addClass('btn-dark');
// Find all input items and turn off readonly // Find all input items and turn off readonly
$('input.form-control').each(function() { $('input.form-control').each(function() {
@ -201,15 +203,6 @@
$('#newattr-select').remove(); $('#newattr-select').remove();
}); });
$('button[id=entry-edit]').on('click',function(item) {
item.preventDefault();
if ($(this).hasClass('active'))
return;
editmode();
});
$('#entry_export-download').on('click',function(item) { $('#entry_export-download').on('click',function(item) {
item.preventDefault(); item.preventDefault();

20
resources/views/home.blade.php
View File

@ -48,23 +48,11 @@
var subpage = window.location.hash; var subpage = window.location.hash;
$(document).ready(function() { $(document).ready(function() {
// Enable navigating to a page via a URL fragment, and that fragment is defined with a server-icon
if (subpage) { if (subpage) {
// Enable navigating to a page via a URL fragment, and that fragment is defined with a server-icon // Clear the hash
var valid = Object.values($('.server-icon > a').map(function() { history.replaceState(null,null,' ');
return $(this).attr('id'); getNode(subpage.substring(1));
})).indexOf(subpage.substring(1));
if (valid !== -1) {
// @todo this condition can probably be removed
console.log('teleporting...:'+subpage.substring(1));
// The click() event wont have been registered yet, so we need to delay us clicking it
setTimeout(function() { $(subpage).click(); },250);
} else if (valid === -1) {
// Clear the hash
history.replaceState(null,null,' ');
getNode(subpage.substring(1));
}
} }
}); });
</script> </script>

5
resources/views/layouts/dn.blade.php
View File

@ -13,3 +13,8 @@
@yield('page-modals') @yield('page-modals')
@yield('page-scripts') @yield('page-scripts')
@yield('page-styles') @yield('page-styles')
<!-- Initialise any ajax tool tip attributes -->
<script type="text/javascript">
$('[data-bs-toggle="tooltip"]').tooltip();
</script>