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')

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')

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 bb049a8d5954bbcf3ae5207a0ab4445591555d6e Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 18 Nov 2017 18:21:52 +0100
Subject: Tentative de mise en commun de la template des edts

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

(limited to 'templates')

diff --git a/templates/timetable.html b/templates/timetable.html
index fc2065f..4c921fd 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -1,21 +1,21 @@
 {% extends "index.html" %}
 
-{% 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 %}
+{% endif %}{% endblock %}
 
-{% block title %}{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }} &ndash; {% endblock %}
+{% block title %}{% if group_mode %}{{ group.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 %}{{ group.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" group.timetable.year.slug group.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 %}
+      {% if group_mode %}<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>{% endif %}{% endblock %}
-- 
cgit v1.2.1


From 679010e9cb526709963ebcf49450c1c7c1ef105e Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 19 Nov 2017 00:05:24 +0100
Subject: Liste des groupes à la place de la liste des salles dans l’edt des
 salles

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

(limited to 'templates')

diff --git a/templates/timetable_common.html b/templates/timetable_common.html
index 62b1d71..d9e4ec7 100644
--- a/templates/timetable_common.html
+++ b/templates/timetable_common.html
@@ -5,7 +5,7 @@
         <ul>{% for course in day %}
           <li class="course">
             <b>{{ course }}</b>{% if course.type %} ({{ course.type }}){% endif %}, 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 %}<br />
+            <em>{% if group_mode %}{{ course.rooms.all|format_rooms }}{% else %}{{ course.groups.all|join:", " }}{% endif %}</em>{% endif %}{% if course.notes %}<br />
             <small>Remarques : {{ course.notes }}</small>{% endif %}
           </li>{% endfor %}
         </ul>
-- 
cgit v1.2.1


From e1c4eea3c706bb45cd73416e2e8626bd50a97cfb Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Mon, 27 Nov 2017 16:04:27 +0100
Subject: Correction des interfaces utilisateur

---
 templates/calendars.html |  4 ++--
 templates/timetable.html | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'templates')

diff --git a/templates/calendars.html b/templates/calendars.html
index d97ea78..52c3a11 100644
--- a/templates/calendars.html
+++ b/templates/calendars.html
@@ -5,9 +5,9 @@
 {% block body %}
       <h2>ICS disponibles pour le groupe {{ group }}</h2>
       <ul>
-        <li><a href="{% url "ics" group.timetable.year.slug group.timetable.slug group.slug %}">Un seul ICS pour tous les cours</a></li>
+        <li><a href="{% url "ics" timetable.year.slug timetable.slug group.slug %}">Un seul ICS pour tous les cours</a></li>
 {% for group in groups %}
-        <li><a href="{% url "ics-group" group.timetable.year.slug group.timetable.slug group.slug %}">ICS des cours du groupe {{ group }} uniquement</a></li>
+        <li><a href="{% url "ics-group" timetable.year.slug timetable.slug group.slug %}">ICS des cours du groupe {{ group }} uniquement</a></li>
 {% endfor %}
       </ul>
 {% endblock %}
diff --git a/templates/timetable.html b/templates/timetable.html
index 4c921fd..8fafeed 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -2,20 +2,20 @@
 
 {% 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 %}">
+    <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 %}{% if group_mode %}{{ group.timetable }} &ndash;{% else %}Salle{% endif %} {{ 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>{% if group_mode %}{{ group.timetable }} &ndash;{% else %}Salle{% endif %} {{ 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="{% if group_mode %}{% url "timetable" group.timetable.year.slug group.timetable.slug group.slug %}{% else %}{% url "room-timetable" group.slug %}{% endif %}">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" %}
-      {% if group_mode %}<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>{% endif %}{% endblock %}
+      {% 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 %}
-- 
cgit v1.2.1


From 81cb9b8c6a96fa8529c6d7f6ca55dfd56a1f2e5d Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Thu, 11 Jan 2018 14:09:33 +0100
Subject: On remplace les <br /> dans le champ remarque par des retours à la
 ligne lors du parsage, puis on les remplace à nouveau par des <br /> lors du
 rendu des templates.

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

(limited to 'templates')

diff --git a/templates/timetable_common.html b/templates/timetable_common.html
index d9e4ec7..21300f1 100644
--- a/templates/timetable_common.html
+++ b/templates/timetable_common.html
@@ -6,7 +6,7 @@
           <li class="course">
             <b>{{ course }}</b>{% if course.type %} ({{ course.type }}){% endif %}, de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}<br />
             <em>{% if group_mode %}{{ course.rooms.all|format_rooms }}{% else %}{{ course.groups.all|join:", " }}{% endif %}</em>{% endif %}{% if course.notes %}<br />
-            <small>Remarques : {{ course.notes }}</small>{% endif %}
+            <small>Remarques : {{ course.notes|linebreaksbr }}</small>{% endif %}
           </li>{% endfor %}
         </ul>
       </section>{% empty %}
-- 
cgit v1.2.1


From a2fcd4c7c42b6c02ff8ff7dac4aa23b3d17407de Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Wed, 17 Jan 2018 12:34:11 +0100
Subject: Base du formulaire de QSJPS

---
 templates/form_qsjps.html | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 templates/form_qsjps.html

(limited to 'templates')

diff --git a/templates/form_qsjps.html b/templates/form_qsjps.html
new file mode 100644
index 0000000..2d97a89
--- /dev/null
+++ b/templates/form_qsjps.html
@@ -0,0 +1,10 @@
+{% extends "index.html" %}
+
+{% block title %}QSJPS &ndash; {% endblock %}
+
+{% block body %}
+      <form action="{% url "qsjps" %}" method="post">
+	{{ form }}
+	<input type="submit" value="Trouver une salle" />
+      </form>
+{% endblock %}
-- 
cgit v1.2.1


From dd1758f543d45376ea64d6846152fbf229b936f9 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Wed, 17 Jan 2018 19:13:33 +0100
Subject: Meilleur formatage du formulaire avec des tableaux

---
 templates/form_qsjps.html | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/form_qsjps.html b/templates/form_qsjps.html
index 2d97a89..3a9bcf8 100644
--- a/templates/form_qsjps.html
+++ b/templates/form_qsjps.html
@@ -3,8 +3,16 @@
 {% block title %}QSJPS &ndash; {% endblock %}
 
 {% block body %}
+      <h3>Trouver une salle</h3>
       <form action="{% url "qsjps" %}" method="post">
-	{{ form }}
-	<input type="submit" value="Trouver une salle" />
+        <table>
+          {% for field in form.visible_fields %}
+            <tr>
+              <th>{{ field.label_tag }}</th>
+              <td>{{ field }}{% if field.errors %}<br /><span>{{ field.errors|join:" " }}</span>{% endif %}</td>
+            </tr>
+          {% endfor %}
+          <tr><th></th><td><input type="submit" value="Trouver une salle" /></td></tr>
+        </table>
       </form>
 {% endblock %}
-- 
cgit v1.2.1


From b1e5d205e37a2c0a5d4f42afe0bdce9e0fbf97dd Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Thu, 18 Jan 2018 12:06:45 +0100
Subject: Modification de la gestion du formulaire qsjps

Renommage de la template contenant le formulaire
---
 templates/form_qsjps.html | 18 ------------------
 templates/qsjps_form.html | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 templates/form_qsjps.html
 create mode 100644 templates/qsjps_form.html

(limited to 'templates')

diff --git a/templates/form_qsjps.html b/templates/form_qsjps.html
deleted file mode 100644
index 3a9bcf8..0000000
--- a/templates/form_qsjps.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "index.html" %}
-
-{% block title %}QSJPS &ndash; {% endblock %}
-
-{% block body %}
-      <h3>Trouver une salle</h3>
-      <form action="{% url "qsjps" %}" method="post">
-        <table>
-          {% for field in form.visible_fields %}
-            <tr>
-              <th>{{ field.label_tag }}</th>
-              <td>{{ field }}{% if field.errors %}<br /><span>{{ field.errors|join:" " }}</span>{% endif %}</td>
-            </tr>
-          {% endfor %}
-          <tr><th></th><td><input type="submit" value="Trouver une salle" /></td></tr>
-        </table>
-      </form>
-{% endblock %}
diff --git a/templates/qsjps_form.html b/templates/qsjps_form.html
new file mode 100644
index 0000000..bc5e363
--- /dev/null
+++ b/templates/qsjps_form.html
@@ -0,0 +1,18 @@
+{% extends "index.html" %}
+
+{% block title %}Trouver une salle &ndash; {% endblock %}
+
+{% block body %}
+      <h3>Trouver une salle</h3>
+      <form action="{% url "qsjps" %}" method="post">
+        <table>
+          {% for field in form.visible_fields %}
+            <tr>
+              <th>{{ field.label_tag }}</th>
+              <td>{{ field }}{% if field.errors %}<br /><span>{{ field.errors|join:" " }}</span>{% endif %}</td>
+            </tr>
+          {% endfor %}
+          <tr><th></th><td><input type="submit" value="Trouver une salle" /></td></tr>
+        </table>
+      </form>
+{% endblock %}
-- 
cgit v1.2.1


From 175e1c1139a77a02f3c52d77a4d2b118c2b2e578 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Thu, 18 Jan 2018 12:17:08 +0100
Subject: Ajout d’une template pour lister les salles trouvées

---
 templates/qsjps.html | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 templates/qsjps.html

(limited to 'templates')

diff --git a/templates/qsjps.html b/templates/qsjps.html
new file mode 100644
index 0000000..73290de
--- /dev/null
+++ b/templates/qsjps.html
@@ -0,0 +1,14 @@
+{% extends "index.html" %}
+
+{% block title %}Trouver une salle &ndash; {% endblock %}
+
+{% block body %}
+      <h3>Trouver une salle entre {{ form.begin.value }} et {{ form.end.value }}</h3>
+      <ul>
+	{% for room in rooms %}
+	  <li>{{ room }}</li>
+	{% empty %}
+	  <p>Aucune salle trouvée</p>
+	{% endfor %}
+      </ul>
+{% endblock %}
-- 
cgit v1.2.1


From 7a4bdfda6df3ca46f4805c145a42793cacc0809f Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 19 Jan 2018 18:02:22 +0100
Subject: Meilleur rendu du formulaire sur appareils mobiles

---
 templates/qsjps.html      | 10 +++++-----
 templates/qsjps_form.html |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/templates/qsjps.html b/templates/qsjps.html
index 73290de..bb07b60 100644
--- a/templates/qsjps.html
+++ b/templates/qsjps.html
@@ -5,10 +5,10 @@
 {% block body %}
       <h3>Trouver une salle entre {{ form.begin.value }} et {{ form.end.value }}</h3>
       <ul>
-	{% for room in rooms %}
-	  <li>{{ room }}</li>
-	{% empty %}
-	  <p>Aucune salle trouvée</p>
-	{% endfor %}
+	  {% for room in rooms %}
+	    <li>{{ room }}</li>
+	  {% empty %}
+	    <p>Aucune salle trouvée</p>
+	  {% endfor %}
       </ul>
 {% endblock %}
diff --git a/templates/qsjps_form.html b/templates/qsjps_form.html
index bc5e363..b68143f 100644
--- a/templates/qsjps_form.html
+++ b/templates/qsjps_form.html
@@ -9,7 +9,7 @@
           {% for field in form.visible_fields %}
             <tr>
               <th>{{ field.label_tag }}</th>
-              <td>{{ field }}{% if field.errors %}<br /><span>{{ field.errors|join:" " }}</span>{% endif %}</td>
+              <td>{{ field }}{% if field.errors %}<br /><small>{{ field.errors|join:" " }}</small>{% endif %}</td>
             </tr>
           {% endfor %}
           <tr><th></th><td><input type="submit" value="Trouver une salle" /></td></tr>
-- 
cgit v1.2.1


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')

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')

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 046e92137ace30cd645ba0f42421c283a60ba0cd Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 19 Jan 2018 21:31:35 +0100
Subject: N’affiche plus la liste des groupes dans l’emploi du temps des salles
 si un cours n’en a pas, au lieu de se baser sur le nombre de salles d’un
 cours pour faire ce choix. Suppression du préchargement des salles lorsqu’on
 demande les cours d’une salle. Cela permet de réduire le nombre de requêtes
 effectuées.

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

(limited to 'templates')

diff --git a/templates/timetable_common.html b/templates/timetable_common.html
index 21300f1..6e59322 100644
--- a/templates/timetable_common.html
+++ b/templates/timetable_common.html
@@ -4,7 +4,7 @@
         <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 }}</b>{% if course.type %} ({{ course.type }}){% endif %}, de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}<br />
