When the session expired, automatically refresh the page with the intended desitination without the alert

Switch to using icons when rendering a DN, and move the server icons to the topmenu
2025-03-05 21:34:22 +11:00 · 2025-03-05 21:34:22 +11:00
4 changed files with 65 additions and 42 deletions
--- a/public/js/custom.js
+++ b/public/js/custom.js
@ -36,11 +36,11 @@ function getNode(item) {
 			case 404:
 				$('.main-content').empty().append(e.responseText);
 				break;
-			case 409:
+			case 409:	// Not in root
 				location.replace('/#'+item);
 				break;
-			case 419:
-				alert('Session has expired, reloading the page and try again...');
+			case 419:	// Session Expired
+				location.replace('/#'+item);
 				location.reload();
 				break;
 			case 500:
--- a/resources/themes/architect/views/layouts/partials/contentfooter.blade.php
+++ b/resources/themes/architect/views/layouts/partials/contentfooter.blade.php
@ -6,24 +6,6 @@
 					<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>
--- a/resources/themes/architect/views/layouts/partials/contentheader.blade.php
+++ b/resources/themes/architect/views/layouts/partials/contentheader.blade.php
@ -14,22 +14,36 @@
 		</div>

 		<div class="page-title-actions">
-			<span class="action-buttons">
-				@if(isset($page_actions) && $page_actions->contains('export'))
-				<span data-bs-toggle="modal" data-bs-target="#entry_export-modal">
-					<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>
-				</span>
-				@endif
-				@if(isset($page_actions) && $page_actions->contains('copy'))
-					<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>
-				@endif
-				@if((isset($page_actions) && $page_actions->contains('edit')) || old())
-					<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>
-				@endif
-				@if(isset($page_actions) && $page_actions->contains('delete'))
-					<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>
-				@endif
-			</span>
+			<div class="row">
+				<div class="col">
+					<div class="action-buttons float-end">
+						<ul class="nav">
+							@if(isset($page_actions) && $page_actions->contains('export'))
+								<li>
+									<span data-bs-toggle="modal" data-bs-target="#entry_export-modal">
+										<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>
+									</span>
+								</li>
+							@endif
+							@if(isset($page_actions) && $page_actions->contains('copy'))
+								<li>
+									<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>
+								</li>
+							@endif
+							@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>
--- a/resources/themes/architect/views/layouts/partials/topmenu.blade.php
+++ b/resources/themes/architect/views/layouts/partials/topmenu.blade.php
@ -64,15 +64,42 @@
 		</div>

 		<div class="app-header-right">
-			@if(! request()->isSecure())
-				<ul class="header-menu nav">
+			<ul class="header-menu nav">
+				@if(! request()->isSecure())
 					<li>
-						<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">
+						<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>
-				</ul>
-			@endif
+				@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">
Author	SHA1	Message	Date
Deon George	462d888c03	When the session expired, automatically refresh the page with the intended desitination without the alert All checks were successful Create Docker Image / Test Application (x86_64) (push) Successful in 27s Details Create Docker Image / Build Docker Image (x86_64) (push) Successful in 1m32s Details Create Docker Image / Build Docker Image (arm64) (push) Successful in 4m32s Details Create Docker Image / Final Docker Image Manifest (push) Successful in 8s Details	2025-03-05 21:34:22 +11:00
Deon George	97d9311dff	Switch to using icons when rendering a DN, and move the server icons to the topmenu	2025-03-05 21:34:22 +11:00