From d57158f25034ae890fbeb05be0816e6ac5b9818f Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Tue, 3 Sep 2019 16:01:36 +0200
Subject: [PATCH] Place all lesson information in page title. Closes #4.
---
.../alsijil/templates/alsijil/lesson.html | 22 ++++++++++---------
biscuit/apps/alsijil/views.py | 1 +
2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/biscuit/apps/alsijil/templates/alsijil/lesson.html b/biscuit/apps/alsijil/templates/alsijil/lesson.html
index 841c9b5b8..f365d70e4 100644
--- a/biscuit/apps/alsijil/templates/alsijil/lesson.html
+++ b/biscuit/apps/alsijil/templates/alsijil/lesson.html
@@ -8,7 +8,17 @@
{% endblock %}
{% block page_title %}
- {% blocktrans %}Lesson documentation{% endblocktrans %}
+ {{ day }} -
+
+ {% for group in lesson_period.get_groups.all %}
+ <span>{{ group.short_name }}</span>,
+ {% endfor %},
+
+ {{ lesson_period.get_subject.name }},
+
+ {% for teacher in lesson_period.get_teachers.all %}
+ {{ teacher.short_name }}
+ {% endfor %}
{% endblock %}
{% block content %}
@@ -18,15 +28,7 @@
<div class="card">
<div class="card-header bg-light text-dark">
- {% for group in lesson_period.get_groups.all %}
- <span>{{ group.short_name }}</span>,
- {% endfor %}
-
- {{ lesson_period.get_subject.name }},
-
- {% for teacher in lesson_period.get_teachers.all %}
- {{ teacher.short_name }}
- {% endfor %}
+ {% blocktrans %}Lesson documentation{% endblocktrans %}
</div>
<div class="card-body">
{% csrf_token %}
diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py
index 9aa8a6023..6ef5978fd 100644
--- a/biscuit/apps/alsijil/views.py
+++ b/biscuit/apps/alsijil/views.py
@@ -31,6 +31,7 @@ def lesson(request: HttpRequest, week: Optional[int] = None, period_id: Optional
context['lesson_period'] = lesson_period
context['week'] = wanted_week
+ context['day'] = week_days(wanted_week)[lesson_period.period.weekday]
if lesson_period:
# Create or get lesson documentation object; can be empty when first opening lesson
--
GitLab