+            <b>{{ course }}</b>{% if course.type %} ({{ course.type }}){% endif %}, de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if group_mode and course.rooms.all|length > 0 or not group_mode and course.groups.all|length > 0 %}<br />
             <em>{% if group_mode %}{{ course.rooms.all|format_rooms }}{% else %}{{ course.groups.all|join:", " }}{% endif %}</em>{% endif %}{% if course.notes %}<br />
             <small>Remarques : {{ course.notes|linebreaksbr }}</small>{% endif %}
           </li>{% endfor %}
-- 
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 +
 templates/index.html      | 1 +
 templates/qsjps_form.html | 1 +
 templates/timetable.html  | 1 +
 4 files changed, 4 insertions(+)

(limited to 'templates')

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 %}
diff --git a/templates/index.html b/templates/index.html
index 71665bc..5779b3e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -21,6 +21,7 @@
         <p><em>Aucun emploi du temps à afficher</em></p>
         {% endfor %}
       </ul>
+      {% if year %}<a href="{% url "index" %}">Retour à la liste des années</a>{% else %}<a href="{% url "rooms" %}">Emploi du temps des salles</a>{% endif %}
       {% endblock %}
     </div>
     <footer>
diff --git a/templates/qsjps_form.html b/templates/qsjps_form.html
index b68143f..280a7ad 100644
--- a/templates/qsjps_form.html
+++ b/templates/qsjps_form.html
@@ -15,4 +15,5 @@
           <tr><th></th><td><input type="submit" value="Trouver une salle" /></td></tr>
         </table>
       </form>
