diff --git a/CHANGELOG.rst b/CHANGELOG.rst index b096c66cc5d69eaf1f3d180ea82fe617c01ff165..eaef36f2ca7c2b9f78cec9516ccb3bb6774241ba 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 6aae8540c830a8e3455c9d3094667d676d0349e0..a42111f55e31d3b3f518873218c76fd246106afe 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 ce38ee671b6e51a9f4417cb8507dc530b2b81a48..d8c8273092fee51086fac6b24599da95fef486d0 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">