From adf4f2804adc5372cd54a7f6cecffc329cd18db2 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Wed, 4 Sep 2019 14:28:31 +0200
Subject: [PATCH] Reformat templates.
---
.../alsijil/templates/alsijil/group_week.html | 137 +++++++++---------
.../alsijil/templates/alsijil/lesson.html | 100 ++++++-------
2 files changed, 119 insertions(+), 118 deletions(-)
diff --git a/biscuit/apps/alsijil/templates/alsijil/group_week.html b/biscuit/apps/alsijil/templates/alsijil/group_week.html
index 9c461227e..2d20aa0ef 100644
--- a/biscuit/apps/alsijil/templates/alsijil/group_week.html
+++ b/biscuit/apps/alsijil/templates/alsijil/group_week.html
@@ -1,82 +1,83 @@
{# -*- engine:django -*- #}
+
{% extends "core/base.html" %}
{% load bootstrap4 font_awesome i18n week_helpers %}
{% block bootstrap4_title %}{% blocktrans%}Current week{% endblocktrans %} — {{ block.super }}{% endblock %}
{% block page_title %}
- {% blocktrans %}Current week{% endblocktrans %}
+ {% blocktrans %}Current week{% endblocktrans %}
{% endblock %}
{% block content %}
- <form method="get">
- <ul id="timetable_select_form">
- {{ select_form.as_ul }}
- </ul>
- <input type="submit" value="Select" />
- </form>
+ <form method="get">
+ <ul id="timetable_select_form">
+ {{ select_form.as_ul }}
+ </ul>
+ <input type="submit" value="Select" />
+ </form>
- {% if group %}
- <div class="row">
- <div class="col-md-7">
- <div class="card">
- <div class="card-header bg-light text-dark">
- {% blocktrans %}Week{% endblocktrans %}
- {{ week }} ({{ week|week_start }} — {{ week|week_end }}),
- {{ group.name }}
- </div>
- <div class="card-body">
- {% for weekday, periods in periods_by_day.items %}
- <h3>{{ weekday }}</h3>
- <table class="table table-striped table-bordered table-hover table-responsive-xl">
- <thead>
- <tr>
- <th>{% blocktrans %}Period{% endblocktrans %}</th>
- <th>{% blocktrans %}Subject{% endblocktrans %}</th>
- <th>{% blocktrans %}Teachers{% endblocktrans %}</th>
- </tr>
- </thead>
- <tbody>
- {% for period in periods %}
- <tr>
- <td>{{ period.period.period }}</td>
- <td>
- <a href="{% url 'lesson_by_week_and_period' week period.id %}">
- {{ period.lesson.subject.name }}
- </a>
- </td>
- <td>{{ period.lesson.teacher_names }}</td>
- </tr>
- {% endfor %}
- </tbody>
- </table>
- {% endfor %}
- </div>
+ {% if group %}
+ <div class="row">
+ <div class="col-md-7">
+ <div class="card">
+ <div class="card-header bg-light text-dark">
+ {% blocktrans %}Week{% endblocktrans %}
+ {{ week }} ({{ week|week_start }} — {{ week|week_end }}),
+ {{ group.name }}
+ </div>
+ <div class="card-body">
+ {% for weekday, periods in periods_by_day.items %}
+ <h3>{{ weekday }}</h3>
+ <table class="table table-striped table-bordered table-hover table-responsive-xl">
+ <thead>
+ <tr>
+ <th>{% blocktrans %}Period{% endblocktrans %}</th>
+ <th>{% blocktrans %}Subject{% endblocktrans %}</th>
+ <th>{% blocktrans %}Teachers{% endblocktrans %}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for period in periods %}
+ <tr>
+ <td>{{ period.period.period }}</td>
+ <td>
+ <a href="{% url 'lesson_by_week_and_period' week period.id %}">
+ {{ period.lesson.subject.name }}
+ </a>
+ </td>
+ <td>{{ period.lesson.teacher_names }}</td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ {% endfor %}
+ </div>
+ </div>
+ </div>
+ <div class="col-md-5">
+ <div class="card">
+ <div class="card-header bg-light text-dark">
+ {% blocktrans %}Personal notes{% endblocktrans %}
+ </div>
+ <div class="card-body">
+ Not implemented yet.
+ </div>
+ </div>
+ </div>
</div>
- </div>
- <div class="col-md-5">
- <div class="card">
- <div class="card-header bg-light text-dark">
- {% blocktrans %}Personal notes{% endblocktrans %}
- </div>
- <div class="card-body">
- Not implemented yet.
- </div>
+ {% else %}
+ <div class="card text-white bg-danger">
+ <div class="card-header">
+ {% blocktrans %}No group selected{% endblocktrans %}
+ </div>
+ <div class="card-body">
+ <p>
+ {% blocktrans %}
+ You must select a group to see the week summary.
+ {% endblocktrans %}
+ </p>
+ </div>
</div>
- </div>
- </div>
- {% else %}
- <div class="card text-white bg-danger">
- <div class="card-header">
- {% blocktrans %}No group selected{% endblocktrans %}
- </div>
- <div class="card-body">
- <p>
- {% blocktrans %}
- You must select a group to see the week summary.
- {% endblocktrans %}
- </p>
- </div>
- </div>
- {% endif %}
+ {% endif %}
{% endblock %}
diff --git a/biscuit/apps/alsijil/templates/alsijil/lesson.html b/biscuit/apps/alsijil/templates/alsijil/lesson.html
index ad483edcf..53c77fc15 100644
--- a/biscuit/apps/alsijil/templates/alsijil/lesson.html
+++ b/biscuit/apps/alsijil/templates/alsijil/lesson.html
@@ -3,68 +3,68 @@
{% load bootstrap4 i18n static %}
{% block bootstrap4_extra_head %}
- {{ block.super }}
- <link rel="stylesheet" href="{% static 'css/alsijil/lesson.css' %}" />
+ {{ block.super }}
+ <link rel="stylesheet" href="{% static 'css/alsijil/lesson.css' %}" />
{% endblock %}
{% block bootstrap4_title %}{% blocktrans%}Lesson documentation{% endblocktrans %} - {{ block.super }}{% endblock %}
{% block page_title %}
- {{ day }} -
+ {{ day }} -
- {% for group in lesson_period.get_groups.all %}
- <span>{{ group.short_name }}</span>,
- {% endfor %},
+ {% for group in lesson_period.get_groups.all %}
+ <span>{{ group.short_name }}</span>,
+ {% endfor %},
- {{ lesson_period.get_subject.name }},
+ {{ lesson_period.get_subject.name }},
- {% for teacher in lesson_period.get_teachers.all %}
- {{ teacher.short_name }}
- {% endfor %}
+ {% for teacher in lesson_period.get_teachers.all %}
+ {{ teacher.short_name }}
+ {% endfor %}
{% endblock %}
{% block content %}
- <form method="post">
- {% csrf_token %}
-
- <div class="card">
- <div class="card-header bg-light text-dark">
- {% blocktrans %}Lesson documentation{% endblocktrans %}
- </div>
- <div class="card-body">
+ <form method="post">
{% csrf_token %}
- {% bootstrap_form lesson_documentation_form %}
- </div>
- </div>
- <div class="card">
- <div class="card-header bg-light text-dark">
- {% blocktrans %}Personal notes{% endblocktrans %}
- </div>
- <div class="card-body">
- {{ personal_note_formset.management_form }}
+ <div class="card">
+ <div class="card-header bg-light text-dark">
+ {% blocktrans %}Lesson documentation{% endblocktrans %}
+ </div>
+ <div class="card-body">
+ {% csrf_token %}
+ {% bootstrap_form lesson_documentation_form %}
+ </div>
+ </div>
+
+ <div class="card">
+ <div class="card-header bg-light text-dark">
+ {% blocktrans %}Personal notes{% endblocktrans %}
+ </div>
+ <div class="card-body">
+ {{ personal_note_formset.management_form }}
- <table class="table table-striped table-bordered table-hover table-responsive-xl">
- <tr>
- <th>{% blocktrans %}Person{% endblocktrans %}</th>
- <th>{% blocktrans %}Absent{% endblocktrans %}</th>
- <th>{% blocktrans %}Tardiness{% endblocktrans %}</th>
- <th>{% blocktrans %}Excused{% endblocktrans %}</th>
- <th>{% blocktrans %}Remarks{% endblocktrans %}</th>
- </tr>
- {% for form in personal_note_formset %}
- {{ form.id }}
- <tr>
- <td>{{ form.person_name }}</td>
- <td>{{ form.absent }}</td>
- <td>{{ form.late }}</td>
- <td>{{ form.excused }}</td>
- <td>{{ form.remarks }}</td>
- </tr>
- {% endfor %}
- </table>
- </div>
- </div>
- <input type="submit" value="{% blocktrans %}Save{% endblocktrans %}" />
- </form>
+ <table class="table table-striped table-bordered table-hover table-responsive-xl">
+ <tr>
+ <th>{% blocktrans %}Person{% endblocktrans %}</th>
+ <th>{% blocktrans %}Absent{% endblocktrans %}</th>
+ <th>{% blocktrans %}Tardiness{% endblocktrans %}</th>
+ <th>{% blocktrans %}Excused{% endblocktrans %}</th>
+ <th>{% blocktrans %}Remarks{% endblocktrans %}</th>
+ </tr>
+ {% for form in personal_note_formset %}
+ {{ form.id }}
+ <tr>
+ <td>{{ form.person_name }}</td>
+ <td>{{ form.absent }}</td>
+ <td>{{ form.late }}</td>
+ <td>{{ form.excused }}</td>
+ <td>{{ form.remarks }}</td>
+ </tr>
+ {% endfor %}
+ </table>
+ </div>
+ </div>
+ <input type="submit" value="{% blocktrans %}Save{% endblocktrans %}" />
+ </form>
{% endblock %}
--
GitLab