+      <a href="{% url "rooms" %}">Retour à la liste des salles</a>
 {% endblock %}
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


From 1abd9faddd2f07341c6ff70dfa88d7c83eac40c3 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Tue, 3 Apr 2018 08:05:00 +0200
Subject: Changement de l’année inscrite dans la template

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

(limited to 'templates')

diff --git a/templates/index.html b/templates/index.html
index 71665bc..081f663 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -24,7 +24,7 @@
       {% endblock %}
     </div>
     <footer>
-      <p>(c) 2017 &ndash; Alban Gruin &ndash; <a href="{% url "django.contrib.flatpages.views.flatpage" url="contact/" %}">contacter</a> &ndash; celcatsanitizer {{ celcatsanitizer_version }} &ndash; <a href="{% url "django.contrib.flatpages.views.flatpage" url="a-propos/" %}">à propos</a><br />
+      <p>(c) 2018 &ndash; Alban Gruin &ndash; <a href="{% url "django.contrib.flatpages.views.flatpage" url="contact/" %}">contacter</a> &ndash; celcatsanitizer {{ celcatsanitizer_version }} &ndash; <a href="{% url "django.contrib.flatpages.views.flatpage" url="a-propos/" %}">à propos</a><br />
       Design inspiré par <a href="https://bestmotherfucking.website/">https://bestmotherfucking.website/</a></p>
     </footer>
   </body>
