improve staff page

NINAnor · Dec 2, 2024 · fa3a765 · fa3a765
1 parent ac9f21b
commit fa3a765
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 6 deletions.
diff --git a/src/apps/core/templates/core/base.html b/src/apps/core/templates/core/base.html
@@ -30,9 +30,10 @@
   </head>
   <body class="flex h-screen overflow-hidden bg-slate-50">
     {% block body %}
-      <div class="relative flex flex-1 flex-col overflow-y-auto overflow-x-hidden">
+      <div class="relative flex flex-1 flex-col max-w-full overflow-y-auto overflow-x-hidden">
         {% include 'core/partials/navigation.html' %}
 
+        {% block main %}
         <main>
           <div class="mx-auto max-w-screen-2xl p-4 md:p-6 2xl:p-10">
             {% if messages %}
@@ -55,6 +56,7 @@
             {% block content %}
             {% endblock content %}
           </main>
+          {% endblock main %}
         </div>
       </div>
     {% endblock body %}

diff --git a/src/genlab_bestilling/staff/templates/staff/analysisorder_detail.html b/src/genlab_bestilling/staff/templates/staff/analysisorder_detail.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "staff/base.html" %}
 {% load i18n %}
 
 

diff --git a/src/genlab_bestilling/staff/templates/staff/analysisorder_filter.html b/src/genlab_bestilling/staff/templates/staff/analysisorder_filter.html
@@ -1,5 +1,5 @@
 {% extends "staff/base_filter.html" %}
 
 {% block page-title %}
-Analysis Order
+Analysis Orders
 {% endblock page-title %}
diff --git a/src/genlab_bestilling/staff/templates/staff/base.html b/src/genlab_bestilling/staff/templates/staff/base.html
@@ -0,0 +1,34 @@
+{% extends "base.html" %}
+
+{% block main %}
+<main class="grid grid-cols-6">
+    <div class="px-2 py-2 min-w-72 bg-white">
+        <h5 class="font-bold text-xl">Menu</h5>
+        <ul class="flex flex-col gap-2 mt-2 text-lg px-4">
+            <li><a href="{% url 'staff:order-analysis-list' %}">Dashboard</a></li>
+            <li><a href="{% url 'staff:order-analysis-list' %}">Analysis Orders</a></li>
+            <li><a href="{% url 'staff:order-equipment-list' %}">Equipment Orders</a></li>
+        </ul>
+    </div>
+    <div class="p-4 md:p-6 2xl:p-10 col-span-5">
+      {% if messages %}
+        {% for message in messages %}
+          <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %}" x-data="{ show: true }" x-show="show">
+            <div>
+            {{ message }}
+            </div>
+            <div>
+            <button type="button"
+                    class=""
+                    @click.prevent="show = false"
+                    aria-label="Close">
+                  <i class="fas fa-times"></i></button>
+            </div>
+          </div>
+        {% endfor %}
+      {% endif %}
+
+      {% block content %}
+      {% endblock content %}
+    </main>
+{% endblock %}
diff --git a/src/genlab_bestilling/staff/templates/staff/base_filter.html b/src/genlab_bestilling/staff/templates/staff/base_filter.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "staff/base.html" %}
 {% load crispy_forms_tags %}
 {% load render_table from django_tables2 %}
 

diff --git a/src/genlab_bestilling/staff/templates/staff/equipmentorder_detail.html b/src/genlab_bestilling/staff/templates/staff/equipmentorder_detail.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "staff/base.html" %}
 {% load i18n %}
 
 

diff --git a/src/genlab_bestilling/staff/templates/staff/equipmentorder_filter.html b/src/genlab_bestilling/staff/templates/staff/equipmentorder_filter.html
@@ -1,5 +1,5 @@
 {% extends "staff/base_filter.html" %}
 
 {% block page-title %}
-Equipment Order
+Equipment Orders
 {% endblock page-title %}
diff --git a/src/theme/static_src/tailwind.config.js b/src/theme/static_src/tailwind.config.js
@@ -27,6 +27,7 @@ module.exports = {
          * Adjust the following line to match your project structure.
          */
         '../../**/templates/**/*.html',
+        '../../**/**/templates/**/*.html',
 
         '../../../.venv/lib64/python3.11/site-packages/tailwind_ui/templates/**/*.html',
         '../../../.venv/lib64/python3.11/site-packages/formset/templates/formset/tailwind/**/*.html',