Skip to content

Commit 070aabf

Browse files
leenooksleenooks
committed
Switch to using icons when rendering a DN, and move the server icons to the topmenu
1 parent 57b6b8c commit 070aabf

File tree

11 files changed

+199
-163
lines changed

11 files changed

+199
-163
lines changed

‎public/css/custom.css‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,49 @@ div#objectClass .input-group-end:not(input.form-control) {
2727
input.form-control.input-group-end {
2828
border-bottom-right-radius: 4px !important;
2929
border-top-right-radius: 4px !important;
30+
}
31+
32+
.custom-tooltip-warning {
33+
--bs-tooltip-bg: var(--bs-warning);
34+
--bs-tooltip-color: black;
35+
}
36+
37+
.custom-tooltip-danger {
38+
--bs-tooltip-bg: var(--bs-danger);
39+
40+
}
41+
42+
.tooltip {
43+
font-size: 85%;
44+
}
45+
46+
/*
47+
.custom-tooltip-warning .tooltip-inner {
48+
--bs-tooltip-bg: #ffffff;
49+
--bs-tooltip-color: var(--bs-warning);
50+
--bs-font-size: 85%;
51+
border: 2px solid var(--bs-warning);
52+
border-radius: 6px;
53+
}
54+
55+
.custom-tooltip-warning .tooltip-arrow::before {
56+
--bs-tooltip-bg: var(--bs-warning);
57+
}
58+
59+
.custom-tooltip-danger .tooltip-inner {
60+
--bs-tooltip-bg: #ffffff;
61+
--bs-tooltip-color: var(--bs-danger);
62+
--bs-font-size: 85%;
63+
border: 2px solid var(--bs-danger);
64+
border-radius: 6px;
65+
}
66+
67+
.custom-tooltip-danger .tooltip-arrow::before {
68+
--bs-tooltip-bg: var(--bs-danger);
69+
}
70+
*/
71+
72+
/* hide the site icons when the search is opened */
73+
.search-wrapper.active + .header-menu.nav {
74+
display: none;
3075
}

‎public/css/fixes.css‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,6 @@ ul.fancytree-container ul {
155155
}
156156

