Merge branch 'qsjps' into futur

1 files changed, 9 insertions, 3 deletions

diff --git a/templates/group_list.html b/templates/group_list.html
index f21b2b1..9c9a7fc 100644
--- a/templates/group_list.html
+++ b/templates/group_list.html
@@ -1,13 +1,19 @@
 {% extends "index.html" %}
 {% load dt_week %}
 
-{% block title %}{{ timetable }} – {% endblock %}
+{% block title %}{% if timetable %}{{ timetable }}{% else %}Emploi du temps des salles{% endif %} – {% endblock %}
 
 {% block body %}
-      <h3><a href="{{ timetable.url }}">{{ timetable }}</a></h3>
+      <h3>{% if timetable %}<a href="{{ timetable.source.url }}">{{ timetable }}</a>{% else %}Emploi du temps des salles{% endif %}</h3>
       <ul>
         {% for group in groups %}
-        <li><a class="text"{% if group.weeks is not None %} href="{% url "timetable" timetable.year.slug timetable.slug group.slug %}"{% endif %}>{{ group }}</a> &mdash; {% for week in group.weeks %}<a href="{% url "timetable" timetable.year.slug timetable.slug group.slug week.year week|dt_week %}">{{ week|dt_prettyprint }}</a> {% if not forloop.last %}&ndash; {% endif %}{% empty %}<em>aucun cours dans le mois à venir</em>{% endfor %}</li>
+        <li><a class="text"{% if group.weeks is not None %} href="{% if timetable %}{% url "timetable" timetable.year.slug timetable.slug group.slug %}{% else %}{% url "room-timetable" group.slug %}{% endif %}"{% endif %}>{{ group }}</a> &mdash; {% for week in group.weeks %}<a href="{% if timetable %}{% url "timetable" timetable.year.slug timetable.slug group.slug week.year week|dt_week %}{% else %}{% url "room-timetable" group.slug week.year week|dt_week %}{% endif %}">{{ week|dt_prettyprint }}</a> {% if not forloop.last %}&ndash; {% endif %}{% empty %}<em>aucun cours dans le mois à venir</em>{% endfor %}</li>
         {% endfor %}
       </ul>
+      {% if timetable %}
+        <a href="{% url "mentions" timetable.year.slug %}">Retour à la liste des mentions</a> &ndash;
+        <a href="{% url "groups-all" timetable.year.slug timetable.slug %}">Tous les groupes</a>
+      {% else %}
+        <a href="{% url "index" %}">Retour à la liste des années</a>
+      {% endif %}
 {% endblock %}