-- 
cgit v1.2.1


From 2b6d00999af12699b24c39a22655291b63d37cee Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 15 Apr 2018 13:30:46 +0200
Subject: Code de la template des emplois du temps plus lisible

---
 templates/timetable.html | 33 +++++++++++++++++++++++++++------
 1 file changed, 27 insertions(+), 6 deletions(-)

(limited to 'templates')

diff --git a/templates/timetable.html b/templates/timetable.html
index 5848e04..4bb3e10 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -14,14 +14,35 @@
       <h2>{% if group_mode %}{{ timetable }} &ndash;{% else %}Salle{% endif %} {{ group }} &ndash; Semaine {{ week }}</h2>
       <p>
         {% if is_old_timetable %}
-        <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 />
+          <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">
-        {% 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 %}
-      </p>{% endblock %}
+        {% 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 %}
+      </p>
+{% 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')

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 305902a22e82cf68cd6b84e4f58ae42bdbb24b83 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 15 Apr 2018 15:27:32 +0200
Subject: Ajout d’une explication sur le format ICS

---
 templates/calendars.html | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'templates')

diff --git a/templates/calendars.html b/templates/calendars.html
index 52c3a11..e6fcd9f 100644
--- a/templates/calendars.html
+++ b/templates/calendars.html
@@ -4,6 +4,11 @@
 
 {% block body %}
       <h2>ICS disponibles pour le groupe {{ group }}</h2>
