From a94bc45f1567fe102d6a88806abd37793ca74e6c Mon Sep 17 00:00:00 2001 From: Julian Leucker <leuckerj@gmail.com> Date: Sun, 16 May 2021 00:18:47 +0200 Subject: [PATCH] Move register absence and filter buttons --- .../alsijil/class_register/person.html | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html index 1ebd049a4..7841d9f96 100644 --- a/aleksis/apps/alsijil/templates/alsijil/class_register/person.html +++ b/aleksis/apps/alsijil/templates/alsijil/class_register/person.html @@ -21,6 +21,13 @@ {% blocktrans with person=person %} Class register overview for {{ person }} {% endblocktrans %} + {% has_perm "alsijil.register_absence" user person as can_register_absence %} + {% if can_register_absence %} + <a class="btn primary-color waves-effect waves-light right" href="{% url "register_absence" person.pk %}"> + <i class="material-icons left">rate_review</i> + {% trans "Register absence" %} + </a> + {% endif %} {% endblock %} {% block content %} @@ -52,15 +59,6 @@ <!-- Personal Note Tab --> <div class="col s12" id="personal-notes"> - {% has_perm "alsijil.edit_person_overview_personalnote" user person as can_mark_all_as_excused %} - {% has_perm "alsijil.register_absence" user person as can_register_absence %} - {% if can_register_absence %} - <a class="btn primary-color waves-effect waves-light" href="{% url "register_absence" person.pk %}"> - <i class="material-icons left">rate_review</i> - {% trans "Register absence" %} - </a> - {% endif %} - <div class="col s12" id="overview"> <h5>{% trans "Relevant personal notes" %}</h5> <form class="modal" id="filter-modal"> @@ -80,14 +78,16 @@ </button> </div> </form> + {% has_perm "alsijil.edit_person_overview_personalnote" user person as can_mark_all_as_excused %} <div class="row"> <div class="col s12 m3 l5 push-m9 push-l7"> <button - class="modal-trigger right btn primary-color waves-effect waves-light medium-high-right" + class="modal-trigger right btn primary-color waves-effect waves-light + {% if can_mark_all_as_excused %} medium-high-right {% endif %}" data-target="filter-modal" type="button"> - Filter results ({{ num_filters }})<i class="material-icons right">filter_alt</i> - </button> + Filter results ({{ num_filters }})<i class="material-icons right">filter_alt</i> + </button> </div> <form action="" method="post" class=""> {% csrf_token %} -- GitLab