From 78920718408ab411680b7f5dd003b70c4e458e37 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Tue, 5 Sep 2017 10:38:23 +0200
Subject: Correction de l’affichage des remarques

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

(limited to 'templates/timetable.html')

diff --git a/templates/timetable.html b/templates/timetable.html
index 264a25c..ba673ce 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -9,7 +9,11 @@
       <section>
         <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.name }}</b> ({{ course.type }}), 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 is not None %}<br /><small>Remarques : {{ course.notes }}</small>{% endif %}</li>{% endfor %}
+          <li class="course">
+            <b>{{ course.name }}</b> ({{ course.type }}), 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 />
+            <small>Remarques : {{ course.notes }}</small>{% endif %}
+          </li>{% endfor %}
         </ul>
       </section>{% endfor %}
       <p><a class="subscribe" href="{% url "subscribe" group.timetable.slug group.slug year week %}">S’abonner à cet emploi du temps</a></p>{% endblock %}
-- 
cgit v1.2.1


From 0426214423e7a43c31d62ecd4e7d8f29cb65d251 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Tue, 5 Sep 2017 11:42:45 +0200
Subject: Re-correction de l’affichage des remarques

---
 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 ba673ce..149068d 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -11,7 +11,7 @@
         <ul>{% for course in day %}
           <li class="course">
             <b>{{ course.name }}</b> ({{ course.type }}), 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>{{ course.rooms.all|format_rooms }}</em>{% endif %}{% if course.notes != "" and courses.notes is not None %}<br />
             <small>Remarques : {{ course.notes }}</small>{% endif %}
           </li>{% endfor %}
         </ul>
-- 
cgit v1.2.1


From 57ffdbf0658042069abcf0b1f9184ff69a3139e2 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 8 Sep 2017 11:53:49 +0200
Subject: Ajout de l’année dans les urls

---
 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 149068d..a867fd0 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -16,4 +16,4 @@
           </li>{% endfor %}
         </ul>
       </section>{% endfor %}
-      <p><a class="subscribe" href="{% url "subscribe" group.timetable.slug group.slug year week %}">S’abonner à cet emploi du temps</a></p>{% endblock %}
+      <p><a class="subscribe" href="{% url "subscribe" group.timetable.year.slug group.timetable.slug group.slug year week %}">S’abonner à cet emploi du temps</a></p>{% endblock %}
-- 
cgit v1.2.1


From bfa42fa2fbd93336227b28a096250fcdd756ea78 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 8 Sep 2017 11:56:55 +0200
Subject: Simplification de certaines templates

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

(limited to 'templates/timetable.html')

diff --git a/templates/timetable.html b/templates/timetable.html
index a867fd0..b84a27d 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -1,16 +1,16 @@
 {% extends "index.html" %}
 {% load rooms %}
 
-{% block title %}{{ group.timetable.name }} &ndash; {{ group.name }} &ndash; Semaine {{ week }} &ndash; {% endblock %}
+{% block title %}{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }} &ndash; {% endblock %}
 
 {% block body %}
-      <h2>{{ group.timetable.name }} &ndash; {{ group.name }} &ndash; Semaine {{ week }}</h2>
+      <h2>{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }}</h2>
       <p>Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}</p>{% for day in courses %}
       <section>
         <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.name }}</b> ({{ course.type }}), de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}<br />
+            <b>{{ course }}</b> ({{ course.type }}), 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 != "" and courses.notes is not None %}<br />
             <small>Remarques : {{ course.notes }}</small>{% endif %}
           </li>{% endfor %}
-- 
cgit v1.2.1


From 400b3dc382ff5f0b279250b4952569206e42d7fd Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 8 Sep 2017 19:10:46 +0200
Subject: Simplification d’une template

---
 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 b84a27d..948aab4 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -11,7 +11,7 @@
         <ul>{% for course in day %}
           <li class="course">
             <b>{{ course }}</b> ({{ course.type }}), 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 != "" and courses.notes is not None %}<br />
+            <em>{{ course.rooms.all|format_rooms }}</em>{% endif %}{% if course.notes %}<br />
             <small>Remarques : {{ course.notes }}</small>{% endif %}
           </li>{% endfor %}
         </ul>
-- 
cgit v1.2.1


From 4d47946f07bc315db716dbddd1687817e3cae6ff Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 9 Sep 2017 11:35:16 +0200
Subject: Séparation de la template timetable en deux : une commune, qui ne
 contient que l’emploi du temps et utilisée par Atom, l’autre qui génère une
 page html complète.

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

(limited to 'templates/timetable.html')

diff --git a/templates/timetable.html b/templates/timetable.html
index 948aab4..b5117e2 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -1,19 +1,9 @@
 {% extends "index.html" %}
-{% load rooms %}
 
 {% block title %}{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }} &ndash; {% endblock %}
 
 {% block body %}
       <h2>{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }}</h2>
