aboutsummaryrefslogtreecommitdiff
path: root/templates/timetable_common.html
diff options
context:
space:
mode:
authorAlban Gruin2018-04-15 12:04:20 +0200
committerAlban Gruin2018-04-15 12:04:20 +0200
commit324e391633b30bef5b781a733c56d26d29b45246 (patch)
tree86387cbb4c19aa95f5c433ec7e5b130cb29d600f /templates/timetable_common.html
parent1abd9faddd2f07341c6ff70dfa88d7c83eac40c3 (diff)
parenteb32f6011eafd77db2455ce3183c527c2e86deeb (diff)
Merge branch 'fusion/alban' into qsjps
Diffstat (limited to 'templates/timetable_common.html')
-rw-r--r--templates/timetable_common.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/timetable_common.html b/templates/timetable_common.html
index 21300f1..6e59322 100644
--- a/templates/timetable_common.html
+++ b/templates/timetable_common.html
@@ -4,7 +4,7 @@
<h3>{% filter title %}{{ day.0.begin|date:"l j F o" }}{% endfilter %} &ndash; de {{ day.0.begin|date:"H:i" }} à {% with day|last as last %}{{ last.end|date:"H:i" }}{% endwith %}</h3>
<ul>{% for course in day %}
<li class="course">
- <b>{{ course }}</b>{% if course.type %} ({{ course.type }}){% endif %}, de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}<br />
+ <b>{{ course }}</b>{% if course.type %} ({{ course.type }}){% endif %}, de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if group_mode and course.rooms.all|length > 0 or not group_mode and course.groups.all|length > 0 %}<br />
<em>{% if group_mode %}{{ course.rooms.all|format_rooms }}{% else %}{{ course.groups.all|join:", " }}{% endif %}</em>{% endif %}{% if course.notes %}<br />
<small>Remarques : {{ course.notes|linebreaksbr }}</small>{% endif %}
</li>{% endfor %}