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

1 files changed, 42 insertions, 9 deletions

diff --git a/templates/timetable.html b/templates/timetable.html
index fc2065f..a6dc1ab 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -1,21 +1,54 @@
 {% extends "index.html" %}
+{% load dt_week %}
 
-{% block head %}
+{% block head %}{% if group_mode %}
     <meta name="description" content="Emploi du temps du groupe {{ group }} &ndash; Semaine {{ week }}" />
-    <link rel="alternate" type="application/atom+xml" title="Emploi du temps du groupe {{ group }} (Atom)" href="{% url "atom" group.timetable.year.slug group.timetable.slug group.slug %}" />
-    <link rel="alternate" type="application/rss+xml" title="Emploi du temps du groupe {{ group }} (RSS)" href="{% url "rss" group.timetable.year.slug group.timetable.slug group.slug %}" />
-    <link rel="alternate" type="text/calendar" title="Emploi du temps du groupe {{ group }} (iCalendar)" href="{% url "ics" group.timetable.year.slug group.timetable.slug group.slug %}">
-{% endblock %}
+    <link rel="alternate" type="application/atom+xml" title="Emploi du temps du groupe {{ group }} (Atom)" href="{% url "atom" timetable.year.slug timetable.slug group.slug %}" />
+    <link rel="alternate" type="application/rss+xml" title="Emploi du temps du groupe {{ group }} (RSS)" href="{% url "rss" timetable.year.slug timetable.slug group.slug %}" />
+    <link rel="alternate" type="text/calendar" title="Emploi du temps du groupe {{ group }} (iCalendar)" href="{% url "ics" timetable.year.slug timetable.slug group.slug %}">
+{% endif %}{% endblock %}
 
-{% block title %}{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }} &ndash; {% endblock %}
+{% block title %}{% if group_mode %}{{ timetable }} &ndash;{% else %}Salle{% endif %} {{ group }} &ndash; Semaine {{ week }} &ndash; {% endblock %}
 
 {% block body %}
-      <h2>{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }}</h2>
+      <h2>{% if group_mode %}{{ timetable }} &ndash;{% else %}Salle{% endif %} {{ group }} &ndash; Semaine {{ week }}</h2>
       <p>
         {% if is_old_timetable %}
-        <b><a href="{% url "timetable" group.timetable.year.slug group.timetable.slug group.slug %}">Accéder à l’emploi du temps de cette semaine.</b></a><br />
+          <b><a href="{% if group_mode %}{% url "timetable" timetable.year.slug timetable.slug group.slug %}{% else %}{% url "room-timetable" group.slug %}{% endif %}">
+              Accéder à l’emploi du temps de cette semaine.
+          </b></a><br />
         {% endif %}
         {% if last_update %}Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}{% endif %}
       </p>
       {% include "timetable_common.html" %}
-      <p class="subscribe"><a href="{% url "calendars" 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 %}
+      <p class="subscribe">
+        {% if group_mode %}
+          <a href="{% url "groups" timetable.year.slug timetable.slug %}">Retour à la liste des groupes</a>
+        {% else %}
+          <a href="{% url "rooms" %}">Retour à la liste des salles</a>
+        {% endif %} &ndash;
+        {% if last_week is not None %}
+          <a href="{% if group_mode %}{% url "timetable" timetable.year.slug timetable.slug group.slug last_week.year last_week|dt_week %}{% else %}{% url "room-timetable" group.slug last_week.year last_week|dt_week %}{% endif %}">
+            Semaine {{ last_week|dt_week }}
+          </a>
+          &ndash;
+        {% endif %}
+        {% if next_week is not None %}
+          <a href="{% if group_mode %}{% url "timetable" timetable.year.slug timetable.slug group.slug next_week.year next_week|dt_week %}{% else %}{% url "room-timetable" group.slug next_week.year next_week|dt_week %}{% endif %}">
+            Semaine {{ next_week|dt_week }}
+          </a>
+          &ndash;
+        {% endif %}
+        {% if group_mode %}
+          <a href="{% url "group-weeks" timetable.year.slug timetable.slug group.slug %}">Liste des semaines</a>
+        {% else %}
+          <a href="{% url "room-weeks" group.slug %}">Liste des semaines</a>
+        {% endif %}
+        <br />
+        {% if group_mode %}
+          <a href="{% url "calendars" timetable.year.slug timetable.slug group.slug %}">ICS</a> &ndash;
+          <a href="{% url "rss" timetable.year.slug timetable.slug group.slug %}">RSS</a> &ndash;
+          <a href="{% url "atom" timetable.year.slug timetable.slug group.slug %}">Atom</a>
+        {% endif %}
+      </p>
+{% endblock %}