Merge branch '242-re-introduce-tab-layout-on-week-view' into 'prepare-release-3.0b0'

Resolve "Re-introduce tab layout on week view"

See merge request !329

CHANGELOG.rst

@@ -16,6 +16,7 @@ Fixed
 * The redirection to generated class register PDF printouts did not work.
 * Some columns in the table showing statistics for the members of a group were labled wrongly.
 * Absences with custom excuse types were not counted correctly.
+* Tabs on the week overview page were not displayed.
 
 `3.0b0`_ - 2022-02-28
 ---------------------

aleksis/apps/alsijil/static/css/alsijil/week_view.css

@@ -116,3 +116,7 @@ p.subtitle {
 .unfold-trigger.vertical i.material-icons {
   transform: rotate(-180deg);
 }
+
+.tabs-icons .tab svg.iconify {
+  display: block;
+}

aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html

@@ -11,35 +11,6 @@
   <link rel="stylesheet" href="{% static 'css/alsijil/week_view.css' %}"/>
 {% endblock %}
 
-{% block nav_content %}
-  {% if lesson_periods %}
-    <div class="">
-      <ul class="tabs tabs-transparent tabs-icons tabs-fixed-width">
-        <li class="tab col">
-          <a class="active" href="#week-overview">
-            <i class="material-icons iconify" data-icon="mdi:message-bulleted"></i>
-            {% trans "Lesson documentations" %}
-          </a>
-        </li>
-        <li class="tab col">
-          <a href="#personal-notes">
-            <i class="material-icons iconify" data-icon="mdi:account-multiple-outline"></i>
-            {% trans "Persons" %}
-          </a>
-        </li>
-        {% if group_roles %}
-          <li class="tab col">
-            <a href="#group-roles">
-              <i class="material-icons iconify" data-icon="mdi:clipboard-account-outline"></i>
-              {% trans "Group roles" %}
-            </a>
-          </li>
-        {% endif %}
-      </ul>
-    </div>
-  {% endif %}
-{% endblock %}
-
 {% block content %}
   <script type="text/javascript" src="{% static "js/helper.js" %}"></script>
   {{ week_select|json_script:"week_select" }}
@@ -97,6 +68,33 @@
     </p>
   {% endif %}
 
+  {% if lesson_periods %}
+  <div class="col s12 margin-bottom">
+    <ul class="tabs tabs-icons tabs-fixed-width">
+      <li class="tab col">
+        <a class="active" href="#week-overview">
+          <i class="material-icons iconify" data-icon="mdi:message-bulleted"></i>
+          {% trans "Lesson documentations" %}
+        </a>
+      </li>
+      <li class="tab col">
+        <a href="#personal-notes">
+          <i class="material-icons iconify" data-icon="mdi:account-multiple-outline"></i>
+          {% trans "Persons" %}
+        </a>
+      </li>
+      {% if group_roles %}
+        <li class="tab col">
+          <a href="#group-roles">
+            <i class="material-icons iconify" data-icon="mdi:clipboard-account-outline"></i>
+            {% trans "Group roles" %}
+          </a>
+        </li>
+      {% endif %}
+    </ul>
+  </div>
+  {% endif %}
+
   {% if lesson_periods %}
     <div class="row">
       <div class="col s12" id="week-overview">