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/qsjps.html')

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 – {% 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 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'templates/qsjps.html')

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 %}
-- 
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/qsjps.html')

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/qsjps.html')

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