+      <p>
+        Le format ICS (ou iCalendar) permet d’importer un calendrier
+        dans un agenda électronique.<br />
+        <a href="https://fr.wikipedia.org/wiki/ICalendar">En savoir plus</a>
+      </p>
       <ul>
         <li><a href="{% url "ics" timetable.year.slug timetable.slug group.slug %}">Un seul ICS pour tous les cours</a></li>
 {% for group in groups %}
-- 
cgit v1.2.1


From 7f0fa4871566050e283845ee0577603ded70df0f Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 21 Apr 2018 12:59:32 +0200
Subject: templates: abstraction et séparation des templates de liste

---
 templates/index.html        | 20 ++++++++++----------
 templates/mention_list.html |  6 ++++++
 templates/year_list.html    |  5 +++++
 3 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 templates/mention_list.html
 create mode 100644 templates/year_list.html

(limited to 'templates')

diff --git a/templates/index.html b/templates/index.html
index 007ab35..c7c2543 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
 {% block head %}{% endblock %}
-    <title>{% block title %}{% if year %}{{ year }} &ndash; {% endif %}{% endblock %}celcatsanitizer</title>
+    <title>{% block title %}{% endblock %}celcatsanitizer</title>
     <link rel="stylesheet" href="{% static "celcatsanitizer/style.css" %}">
   </head>
   <body>
@@ -13,15 +13,15 @@
     </header>
     <div class="content">
       {% block body %}
-      <h3>{% if year %}{{ year }} &ndash; Choisissez votre mention{% else %}Choisissez votre année{% endif %}</h3>
-      <ul>
-        {% for element in elements %}
-        <li><a href="{% if year %}{% url "groups" year.slug element.slug %}{% else %}{% url "mentions" element.slug %}{% endif %}">{{ element }}</a></li>
-        {% empty %}
-        <p><em>Aucun emploi du temps à afficher</em></p>
-        {% endfor %}
-      </ul>
-      {% if year %}<a href="{% url "index" %}">Retour à la liste des années</a>{% else %}<a href="{% url "rooms" %}">Emploi du temps des salles</a>{% endif %}
+        <h3>{% block pagetitle %}{% endblock %}</h3>
+        <ul>
+          {% for element in elements %}
+            <li><a href="{% block url %}{% endblock %}">{{ element }}</a></li>
+          {% empty %}
+            <p><em>{% block empty %}Aucun emploi du temps à afficher{% endblock %}</em></p>
+          {% endfor %}
+        </ul>
+        {% block navigation %}{% endblock %}
       {% endblock %}
     </div>
     <footer>
diff --git a/templates/mention_list.html b/templates/mention_list.html
new file mode 100644
index 0000000..3b9d8e8
--- /dev/null
+++ b/templates/mention_list.html
@@ -0,0 +1,6 @@
+{% extends "index.html" %}
+
+{% block title %}{{ year }} &ndash; {% endblock %}
+{% block pagetitle %}{{ year }} &ndash; Choississez votre mention{% endblock %}
+{% block url %}{% url "groups" year.slug element.slug %}{% endblock %}
+{% block navigation %}<a href="{% url "index" %}">Retour à la liste des années</a>{% endblock %}
diff --git a/templates/year_list.html b/templates/year_list.html
new file mode 100644
index 0000000..4256ec1
--- /dev/null
+++ b/templates/year_list.html
@@ -0,0 +1,5 @@
+{% extends "index.html" %}
+
+{% block pagetitle %}Choisissez votre année{% endblock %}
+{% block url %}{% url "mentions" element.slug %}{% endblock %}
+{% block navigation %}<a href="{% url "rooms" %}">Emploi du temps des salles</a>{% endblock %}
-- 
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 ++++++-
 templates/group_weeks_list.html |  8 ++++++++
 templates/groups_all_list.html  |  6 ++++++
 templates/index.html            |  2 +-
 templates/room_weeks_list.html  |  7 +++++++
 templates/timetable.html        | 10 ++++++++--
 6 files changed, 36 insertions(+), 4 deletions(-)
 create mode 100644 templates/group_weeks_list.html
 create mode 100644 templates/groups_all_list.html
 create mode 100644 templates/room_weeks_list.html

