From cf5d3572ec22ab101d59946943073e321e497976 Mon Sep 17 00:00:00 2001
From: Hangzhi Yu <hangzhi@protonmail.com>
Date: Wed, 26 Apr 2023 01:24:06 +0200
Subject: [PATCH] Re-introduce tabs on week overview page
---
CHANGELOG.rst | 1 +
.../alsijil/static/css/alsijil/week_view.css | 4 ++
.../alsijil/class_register/week_view.html | 56 +++++++++----------
3 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index b096c66cc..eaef36f2c 100644
--- a/CHANGELOG.rst
+++ b/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
---------------------
diff --git a/aleksis/apps/alsijil/static/css/alsijil/week_view.css b/aleksis/apps/alsijil/static/css/alsijil/week_view.css
index 6aae8540c..a42111f55 100644
--- a/aleksis/apps/alsijil/static/css/alsijil/week_view.css
+++ b/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;
+}
diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html b/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
index ce38ee671..d8c827309 100644
--- a/aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
+++ b/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">
--
GitLab