From 744f4d79108e7d6c0929d1572c88379d58869610 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carl=20G=C3=BCtzkow?= <70779496+CJGutz@users.noreply.github.com> Date: Sat, 24 Feb 2024 13:33:54 +0100 Subject: [PATCH] change headers to use include with children --- .../internalportal/internalportal.html | 12 ++--- inventory/templates/inventory/inventory.html | 17 +++---- .../templates/reservations/queue_list.html | 17 +++---- .../templates/userprofile/members.html | 50 ++++++++----------- 4 files changed, 36 insertions(+), 60 deletions(-) diff --git a/internalportal/templates/internalportal/internalportal.html b/internalportal/templates/internalportal/internalportal.html index adad6188b..430551a30 100644 --- a/internalportal/templates/internalportal/internalportal.html +++ b/internalportal/templates/internalportal/internalportal.html @@ -3,15 +3,9 @@ {% load i18n %} {% block content %} -
-
-
-
-

{% trans "Internportal" %}

-
-
-
-
+ + {% translate "Internportal" as trans_internalportal %} + {% include "website/page_overviews/content_title.html" with title=trans_internalportal %}
diff --git a/inventory/templates/inventory/inventory.html b/inventory/templates/inventory/inventory.html index 68096bc31..9cfe50ab8 100644 --- a/inventory/templates/inventory/inventory.html +++ b/inventory/templates/inventory/inventory.html @@ -1,21 +1,16 @@ {% extends 'website/base.html' %} {% load static %} {% load i18n %} +{% load includechildren %} {% block head %} {{ jquery | safe }} {% endblock %} {% block content %} -
-
-
-
-

{% trans 'Lager' %}

-

{% trans "Her kan du søke i lageret vårt. Lyst til å låne noe? Kom innom verkstedet!" %}

- {% trans 'Se utstyr og apparater' %} -
-
-
-
+ {% translate "Lager" as trans_inventory %} + {% translate "Her kan du søke i lageret vårt. Lyst til å låne noe? Kom innom verkstedet!" as trans_inventory_desc %} + {% includechildren "website/page_overviews/content_title.html" with title=trans_inventory description=trans_inventory_desc %} + {% trans 'Se utstyr og apparater' %} + {% endincludechildren %} {% include "inventory/_list_admin_banner.html" %} diff --git a/reservations/templates/reservations/queue_list.html b/reservations/templates/reservations/queue_list.html index aafa816c7..7ecf39d3e 100644 --- a/reservations/templates/reservations/queue_list.html +++ b/reservations/templates/reservations/queue_list.html @@ -1,19 +1,14 @@ {% extends 'website/base.html' %} {% load i18n %} +{% load includechildren %} {% block content %} -
-
-
-
-

{% trans "Reservasjoner" %}

-

{% trans "På denne siden kan du reservere bruk av diverse utstyr" %}.

- {% trans 'Se Hackerspace sitt utstyr' %} -
-
-
-
+ {% translate "Reservasjoner" as trans_reservations %} + {% translate "På denne siden kan du reservere bruk av diverse utstyr" as trans_reservations_desc %} + {% includechildren "website/page_overviews/content_title.html" with title=trans_reservations description=trans_reservations_desc %} + {% trans 'Se Hackerspace sitt utstyr' %} + {% endincludechildren %} {% regroup reservation_list|dictsort:'parent_queue.name' by parent_queue as reservation_list %} diff --git a/userprofile/templates/userprofile/members.html b/userprofile/templates/userprofile/members.html index a709173c0..4cded9c90 100644 --- a/userprofile/templates/userprofile/members.html +++ b/userprofile/templates/userprofile/members.html @@ -1,6 +1,7 @@ {% extends 'website/base.html' %} {% load static %} {% load i18n %} +{% load includechildren %} {% block head %} @@ -9,37 +10,28 @@ {% endblock %} {% block content %} -
-
-
-
-

{% trans "Medlemmer i Hackerspace" %}

-

{% trans "For oversikt over gruppene og deres medlemmer, se" %} {% trans "Om oss" %}.

-
-
-
-
-
- -
- -
-
-
+ {% translate "Medlemmer i Hackerspace" as trans_members %} + {% includechildren "website/page_overviews/content_title.html" with title=trans_members %} +

{% trans "For oversikt over gruppene og deres medlemmer, se" %} {% trans "Om oss" %}.

+
+ +
+
- {% if perms.userprofile.is_active_member %} -

{% trans 'Klikk på ferdigheter du vil se folk ikke har' %}

-
- {% for category in skill_categories %} - - {% endfor %} -
- {% endif %}
-
+ {% if perms.userprofile.is_active_member %} +

{% trans 'Klikk på ferdigheter du vil se folk ikke har' %}

+
+ {% for category in skill_categories %} + + {% endfor %} +
+ {% endif %} + {% endincludechildren %} +