diff --git a/src/apps/core/templates/core/base.html b/src/apps/core/templates/core/base.html index 7c7184d..7c33819 100644 --- a/src/apps/core/templates/core/base.html +++ b/src/apps/core/templates/core/base.html @@ -30,9 +30,10 @@ {% block body %} -
+
{% include 'core/partials/navigation.html' %} + {% block main %}
{% if messages %} @@ -55,6 +56,7 @@ {% block content %} {% endblock content %}
+ {% endblock main %}
{% endblock body %} diff --git a/src/genlab_bestilling/staff/templates/staff/analysisorder_detail.html b/src/genlab_bestilling/staff/templates/staff/analysisorder_detail.html index 9306a7f..ac92ece 100644 --- 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 index 27550e5..0a0d694 100644 --- 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 new file mode 100644 index 0000000..f17d985 --- /dev/null +++ b/src/genlab_bestilling/staff/templates/staff/base.html @@ -0,0 +1,34 @@ +{% extends "base.html" %} + +{% block main %} +
+
+
Menu
+ +
+
+ {% if messages %} + {% for message in messages %} +
+
+ {{ message }} +
+
+ +
+
+ {% endfor %} + {% endif %} + + {% block content %} + {% endblock content %} +
+{% endblock %} diff --git a/src/genlab_bestilling/staff/templates/staff/base_filter.html b/src/genlab_bestilling/staff/templates/staff/base_filter.html index 0ec23a7..4e435dc 100644 --- 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 index 5579e18..5974305 100644 --- 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 index f8e0468..25b2704 100644 --- 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 index f6da798..1093d86 100644 --- 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',