157157
/** Server icons **/
158-
.closed-sidebar .server-icon {
159-
display: none;
160-
}
161-
.closed-sidebar .app-sidebar:hover .server-icon, .sidebar-mobile-open .server-icon {
162-
display: flex;
163-
}
164158
.font-icon-wrapper {
165159
text-align: center;
166160
border: #e9ecef solid 1px;

‎resources/themes/architect/views/layouts/partials/contentfooter.blade.php‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,6 @@
66
<li class="nav-item">
77
<strong>{{ config('app.version') }}</strong>
88
</li>
9-
@if(($x=Config::get('update_available')) && $x->action !== 'current')
10-
<li class="nav-item ms-2">
11-
@switch($x->action)
12-
@case('unable')
13-
<abbr title="Upstream Version Unavailable"><i class="fas fa-exclamation text-alternate"></i></abbr>
14-
@break
15-
@case('upgrade')
16-
<abbr title="Update Available: {{ $x->version }}"><i class="fas fa-wrench text-danger"></i></abbr>
17-
@break
18-
@case('mismatch')
19-
<abbr title="Version Issue - Upstream {{ $x->version }}"><i class="fas fa-exclamation text-danger"></i></abbr>
20-
@break
21-
@case('unknown')
22-
<abbr title="Version Issue - Upstream {{ $x->version }}"><i class="fas fa-bolt text-alternate"></i></abbr>
23-
@break
24-
@endswitch
25-
</li>
26-
@endif
279
{{--
2810
<li class="nav-item">
2911
<a href="javascript:void(0);" class="nav-link">Footer Link</a>

‎resources/themes/architect/views/layouts/partials/contentheader.blade.php‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -13,53 +13,53 @@
1313
</div>
1414
</div>
1515

16-
@if (isset($page_actions) || old())
17-
<div class="page-title-actions">
18-
<div class="page-title-actions">
19-
<div class="d-inline-block dropdown">
20-
<button type="button" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="dropdown-toggle btn btn-primary">
21-
<span class="btn-icon-wrapper pe-2 opacity-7">
22-
<i class="fa fa-business-time fa-w-20"></i>
23-
</span>
24-
@lang('Entry Options')
25-
</button>
26-
27-
<div tabindex="-1" role="menu" aria-hidden="true" class="dropdown-menu dropdown-menu-right">
28-
<ul class="nav flex-column">
29-
@if ((isset($page_actions) && $page_actions->contains('edit')) || old())
30-
<li class="nav-item">
31-
<span class="nav-link pt-0 pb-1">
32-
<button id="entry-edit" class="p-2 m-0 border-0 btn btn-transition btn-outline-dark w-100 text-start">
33-
<i class="fas fa-fw fa-edit me-2"></i> @lang('Edit')
34-
</button>
35-
</span>
36-
</li>
37-
@endif
38-
39-
@if (isset($page_actions) && $page_actions->contains('export'))
40-
<li class="nav-item">
41-
<a class="nav-link pt-0 pb-1">
42-
<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">
43-
<i class="fas fa-fw fa-file-export me-2"></i> @lang('Export')
44-
</button>
45-
</a>
46-
</li>
47-
@endif
48-
49-
@if (isset($page_actions) && $page_actions->contains('copy'))
50-
<li class="nav-item">
51-
<a class="nav-link pt-0 pb-1">
52-
<button class="p-2 m-0 border-0 btn btn-transition btn-outline-dark w-100 text-start">
53-
<i class="fas fa-fw fa-truck-moving me-2"></i> @lang('Copy or Move')
54-
</button>
55-
</a>
56-
</li>
57-
@endif
58-
</ul>
59-
</div>
16+
<div class="page-title-actions">
17+
<div class="row">
18+
<div class="col">
19+
<div class="action-buttons float-end">
20+
<ul class="nav">
21+
@if(isset($page_actions) && $page_actions->contains('export'))
22+
<li>
23+
<span data-bs-toggle="modal" data-bs-target="#entry_export-modal">
24+
<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>
25+
</span>
26+
</li>
27+
@endif
28+
@if(isset($page_actions) && $page_actions->contains('copy'))
29+
<li>
30+
<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>
31+
</li>
32+
@endif
33+
@if((isset($page_actions) && $page_actions->contains('edit')) || old())
34+
<li>
35+
<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>
36+
</li>
37+
@endif
38+
@if(isset($page_actions) && $page_actions->contains('delete'))
39+
<li>
40+
<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>
41+
</li>
42+
@endif
43+
</ul>
6044
</div>
6145
</div>
6246
</div>
63-
@endif
47+
</div>
6448
</div>
65-
</div>
49+
</div>
50+
51+
@section('page-scripts')
52+
<script type="text/javascript">
53+
$(document).ready(function() {
54+
console.log($('button[id=entry-edit]'));
55+
$('button[id=entry-edit]').on('click',function(item) {
56+
item.preventDefault();
57+
58+
if ($(this).hasClass('btn-dark'))
59+
return;
60+
61+
editmode();
62+
});
63+
});
64+
</script>
65+
@append

‎resources/themes/architect/views/layouts/partials/sidebarmenu.blade.php‎

Lines changed: 1 addition & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -33,63 +33,11 @@
3333
<div class="app-sidebar__inner">
3434
<ul class="vertical-nav-menu">
3535
<li class="app-sidebar__heading">{{ config('server')->name }}</li>
36-
<li>
37-
<div class="font-icon-wrapper float-start me-1 server-icon">
38-
<a class="p-0 m-0" href="{{ url('info') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-info"></i></a>
39-
</div>
40-
<div class="font-icon-wrapper float-start ms-1 me-1 server-icon">
41-
<a class="p-0 m-0" href="{{ url('schema') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-fingerprint"></i></a>
42-
</div>
43-
<div class="font-icon-wrapper float-start ms-1 me-1 server-icon">
44-
<a class="p-0 m-0" href="{{ url('import') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-upload"></i></a>
45-
</div>
46-
@env(['local'])
47-
<div class="font-icon-wrapper float-end ms-1 server-icon">
48-
<a class="p-0 m-0" href="{{ url('debug') }}" onclick="return false;" style="display: contents;"><i class="fas fa-fw fa-toolbox"></i></a>
49-
</div>
50-
@endenv
51-
<div class="clearfix"></div>
52-
</li>
5336
<li>
5437
<i id="treeicon" class="metismenu-icon fa-fw fas fa-sitemap"></i>
5538
<span class="f16" id="tree"></span>
5639
</li>
5740
</ul>
5841
</div>
5942
</div>
60-
</div>
61-
62-
@section('page-scripts')
63-
<script type="text/javascript">
64-
$(document).ready(function() {
65-
$('.server-icon > a').on('click',function(item) {
66-
var content;
67-
68-
$.ajax({
69-
url: $(this).attr('href'),
70-
method: 'GET',
71-
dataType: 'html',
72-
statusCode: {
73-
404: function() {
74-
$('.main-content').empty().append(content);
75-
}
76-
},
77-
beforeSend: function() {
78-
content = $('.main-content').contents();
79-
$('.main-content').empty().append('<div class="fa-3x"><i class="fas fa-spinner fa-pulse"></i></div>');
80-
}
81-
82-
}).done(function(html) {
83-
$('.main-content').empty().append(html);
84-
85-
}).fail(function() {
86-
alert('Well that didnt work?');
87-
});
88-
89-
item.stopPropagation();
90-
91-
return false;
92-
});
93-
});
94-
</script>
95-
@append
43+
</div>

‎resources/themes/architect/views/layouts/partials/topmenu.blade.php‎

Lines changed: 91 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,67 @@
3939
<button class="btn-close"></button>
4040
</div>
4141

42-
<ul class="header-menu nav">
43-
{{--
44-
<li class="nav-item">
45-
<a href="javascript:void(0);" class="nav-link">
46-
<i class="nav-link-icon fas fa-database"></i> Link
47-
</a>
42+
<ul class="header-menu nav server-icon">
43+
<li>
44+
<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') }}">
45+
<i class="fas fa-fw fa-info fs-5"></i>
46+
</button>
47+
</li>
48+
<li>
49+
<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') }}">
50+
<i class="fas fa-fw fa-fingerprint fs-5"></i>
51+
</button>
52+
</li>
53+
<li>
54+
<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') }}">
55+
<i class="fas fa-fw fa-upload fs-5"></i>
56+
</button>
57+
</li>
58+
<li>
59+
<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') }}">
60+
<i class="fas fa-fw fa-toolbox fs-5"></i>
61+
</button>
4862
</li>
49-
--}}
5063
</ul>
5164
</div>
5265

5366
<div class="app-header-right">
54-
@if(! request()->isSecure())
55-
<span class="badge bg-danger">WARNING - SESSION NOT SECURE</span>
56-
@endif
67+
<ul class="header-menu nav">
68+
@if(! request()->isSecure())
69+
<li>
70+
<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">
71+
<i class="fas fa-fw fa-unlock-keyhole fs-5"></i>
72+
</button>
73+
</li>
74+
@endif
75+
76+
@if(($x=Config::get('update_available')) && $x->action !== 'current')
77+
<li>
78+
@switch($x->action)
79+
@case('unable')
80+
<button class="btn btn-light opacity-2 p-1 m-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Upstream Version Unavailable">
81+
<i class="fas fa-fw fa-bolt fs-5"></i>
82+
</button>
83+
@break
84+
@case('upgrade')
85+
<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 }}">
86+
<i class="fas fa-fw fa-wrench fs-5"></i>
87+
</button>
88+
@break
89+
@case('mismatch')
90+
<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 }}">
91+
<i class="fas fa-fw fa-exclamation fs-5"></i>
92+
</button>
93+
@break
94+
@case('unknown')
95+
<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 }}">
96+
<i class="fas fa-fw fa-question fs-5"></i>
97+
</button>
98+
@break
99+
@endswitch
100+
</li>
101+
@endif
102+
</ul>
57103