-      <p>Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}</p>{% for day in courses %}
-      <section>
-        <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> ({{ course.type }}), 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 />
-            <small>Remarques : {{ course.notes }}</small>{% endif %}
-          </li>{% endfor %}
-        </ul>
-      </section>{% endfor %}
+      <p>Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}</p>
+      {% include "timetable_common.html" %}
       <p><a class="subscribe" href="{% url "subscribe" group.timetable.year.slug group.timetable.slug group.slug year week %}">S’abonner à cet emploi du temps</a></p>{% endblock %}
-- 
cgit v1.2.1


From 815f01da38f9fd439098643b8522e182bedc1d27 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 9 Sep 2017 11:50:39 +0200
Subject: Ajout de liens pour le calendrier ICS et le flux atom

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

(limited to 'templates/timetable.html')

diff --git a/templates/timetable.html b/templates/timetable.html
index b5117e2..097373b 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -6,4 +6,7 @@
       <h2>{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }}</h2>
       <p>Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}</p>
       {% include "timetable_common.html" %}
-      <p><a class="subscribe" href="{% url "subscribe" group.timetable.year.slug group.timetable.slug group.slug year week %}">S’abonner à cet emploi du temps</a></p>{% endblock %}
+      <p>
+        <a href="{% url "ics" group.timetable.year.slug group.timetable.slug group.slug %}">ICS</a> &ndash; <a href="{% url "atom" group.timetable.year.slug group.timetable.slug group.slug %}">Atom</a><br />
+        <a class="subscribe" href="{% url "subscribe" group.timetable.year.slug group.timetable.slug group.slug year week %}">S’abonner à cet emploi du temps</a>
+      </p>{% endblock %}
-- 
cgit v1.2.1


From 5852f63c7f464f87926d5da289b91e0b8ba2e544 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 9 Sep 2017 11:53:41 +0200
Subject: Les liens d’abonnement sont tous cachés

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

(limited to 'templates/timetable.html')

diff --git a/templates/timetable.html b/templates/timetable.html
index 097373b..5428942 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -6,7 +6,7 @@
       <h2>{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }}</h2>
       <p>Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}</p>
       {% include "timetable_common.html" %}
-      <p>
+      <p class="subscribe">
         <a href="{% url "ics" group.timetable.year.slug group.timetable.slug group.slug %}">ICS</a> &ndash; <a href="{% url "atom" group.timetable.year.slug group.timetable.slug group.slug %}">Atom</a><br />
-        <a class="subscribe" href="{% url "subscribe" group.timetable.year.slug group.timetable.slug group.slug year week %}">S’abonner à cet emploi du temps</a>
+        <a href="{% url "subscribe" group.timetable.year.slug group.timetable.slug group.slug year week %}">S’abonner à cet emploi du temps</a>
       </p>{% endblock %}
-- 
cgit v1.2.1


From c7fce37ad4c8dee76f5d58eafefd0c73a03ea00c Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 9 Sep 2017 14:56:17 +0200
Subject: Suppression de l’envoi des mails

---
 templates/timetable.html | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'templates/timetable.html')

diff --git a/templates/timetable.html b/templates/timetable.html
index 5428942..f4b8719 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -6,7 +6,4 @@
       <h2>{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }}</h2>
       <p>Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}</p>
       {% include "timetable_common.html" %}
-      <p class="subscribe">
-        <a href="{% url "ics" group.timetable.year.slug group.timetable.slug group.slug %}">ICS</a> &ndash; <a href="{% url "atom" group.timetable.year.slug group.timetable.slug group.slug %}">Atom</a><br />
-        <a href="{% url "subscribe" group.timetable.year.slug group.timetable.slug group.slug year week %}">S’abonner à cet emploi du temps</a>
-      </p>{% endblock %}
+      <p class="subscribe"><a href="{% url "ics" group.timetable.year.slug group.timetable.slug group.slug %}">ICS</a> &ndash; <a href="{% url "atom" group.timetable.year.slug group.timetable.slug group.slug %}">Atom</a><br /></p>{% endblock %}
-- 
cgit v1.2.1


From 98242cad296b36423daf77e572d7735478d33f1d Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 9 Sep 2017 15:19:42 +0200
Subject: Ajout d’un flux RSS

---
 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 f4b8719..7a30595 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -6,4 +6,4 @@
       <h2>{{ group.timetable }} &ndash; {{ group }} &ndash; Semaine {{ week }}</h2>
       <p>Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}</p>
       {% include "timetable_common.html" %}
-      <p class="subscribe"><a href="{% url "ics" group.timetable.year.slug group.timetable.slug group.slug %}">ICS</a> &ndash; <a href="{% url "atom" group.timetable.year.slug group.timetable.slug group.slug %}">Atom</a><br /></p>{% endblock %}
+      <p class="subscribe"><a href="{% url "ics" 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 %}
-- 
cgit v1.2.1