From 0962fce8902882db0e97137668bc0aabd8e63871 Mon Sep 17 00:00:00 2001 From: Jonathan Weth <git@jonathanweth.de> Date: Fri, 17 Jul 2020 12:05:34 +0200 Subject: [PATCH] [Lesson view] Organise information in tabs Tabs: lesson documentation, personal notes and change history --- .../alsijil/class_register/lesson.html | 50 ++++++++++--------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html index 6545bf9c3..0fa8bdc52 100644 --- a/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html +++ b/aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html @@ -50,15 +50,25 @@ </div> <form method="post"> + <p>{% include "core/partials/save_button.html" %}</p> + {% csrf_token %} + <div class="row"> <div class="col s12"> - {% include "core/partials/save_button.html" %} + <ul class="tabs"> + <li class="tab"> + <a href="#lesson-documentation">{% trans "Lesson documentation" %}</a> + </li> + <li class="tab"> + <a href="#personal-notes">{% trans "Personal notes" %}</a> + </li> + <li class="tab"> + <a href="#version-history">{% trans "Change history" %}</a> + </li> + </ul> </div> - </div> - {% csrf_token %} - <div class="row"> - <div class="col s12 m12 l6 xl8"> + <div class="col s12" id="lesson-documentation"> {% with prev_lesson=lesson_period.prev prev_doc=prev_lesson.get_lesson_documentation %} {% with prev_doc=prev_lesson.get_lesson_documentation absences=prev_lesson.get_absences tardinesses=prev_lesson.get_tardinesses %} {% if prev_doc %} @@ -116,20 +126,8 @@ </div> </div> </div> - <div class="col s12 m12 l6 xl4"> - <div class="card"> - <div class="card-content"> - <span class="card-title"> - {% blocktrans %}Change history{% endblocktrans %} - </span> - {% include 'core/partials/crud_events.html' with obj=lesson_documentation %} - </div> - </div> - </div> - </div> - <div class="row"> - <div class="col s12"> + <div class="col s12" id="personal-notes"> <div class="card"> <div class="card-content"> <span class="card-title"> @@ -196,12 +194,18 @@ </div> </div> </div> - </div> - - <div class="row"> - <div class="col s12"> - {% include "core/partials/save_button.html" %} + <div class="col s12" id="version-history"> + <div class="card"> + <div class="card-content"> + <span class="card-title"> + {% blocktrans %}Change history{% endblocktrans %} + </span> + {% include 'core/partials/crud_events.html' with obj=lesson_documentation %} + </div> + </div> </div> </div> + + <p>{% include "core/partials/save_button.html" %}</p> </form> {% endblock %} -- GitLab