(limited to 'templates')

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 %}
diff --git a/templates/group_weeks_list.html b/templates/group_weeks_list.html
new file mode 100644
index 0000000..c348d5d
--- /dev/null
+++ b/templates/group_weeks_list.html
@@ -0,0 +1,8 @@
+{% extends "index.html" %}
+{% load dt_week %}
+
+{% block title %}Semaines du groupe {{ group }} &ndash; {% endblock %}
+{% block pagetitle %}Semaines du groupe {{ group }}{% endblock %}
+{% block url %}{% url "timetable" timetable.year.slug timetable.slug group.slug element.year element|dt_week %}{% endblock %}
+{% block element %}{{ element|dt_prettyprint }} (semaine {{ element|dt_week }}){% endblock %}
+{% block navigation %}<a href="{% url "groups" timetable.year.slug timetable.slug %}">Liste des groupes</a>{% endblock %}
diff --git a/templates/groups_all_list.html b/templates/groups_all_list.html
new file mode 100644
index 0000000..36bc447
--- /dev/null
+++ b/templates/groups_all_list.html
@@ -0,0 +1,6 @@
+{% extends "index.html" %}
+
+{% block title %}Liste des groupes de {{ timetable }} &ndash; {% endblock %}
+{% block pagetitle %}Liste des groupes de {{ timetable }}{% endblock %}
+{% block url %}{% url "group-weeks" timetable.year.slug timetable.slug element.slug %}{% endblock %}
+{% block navigation %}<a href="{% url "groups" timetable.year.slug timetable.slug %}">Retour à la liste réduite</a>{% endblock %}
diff --git a/templates/index.html b/templates/index.html
index c7c2543..cdab591 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -16,7 +16,7 @@
         <h3>{% block pagetitle %}{% endblock %}</h3>
         <ul>
           {% for element in elements %}
-            <li><a href="{% block url %}{% endblock %}">{{ element }}</a></li>
+            <li><a href="{% block url %}{% endblock %}">{% block element %}{{ element }}{% endblock %}</a></li>
           {% empty %}
             <p><em>{% block empty %}Aucun emploi du temps à afficher{% endblock %}</em></p>
           {% endfor %}
diff --git a/templates/room_weeks_list.html b/templates/room_weeks_list.html
new file mode 100644
index 0000000..6a4c3d9
--- /dev/null
+++ b/templates/room_weeks_list.html
@@ -0,0 +1,7 @@
+{% extends "group_weeks_list.html" %}
+{% load dt_week %}
+
+{% block title %}Semaines de la salle {{ room }} &ndash; {% endblock %}
+{% block pagetitle %}Semaines de la salle {{ room }}{% endblock %}
+{% block url %}{% url "room-timetable" room.slug element.year element|dt_week %}{% endblock %}
+{% block navigation %}<a href="{% url "rooms" %}">Liste des salles</a>{% endblock %}
diff --git a/templates/timetable.html b/templates/timetable.html
index 4bb3e10..a6dc1ab 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -31,15 +31,21 @@
           <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 %}
+          &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 %}
-          {% if last_week is not None or next_week is not None %}<br />{% endif %}
+          <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>
-- 
cgit v1.2.1


From 9853d375d9e482c23f5fdbed9a3cf041029a92cb Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Mon, 23 Apr 2018 15:59:21 +0200
Subject: qsjps: ajout d’un lien vers les salles dans la liste des résultats

---
 templates/qsjps.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'templates')

