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

1 files changed, 5 insertions, 11 deletions

diff --git a/templates/timetable.html b/templates/timetable.html
index 264a25c..7a30595 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -1,15 +1,9 @@
 {% extends "index.html" %}
-{% load rooms %}
 
-{% block title %}{{ group.timetable.name }} – {{ group.name }} – Semaine {{ week }} – {% endblock %}
+{% block title %}{{ group.timetable }} – {{ group }} – Semaine {{ week }} – {% endblock %}
 
 {% block body %}
-      <h2>{{ group.timetable.name }} &ndash; {{ group.name }} &ndash; Semaine {{ week }}</h2>
-      <p>Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}</p>{% for day in courses %}
-      <section>
-        <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.name }}</b> ({{ course.type }}), 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 is not None %}<br /><small>Remarques : {{ course.notes }}</small>{% endif %}</li>{% endfor %}
-        </ul>
-      </section>{% endfor %}
-      <p><a class="subscribe" href="{% url "subscribe" group.timetable.slug group.slug year week %}">S’abonner à cet emploi du temps</a></p>{% endblock %}
+      <h2>{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }}</h2>
+      <p>Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}</p>
+      {% include "timetable_common.html" %}
+      <p class="subscribe"><a href="{% url "ics" group.timetable.year.slug group.timetable.slug group.slug %}">ICS</a> &ndash; <a href="{% url "rss" group.timetable.year.slug group.timetable.slug group.slug %}">RSS</a> &ndash; <a href="{% url "atom" group.timetable.year.slug group.timetable.slug group.slug %}">Atom</a></p>{% endblock %}