58104
<div class="header-btn-lg pe-0">
59105
<div class="widget-content p-0">
@@ -112,3 +158,38 @@
112158
</div>
113159
</div>
114160
</div>
161+
162+
@section('page-scripts')
163+
<script type="text/javascript">
164+
$(document).ready(function() {
165+
$('button[id^="link-"]').on('click',function(item) {
166+
var content;
167+
168+
$.ajax({
169+
url: $(this).data('link'),
170+
method: 'GET',
171+
dataType: 'html',
172+
statusCode: {
173+
404: function() {
174+
$('.main-content').empty().append(content);
175+
}
176+
},
177+
beforeSend: function() {
178+
content = $('.main-content').contents();
179+
$('.main-content').empty().append('<div class="fa-3x"><i class="fas fa-spinner fa-pulse"></i></div>');
180+
}
181+
182+
}).done(function(html) {
183+
$('.main-content').empty().append(html);
184+
185+
}).fail(function() {
186+
alert('Well that didnt work?');
187+
});
188+
189+
item.stopPropagation();
190+
191+
return false;
192+
});
193+
});
194+
</script>
195+
@append

‎resources/views/components/attribute/password.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<div class="row">
2323
<div class="offset-1 col-4 p-2">
2424
<span class="p-0 m-0">
25-
<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>
25+
<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>
2626
</span>
2727
</div>
2828
</div>

0 commit comments

Comments
 (0)