Merge branch 'stable/0.13.z' into prod/pa1ch/0.y.z

1 files changed, 3 insertions, 3 deletions

diff --git a/templates/timetable_common.html b/templates/timetable_common.html
index 62b1d71..6e59322 100644
--- a/templates/timetable_common.html
+++ b/templates/timetable_common.html
@@ -4,9 +4,9 @@
         <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 />
-            <small>Remarques : {{ course.notes }}</small>{% endif %}
+            <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>
       </section>{% empty %}