diff --git a/templates/qsjps.html b/templates/qsjps.html
index bb07b60..a166dbd 100644
--- a/templates/qsjps.html
+++ b/templates/qsjps.html
@@ -1,14 +1,17 @@
 {% extends "index.html" %}
+{% load dt_week %}
 
 {% block title %}Trouver une salle &ndash; {% endblock %}
 
 {% block body %}
       <h3>Trouver une salle entre {{ form.begin.value }} et {{ form.end.value }}</h3>
       <ul>
-	  {% for room in rooms %}
-	    <li>{{ room }}</li>
-	  {% empty %}
-	    <p>Aucune salle trouvée</p>
-	  {% endfor %}
+	    {% with year=form.cleaned_data.day.year week=form.cleaned_data.day|dt_week %}
+	      {% for room in rooms %}
+	        <li><a href="{% url "room-timetable" room.slug year week %}">{{ room }}</li>
+	      {% empty %}
+	        <p>Aucune salle trouvée</p>
+	      {% endfor %}
+	    {% endwith %}
       </ul>
 {% endblock %}
-- 
cgit v1.2.1


From 60e3b389d065746d61906f91327867bfd5ed582c Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Wed, 25 Apr 2018 09:34:34 +0200
Subject: qsjps: abstraction et navigation de la template

---
 templates/qsjps.html | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

(limited to 'templates')

diff --git a/templates/qsjps.html b/templates/qsjps.html
index a166dbd..9fbdf8a 100644
--- a/templates/qsjps.html
+++ b/templates/qsjps.html
@@ -2,16 +2,7 @@
 {% load dt_week %}
 
 {% block title %}Trouver une salle &ndash; {% endblock %}
-
-{% block body %}
-      <h3>Trouver une salle entre {{ form.begin.value }} et {{ form.end.value }}</h3>
-      <ul>
-	    {% with year=form.cleaned_data.day.year week=form.cleaned_data.day|dt_week %}
-	      {% for room in rooms %}
-	        <li><a href="{% url "room-timetable" room.slug year week %}">{{ room }}</li>
-	      {% empty %}
-	        <p>Aucune salle trouvée</p>
-	      {% endfor %}
-	    {% endwith %}
-      </ul>
-{% endblock %}
+{% block pagetitle %}Trouver une salle entre {{ form.begin.value }} et {{ form.end.value }}</h3>{% endblock %}
+{% block url %}{% url "room-timetable" element.slug form.cleaned_data.day.year form.cleaned_data.day|dt_week %}{% endblock %}
+{% block navigation %}<a href="{% url "rooms" %}">Retour à la liste des salles</a> &ndash;
+<a href="{% url "qsjps" %}">Nouvelle recherche</a>{% endblock %}
-- 
cgit v1.2.1


From fb3a3bc214b071083325a75a9546331150eaa8a5 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Wed, 25 Apr 2018 09:35:18 +0200
Subject: templates: abstraction des listes de groupes/salles/semaines

---
 templates/group_list.html | 25 +++++++++++--------------
 templates/index.html      |  2 +-
 templates/room_list.html  |  9 +++++++++
 3 files changed, 21 insertions(+), 15 deletions(-)
 create mode 100644 templates/room_list.html

(limited to 'templates')

diff --git a/templates/group_list.html b/templates/group_list.html
index 9c9a7fc..bca8c70 100644
--- a/templates/group_list.html
+++ b/templates/group_list.html
@@ -1,19 +1,16 @@
 {% extends "index.html" %}
 {% load dt_week %}
 
-{% block title %}{% if timetable %}{{ timetable }}{% else %}Emploi du temps des salles{% endif %} &ndash; {% endblock %}
+{% block title %}{{ timetable }} &ndash; {% endblock %}
+{% block pagetitle %}<a href="{{ timetable.source.url }}">{{ timetable }}</a>{% endblock %}
 
-{% block body %}
-      <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>
-        {% 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 %}
+{% block lelement %}<a class="text"{% if element.weeks is not None %} href="{% block gurl %}{% url "timetable" timetable.year.slug timetable.slug element.slug %}{% endblock %}"{% endif %}>{{ element }}</a> &mdash;
+{% for week in element.weeks %}
+  <a href="{% block wurl %}{% url "timetable" timetable.year.slug timetable.slug element.slug week.year week|dt_week %}{% endblock %}">{{ week|dt_prettyprint }}</a> {% if not forloop.last %}&ndash; {% endif %}
+{% empty %}
+  <em>aucun cours dans le mois à venir</em>
+{% endfor %}
 {% endblock %}
