From e90b8e7388be331d8ba603a0b625d951f2868a41 Mon Sep 17 00:00:00 2001
From: tp_dhu <terry.probert@dhuhealthcare.nhs.uk>
Date: Sun, 27 Apr 2025 09:32:30 +0100
Subject: [PATCH] moved session error to separate ui template part

---
 public/style.css                     | 2 ++
 ui/templates/layout.html             | 6 ++++++
 ui/views/admin/index.html            | 1 -
 ui/views/admin/priorities/index.html | 1 -
 ui/views/kb/index.html               | 1 -
 ui/views/project/index.html          | 1 -
 ui/views/tag/index.html              | 1 -
 ui/views/ticket/index.html           | 2 --
 8 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/public/style.css b/public/style.css
index 1b569e5..e33e029 100644
--- a/public/style.css
+++ b/public/style.css
@@ -10,6 +10,8 @@ i.fa { font-weight: 100 !important ; }
 
 #ticket_list .g-flex-item { border-bottom: 1px solid var(--bulma-text-soft); }
 
+a { word-break: break-word; }
+
 /* parsedown check-checkbox */
 li.parsedown-task-list {
     list-style: none;
diff --git a/ui/templates/layout.html b/ui/templates/layout.html
index 0a06759..1f77bce 100644
--- a/ui/templates/layout.html
+++ b/ui/templates/layout.html
@@ -48,6 +48,9 @@
         <a class="navbar-item" href="/projects">Projects</a>
         <a class="navbar-item" href="/tickets">Tickets</a>
         <a class="navbar-item" href="/tags">Tags</a>
+        <check if="{{ isset(@SESSION.user) && @SESSION.user.is_admin }}">
+          <a class="navbar-item" href="/admin">Admin</a>
+        </check>
       </div>
       <div class="navbar-end">
         <div class="navbar-item">
@@ -88,6 +91,9 @@
   -->
 
   <!-- Main Content Area -->
+  <div class="container">
+    <include href="ui/session/error.html">
+  </div>
   <main class="section" id="page">
     <div class="container">
       <!-- Fat-Free Framework content injection -->
diff --git a/ui/views/admin/index.html b/ui/views/admin/index.html
index 9b9511a..f03008f 100644
--- a/ui/views/admin/index.html
+++ b/ui/views/admin/index.html
@@ -1,5 +1,4 @@
 <h1 class="title">Admin</h1>
-<include href="/ui/session/error.html">
 <hr>
 
 <section>
diff --git a/ui/views/admin/priorities/index.html b/ui/views/admin/priorities/index.html
index 7f3b93c..b0861aa 100644
--- a/ui/views/admin/priorities/index.html
+++ b/ui/views/admin/priorities/index.html
@@ -1,5 +1,4 @@
 <h1 class="title">Admin: Ticket Priorities</h1>
-<include href="/ui/session/error.html">
 <p><a class="button" href="/admin/priority/create">create priority</a></p>
 <hr>
 
diff --git a/ui/views/kb/index.html b/ui/views/kb/index.html
index 81f5d07..880c63c 100644
--- a/ui/views/kb/index.html
+++ b/ui/views/kb/index.html
@@ -1,5 +1,4 @@
 <h1 class="title">Knowledge Base</h1>
-<include href="/ui/session/error.html"></include>
 <p><a class="button" href="/kb/create">create kb article</a></p>
 <hr>
 
diff --git a/ui/views/project/index.html b/ui/views/project/index.html
index d6f6d75..46cc621 100644
--- a/ui/views/project/index.html
+++ b/ui/views/project/index.html
@@ -1,5 +1,4 @@
 <h1 class="title">Projects</h1>
-<include href="/ui/session/error.html"></include>
 <p><a class="button" href="/project/create">create project</a></p>
 <hr>
 
diff --git a/ui/views/tag/index.html b/ui/views/tag/index.html
index 40ea39d..1921b16 100644
--- a/ui/views/tag/index.html
+++ b/ui/views/tag/index.html
@@ -1,5 +1,4 @@
 <h1 class="title">Tags</h1>
-<include href="/ui/session/error.html"></include>
 <p><a class="button" href="/tag/create">create tag</a></p>
 <hr>
 
diff --git a/ui/views/ticket/index.html b/ui/views/ticket/index.html
index 35d9a03..3275198 100644
--- a/ui/views/ticket/index.html
+++ b/ui/views/ticket/index.html
@@ -1,6 +1,4 @@
 <h1 class="title">Tickets</h1>
-<include href="/ui/session/error.html"></include>
-</include>
 <!-- updated design -- inspiration gitea -->
 <div class="block">
     <div class="field is-grouped">