From d7dfa0c001a9b84541e1545e45d0536a87d6880e Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 19 Jan 2018 19:20:21 +0100
Subject: Liens permettant de naviguer sur les pages des semaines suivantes et
 précédentes

---
 templates/timetable.html | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'templates/timetable.html')

diff --git a/templates/timetable.html b/templates/timetable.html
index 8fafeed..cc90ed5 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -1,4 +1,5 @@
 {% extends "index.html" %}
+{% load dt_week %}
 
 {% block head %}{% if group_mode %}
     <meta name="description" content="Emploi du temps du groupe {{ group }} &ndash; Semaine {{ week }}" />
@@ -18,4 +19,8 @@
         {% 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" %}
-      {% if group_mode %}<p class="subscribe"><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></p>{% endif %}{% endblock %}
+      <p class="subscribe">
+        {% if last_week is not None %}<a href="{% url "timetable" timetable.year.slug timetable.slug group.slug last_week.year last_week|dt_week %}">Semaine {{ last_week|dt_week }}</a>{% if next_week is not None %} &ndash; {% endif %}{% endif %}{% if next_week is not None %}<a href="{% url "timetable" timetable.year.slug timetable.slug group.slug next_week.year next_week|dt_week %}"">Semaine {{ next_week|dt_week }}</a>{% endif %}
+        {% if group_mode %}{% if last_week is not None or next_week is not None %}<br />{% endif %}
+        <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 %}
-- 
cgit v1.2.1


From 2d5bb761ac83bfa4643006681587db2c5e11f60b Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 19 Jan 2018 20:27:21 +0100
Subject: Adaptation des liens vers les semaines suivantes et précédentes pour
 les emplois du temps des salles

---
 templates/timetable.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/timetable.html')

diff --git a/templates/timetable.html b/templates/timetable.html
index cc90ed5..7811427 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -20,7 +20,7 @@
       </p>
       {% include "timetable_common.html" %}
       <p class="subscribe">
-        {% if last_week is not None %}<a href="{% url "timetable" timetable.year.slug timetable.slug group.slug last_week.year last_week|dt_week %}">Semaine {{ last_week|dt_week }}</a>{% if next_week is not None %} &ndash; {% endif %}{% endif %}{% if next_week is not None %}<a href="{% url "timetable" timetable.year.slug timetable.slug group.slug next_week.year next_week|dt_week %}"">Semaine {{ next_week|dt_week }}</a>{% endif %}
+        {% 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>{% if next_week is not None %} &ndash; {% endif %}{% 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>{% endif %}
         {% if group_mode %}{% if last_week is not None or next_week is not None %}<br />{% endif %}
         <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 %}
-- 
cgit v1.2.1


From e815411b1d10ba0c94fa19a942033957a341f3fc Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 21 Jan 2018 19:29:45 +0100
Subject: Améliorations de navigation

Lien pour retourner à la liste des groupes sur la page des emplois du temps

Lien pour retourner à la liste des années sur la page de liste des mentions

Lien pour retourner à la liste des mentions sur la page des groupes

Lien pour retourner à la liste des années sur la liste des salles

Lien pour accéder à la liste des salles sur la page principale

Lien pour retourner à la liste des salles sur le formulaire QSJPS
---
 templates/timetable.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'templates/timetable.html')

diff --git a/templates/timetable.html b/templates/timetable.html
index 7811427..5848e04 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -20,6 +20,7 @@
       </p>
       {% include "timetable_common.html" %}
       <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>{% if next_week is not None %} &ndash; {% endif %}{% 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>{% endif %}
         {% if group_mode %}{% if last_week is not None or next_week is not None %}<br />{% endif %}
         <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 %}
-- 
cgit v1.2.1