change headers to use include with children

hackerspace-ntnu · Feb 24, 2024 · 744f4d7 · 744f4d7
1 parent 5d9f9d6
commit 744f4d7
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 60 deletions.
diff --git a/internalportal/templates/internalportal/internalportal.html b/internalportal/templates/internalportal/internalportal.html
@@ -3,15 +3,9 @@
 {% load i18n %}
 
 {% block content %}
-    <div class="section hs-green white-text">
-        <div class="container">
-            <div class="row">
-                <div class="col s12">
-                    <h4>{% trans "Internportal" %}</h4>
-                </div>
-            </div>
-        </div>
-    </div>
+
+    {% translate "Internportal" as trans_internalportal %}
+    {% include "website/page_overviews/content_title.html" with title=trans_internalportal %}
 
     <div class="section">
         <div class="container">

diff --git 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 %}
-    <div class="section hs-green white-text">
-        <div class="container">
-            <div class="row">
-                <div class="col s12">
-                    <h4>{% trans 'Lager' %}</h4>
-                    <p>{% trans "Her kan du søke i lageret vårt. Lyst til å låne noe? Kom innom verkstedet!" %}</p>
-                    <a href="{% url 'inventory:equipment' %}" class="btn white green-text">{% trans 'Se utstyr og apparater' %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
+    {% 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 %}
+        <a href="{% url 'inventory:equipment' %}" class="btn white green-text">{% trans 'Se utstyr og apparater' %}</a>
+    {% endincludechildren %}
 
     {% include "inventory/_list_admin_banner.html" %}
 

diff --git 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 %}
-    <div class="section hs-green">
-        <div class="container">
-            <div class="row white-text">
-                <div class="col s12">
-                    <h4>{% trans "Reservasjoner" %}</h4>
-                    <p>{% trans "På denne siden kan du reservere bruk av diverse utstyr" %}.</p>
-                    <a href="{% url 'inventory:equipment' %}" class="btn-large white green-text">{% trans 'Se Hackerspace sitt utstyr' %}</a>
-                </div>
-            </div>
-        </div>
-    </div>
+    {% 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 %}
+        <a href="{% url 'inventory:equipment' %}" class="btn-large white green-text">{% trans 'Se Hackerspace sitt utstyr' %}</a>
+    {% 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
@@ -1,6 +1,7 @@
 {% extends 'website/base.html' %}
 {% load static %}
 {% load i18n %}
+{% load includechildren %}
 {% block head %}
     <script src="https://code.jquery.com/jquery-3.4.1.min.js"
         integrity="sha256-CSXorXvZcTkaix6Yvo6HppcZGetbYMGWSFlBw8HfCJo=" crossorigin="anonymous"></script>
@@ -9,37 +10,28 @@
     <link rel="stylesheet" type="text/css" href="{% static 'userprofile/css/members.css' %}">
 {% endblock %}
 {% block content %}
-    <div class="section hs-green">
-        <div class="container">
-            <div class="row">
-                <div class="col s12">
-                    <h4 class="white-text">{% trans "Medlemmer i Hackerspace" %}</h4>
-                    <p class="flow-text white-text">{% trans "For oversikt over gruppene og deres medlemmer, se" %} <a class="hs-gray-text" href="{% url 'about' %}"> {% trans "Om oss" %}</a>.</p>
-                </div>
-            </div>
-            <div class="row">
-                <div class="col s12">
-                    <div class="members-search-container card-panel z-depth-0 row">
-                        <!-- Member name search -->
-                        <div class="input-field col s12">
-                            <input id="member-name-search" name="filter" placeholder="{% trans 'Søk etter medlem' %}" value="{{ filter }}" type="text">
-                        </div>
-                    </div>
-                </div>
+    {% translate "Medlemmer i Hackerspace" as trans_members %}
+    {% includechildren "website/page_overviews/content_title.html" with title=trans_members %}
+        <p class="flow-text white-text">{% trans "For oversikt over gruppene og deres medlemmer, se" %} <a class="hs-gray-text" href="{% url 'about' %}"> {% trans "Om oss" %}</a>.</p>
+        <div class="members-search-container card-panel z-depth-0 row">
+            <!-- Member name search -->
+            <div class="input-field col s12">
+                <input id="member-name-search" name="filter" placeholder="{% trans 'Søk etter medlem' %}" value="{{ filter }}" type="text">
             </div>
-            {% if perms.userprofile.is_active_member %}
-                <p class="flow-text white-text">{% trans 'Klikk på ferdigheter du vil se folk ikke har' %}</p>
-                <div class="row skill-filter">
-                    {% for category in skill_categories %}
-                        <label class="col l4 s12 skill-check" style="border-color:{{category.color}};">
-                            <input value="{{ category.id }}" type="checkbox" class="filled-in" onchange="updateSkills()"/>
-                            <span class="white-text">{{ category }}</span>
-                        </label>
-                    {% endfor %}
-                </div>
-            {% endif %}
         </div>
-    </div>
+        {% if perms.userprofile.is_active_member %}
+            <p class="flow-text white-text">{% trans 'Klikk på ferdigheter du vil se folk ikke har' %}</p>
+            <div class="row skill-filter">
+                {% for category in skill_categories %}
+                    <label class="col l4 s12 skill-check" style="border-color:{{category.color}};">
+                        <input value="{{ category.id }}" type="checkbox" class="filled-in" onchange="updateSkills()"/>
+                        <span class="white-text">{{ category }}</span>
+                    </label>
+                {% endfor %}
+            </div>
+        {% endif %}
+    {% endincludechildren %}
+
     <div class="section">
         <div class="container">
             <div id="members_list"></div>