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

public/js/custom.js

@@ -36,11 +36,11 @@ function getNode(item) {
 			case 404:
 				$('.main-content').empty().append(e.responseText);
 				break;
-			case 409:	// Not in root
+			case 409:
 				location.replace('/#'+item);
 				break;
-			case 419:	// Session Expired
+			case 419:
-				location.replace('/#'+item);
+				alert('Session has expired, reloading the page and try again...');
 				location.reload();
 				break;
 			case 500:

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

@@ -6,6 +6,24 @@
 					<li class="nav-item">
 						<strong>{{ config('app.version') }}</strong>
 					</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">
 						<a href="javascript:void(0);" class="nav-link">Footer Link</a>

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

@@ -14,36 +14,22 @@
 		</div>
 
 		<div class="page-title-actions">
-			<div class="row">
+			<span class="action-buttons">
-				<div class="col">
+				@if(isset($page_actions) && $page_actions->contains('export'))
-					<div class="action-buttons float-end">
+				<span data-bs-toggle="modal" data-bs-target="#entry_export-modal">
-						<ul class="nav">
+					<button class="btn btn-outline-dark p-1 me-1" data-bs-toggle="tooltip" data-bs-placement="bottom" title="@lang('Export')"><i class="fas fa-fw fa-download fs-5"></i></button>
-							@if(isset($page_actions) && $page_actions->contains('export'))
+				</span>
-								<li>
+				@endif
-									<span data-bs-toggle="modal" data-bs-target="#entry_export-modal">
+				@if(isset($page_actions) && $page_actions->contains('copy'))
-										<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 class="btn btn-outline-dark p-1 me-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>
+				@endif
-								</li>
+				@if((isset($page_actions) && $page_actions->contains('edit')) || old())
-							@endif
+					<button class="btn btn-outline-dark p-1 me-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>
-							@if(isset($page_actions) && $page_actions->contains('copy'))
+				@endif
-								<li>
+				@if(isset($page_actions) && $page_actions->contains('delete'))
-									<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>
+					<button class="btn btn-outline-danger p-1 me-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>
-								</li>
+				@endif
-							@endif
+			</span>
-							@if((isset($page_actions) && $page_actions->contains('edit')) || old())
-								<li>
-									<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>
-							@endif
-							@if(isset($page_actions) && $page_actions->contains('delete'))
-								<li>
-									<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>
-								</li>
-							@endif
-						</ul>
-					</div>
-				</div>
-			</div>
 		</div>
 	</div>
 </div>

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

@@ -64,42 +64,15 @@
 		</div>
 
 		<div class="app-header-right">
-			<ul class="header-menu nav">
+			@if(! request()->isSecure())
-				@if(! request()->isSecure())
+				<ul class="header-menu nav">
 					<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">
+						<button class="btn btn-danger p-1 me-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
+				</ul>
-
+			@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="widget-content p-0">