aboutsummaryrefslogtreecommitdiff
path: root/templates/timetable_common.html
diff options
context:
space:
mode:
authorAlban Gruin2018-04-25 21:18:25 +0200
committerAlban Gruin2018-04-25 21:18:25 +0200
commit1789cbf1dcf555b35785e47237fb0a1f95720a45 (patch)
treee1645a307ee790bdd50751c8bde5694890e0257b /templates/timetable_common.html
parent81046d1e44380fd961efbc308a85d134f33d2bab (diff)
parent4c82869e3a590c982c43958e3e4b0f9fad440678 (diff)
Merge branch 'futur'
Diffstat (limited to 'templates/timetable_common.html')
-rw-r--r--templates/timetable_common.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/timetable_common.html b/templates/timetable_common.html
index 533f6c9..6e59322 100644
--- a/templates/timetable_common.html
+++ b/templates/timetable_common.html
@@ -4,8 +4,8 @@
<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 />
- <em>{{ course.rooms.all|format_rooms }}</em>{% endif %}{% if course.notes %}<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 %}
</ul>