From ac9489cf4faa063c9270a3900a52809306355ea2 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 18 Nov 2017 15:56:44 +0100
Subject: Adaptation de la template pour pouvoir afficher la liste des emplois
 du temps des salles

---
 templates/group_list.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates/group_list.html')

diff --git a/templates/group_list.html b/templates/group_list.html
index f21b2b1..88cc7a4 100644
--- a/templates/group_list.html
+++ b/templates/group_list.html
@@ -1,13 +1,13 @@
 {% 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.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 %}#{% 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 %}#{% endif %}">{{ week|dt_prettyprint }}</a> {% if not forloop.last %}&ndash; {% endif %}{% empty %}<em>aucun cours dans le mois à venir</em>{% endfor %}</li>
         {% endfor %}
       </ul>
 {% endblock %}
-- 
cgit v1.2.1


From 599ca85167ad7d53f6434b105cb74c761d994ecf Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 18 Nov 2017 16:04:18 +0100
Subject: Liens et URLs pour les emplois du temps des salles

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

(limited to 'templates/group_list.html')

diff --git a/templates/group_list.html b/templates/group_list.html
index 88cc7a4..7fe1fe8 100644
--- a/templates/group_list.html
+++ b/templates/group_list.html
@@ -7,7 +7,7 @@
       <h3>{% if timetable %}<a href="{{ timetable.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="{% if timetable %}{% url "timetable" timetable.year.slug timetable.slug group.slug %}{% else %}#{% 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 %}#{% endif %}">{{ 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>
 {% 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/group_list.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'templates/group_list.html')

diff --git a/templates/group_list.html b/templates/group_list.html
index 7fe1fe8..5f53cb4 100644
--- a/templates/group_list.html
+++ b/templates/group_list.html
@@ -10,4 +10,5 @@
         <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>{% else %}<a href="{% url "index" %}">Retour à la liste des années</a>{% endif %}
 {% endblock %}
-- 
cgit v1.2.1


From 4a252a9aa0fab38c4fce8ef292e2f3548a397126 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 15 Apr 2018 15:20:26 +0200
Subject: group_list: correction de l’URL proposée comme source de l’emploi du
 temps

Depuis la séparation entre source et emploi du temps, timetable.url
contient le lien vers la liste des groupes de la page, et donc ici
pointe sur lui-même.
---
 templates/group_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/group_list.html')

diff --git a/templates/group_list.html b/templates/group_list.html
index 5f53cb4..35536b6 100644
--- a/templates/group_list.html
+++ b/templates/group_list.html
@@ -4,7 +4,7 @@
 {% block title %}{% if timetable %}{{ timetable }}{% else %}Emploi du temps des salles{% endif %} &ndash; {% endblock %}
 
 {% block body %}
-      <h3>{% if timetable %}<a href="{{ timetable.url }}">{{ timetable }}</a>{% else %}Emploi du temps des salles{% endif %}</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="{% 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>
-- 
cgit v1.2.1


From a6d14aa482e322fcd1946ea2541272477b4f8c6b Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 21 Apr 2018 15:20:01 +0200
Subject: Ajout d’une liste complète des groupes et d’une liste des semaines

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

(limited to 'templates/group_list.html')

diff --git a/templates/group_list.html b/templates/group_list.html
index 35536b6..9c9a7fc 100644
--- a/templates/group_list.html
+++ b/templates/group_list.html
@@ -10,5 +10,10 @@
         <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>{% else %}<a href="{% url "index" %}">Retour à la liste des années</a>{% endif %}
+      {% 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 %}
-- 
cgit v1.2.1