+
+{% block navigation %}<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>{% endblock %}
diff --git a/templates/index.html b/templates/index.html
index cdab591..e86038e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -16,7 +16,7 @@
         <h3>{% block pagetitle %}{% endblock %}</h3>
         <ul>
           {% for element in elements %}
-            <li><a href="{% block url %}{% endblock %}">{% block element %}{{ element }}{% endblock %}</a></li>
+            <li>{% block lelement %}<a href="{% block url %}{% endblock %}">{% block element %}{{ element }}{% endblock %}</a>{% endblock %}</li>
           {% empty %}
             <p><em>{% block empty %}Aucun emploi du temps à afficher{% endblock %}</em></p>
           {% endfor %}
diff --git a/templates/room_list.html b/templates/room_list.html
new file mode 100644
index 0000000..1b8497d
--- /dev/null
+++ b/templates/room_list.html
@@ -0,0 +1,9 @@
+{% extends "group_list.html" %}
+{% load dt_week %}
+
+{% block title %}Emploi du temps des salles &ndash; {% endblock %}
+{% block pagetitle %}Emploi du temps des salles{% endblock %}
+{% block gurl %}{% url "room-timetable" element.slug %}{% endblock %}
+{% block wurl %}{% url "room-timetable" element.slug week.year week|dt_week %}{% endblock %}
+{% block navigation %}<a href="{% url "index" %}">Retour à la liste des années</a> &ndash;
+<a href="{% url "qsjps" %}">Trouver une salle libre</a>{% endblock %}
-- 
cgit v1.2.1


From 4c82869e3a590c982c43958e3e4b0f9fad440678 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Wed, 25 Apr 2018 09:42:24 +0200
Subject: templates: remplacement de dt_prettyprint par date

---
 templates/group_list.html       | 2 +-
 templates/group_weeks_list.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/group_list.html b/templates/group_list.html
index bca8c70..d88f144 100644
--- a/templates/group_list.html
+++ b/templates/group_list.html
@@ -6,7 +6,7 @@
 
 {% block lelement %}<a class="text"{% if element.weeks is not None %} href="{% block gurl %}{% url "timetable" timetable.year.slug timetable.slug element.slug %}{% endblock %}"{% endif %}>{{ element }}</a> &mdash;
 {% for week in element.weeks %}
-  <a href="{% block wurl %}{% url "timetable" timetable.year.slug timetable.slug element.slug week.year week|dt_week %}{% endblock %}">{{ week|dt_prettyprint }}</a> {% if not forloop.last %}&ndash; {% endif %}
+  <a href="{% block wurl %}{% url "timetable" timetable.year.slug timetable.slug element.slug week.year week|dt_week %}{% endblock %}">{{ week|date:"Y/m/d" }}</a> {% if not forloop.last %}&ndash; {% endif %}
 {% empty %}
   <em>aucun cours dans le mois à venir</em>
 {% endfor %}
diff --git a/templates/group_weeks_list.html b/templates/group_weeks_list.html
index c348d5d..baf312e 100644
--- a/templates/group_weeks_list.html
+++ b/templates/group_weeks_list.html
@@ -4,5 +4,5 @@
 {% block title %}Semaines du groupe {{ group }} &ndash; {% endblock %}
 {% block pagetitle %}Semaines du groupe {{ group }}{% endblock %}
 {% block url %}{% url "timetable" timetable.year.slug timetable.slug group.slug element.year element|dt_week %}{% endblock %}
-{% block element %}{{ element|dt_prettyprint }} (semaine {{ element|dt_week }}){% endblock %}
+{% block element %}{{ element|date:"Y/m/d" }} (semaine {{ element|dt_week }}){% endblock %}
 {% block navigation %}<a href="{% url "groups" timetable.year.slug timetable.slug %}">Liste des groupes</a>{% endblock %}
-- 
cgit v1.2.1