From 8f6ace8a71349776599600075971aa77f19433af Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sat, 7 Sep 2019 16:31:31 +0200
Subject: [PATCH] Fix style of cancelled lesson.
---
.../chronos/static/css/chronos/timetable.css | 7 +-
.../chronos/templates/chronos/tt_lesson.html | 91 +++++++++----------
2 files changed, 47 insertions(+), 51 deletions(-)
diff --git a/biscuit/apps/chronos/static/css/chronos/timetable.css b/biscuit/apps/chronos/static/css/chronos/timetable.css
index 6d7a5af7..1b1c07a2 100644
--- a/biscuit/apps/chronos/static/css/chronos/timetable.css
+++ b/biscuit/apps/chronos/static/css/chronos/timetable.css
@@ -5,4 +5,9 @@
ul#timetable_select_form li {
dispaly: inline;
-}
\ No newline at end of file
+}
+
+.chronos-lesson-cancelled {
+ background-color: white;
+ text-decoration: line-through;
+}
diff --git a/biscuit/apps/chronos/templates/chronos/tt_lesson.html b/biscuit/apps/chronos/templates/chronos/tt_lesson.html
index 3dc76483..0d49af53 100644
--- a/biscuit/apps/chronos/templates/chronos/tt_lesson.html
+++ b/biscuit/apps/chronos/templates/chronos/tt_lesson.html
@@ -1,57 +1,48 @@
{# -*- engine:django -*- #}
-{% if not lesson_period.get_substitution.cancelled %}
- <div class="card chronos-lesson
- {% if lesson_period.get_substitution %}
- border border-warning
- {% endif %}
- "
- style="
- {% if lesson_period.lesson.subject.colour_fg %}
- color: {{ lesson_period.lesson.subject.colour_fg }};
- {% endif %}
- {% if lesson_period.lesson.subject.colour_bg %}
- background-color: {{ lesson_period.lesson.subject.colour_bg }};
- {% endif %}
- ">
- <div class="card-body">
- <div class="row">
- <div class="col-sm">
- <span class="card-title">
- {{ lesson_period.get_subject.abbrev }}
- </span>
- </div>
- </div>
- <div class="row">
- <div class="col-sm">
- {% for group in lesson_period.get_groups.all %}
- <span class="card-text">{{ group.short_name }}</span>
- {% endfor %}
- </div>
- <div class="col-sm">
- {% for teacher in lesson_period.get_teachers.all %}
- <a href="{% url 'person_by_id' teacher.id %}"
- title="{{ teacher.first_name }} {{ teacher.last_name }}"
- class="card-text"
- data-poload="{% url 'person_by_id_card' teacher.id %}">
- {{ teacher.short_name }}
- </a>
- {% endfor %}
- </div>
- <div class="col-sm">
- <span class="card-text">{{ lesson_period.get_room.short_name }}</span>
- </div>
+<div class="card chronos-lesson
+ {% if lesson_period.get_substitution %}
+ border border-warning
+ {% endif %}
+ {% if lesson_period.get_substitution.cancelled %}
+ border border-danger chronos-lesson-cancelled
+ {% endif %}
+ "
+ style="
+ {% if lesson_period.lesson.subject.colour_fg %}
+ color: {{ lesson_period.lesson.subject.colour_fg }};
+ {% endif %}
+ {% if lesson_period.lesson.subject.colour_bg %}
+ background-color: {{ lesson_period.lesson.subject.colour_bg }};
+ {% endif %}
+ ">
+ <div class="card-body">
+ <div class="row">
+ <div class="col-sm">
+ <span class="card-title">
+ {{ lesson_period.get_subject.abbrev }}
+ </span>
</div>
</div>
- </div>
-{% else %}
- <div class="card text-center chronos-lesson bg-danger">
- <div class="card-body">
- <div class="row">
- <div class="col-sm">
- {% blocktrans %}Canceled{% endblocktrans %}
- </div>
+ <div class="row">
+ <div class="col-sm">
+ {% for group in lesson_period.get_groups.all %}
+ <span class="card-text">{{ group.short_name }}</span>
+ {% endfor %}
+ </div>
+ <div class="col-sm">
+ {% for teacher in lesson_period.get_teachers.all %}
+ <a href="{% url 'person_by_id' teacher.id %}"
+ title="{{ teacher.first_name }} {{ teacher.last_name }}"
+ class="card-text"
+ data-poload="{% url 'person_by_id_card' teacher.id %}">
+ {{ teacher.short_name }}
+ </a>
+ {% endfor %}
+ </div>
+ <div class="col-sm">
+ <span class="card-text">{{ lesson_period.get_room.short_name }}</span>
</div>
</div>
</div>
-{% endif %}
+</div>
--
GitLab