From a4a3aa91a9eacf0f67442d79d8aaee01b7a1256b Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Wed, 25 Jan 2017 14:25:04 +0100
Subject: Suppression du slug de l'emploi du temps dans les URLs ainsi que sa
 récupération manuelle inutile car déjà référencée par le groupe

---
 templates/index.html     | 2 +-
 templates/subscribe.html | 6 +++---
 templates/timetable.html | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'templates')

diff --git a/templates/index.html b/templates/index.html
index 5fe6678..812a991 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -61,7 +61,7 @@ li.course {
       <section id="{{ timetable.slug }}">
         <h3><a href="{{ timetable.url }}">{{ timetable.name }}</a></h3>
         <ul>{% for group in groups %}{% if group.timetable.id == timetable.id %}
-          <li>{{ group.name }} &ndash; {% for week in group.weeks %}<a href="{% url "timetable" timetable.slug week.year week|dt_week group.slug %}">{{ week|dt_prettyprint }}</a> {% endfor %}</li>{% endif %}{% endfor %}
+          <li>{{ group.name }} &ndash; {% for week in group.weeks %}<a href="{% url "timetable" group.slug week.year week|dt_week %}">{{ week|dt_prettyprint }}</a> {% endfor %}</li>{% endif %}{% endfor %}
         </ul>
       </section>{% endfor %}{% endblock %}
     </div>
diff --git a/templates/subscribe.html b/templates/subscribe.html
index b1aa71b..2cd6d87 100644
--- a/templates/subscribe.html
+++ b/templates/subscribe.html
@@ -1,10 +1,10 @@
 {% extends "index.html" %}
 
-{% block title %}S'abonner à {{ timetable.name }} &ndash; {{ group.name }}{% endblock %}
+{% block title %}S'abonner à {{ group.timetable.name }} &ndash; {{ group.name }}{% endblock %}
 
 {% block body %}
-      <h2>S'abonner à {{ timetable.name }} &ndash; {{ group.name }}</h2>
-      <form action="{% url "subscribe" timetable.slug year week group.slug %}" method="post">
+      <h2>S'abonner à {{ group.timetable.name }} &ndash; {{ group.name }}</h2>
+      <form action="{% url "subscribe" group.slug year week %}" method="post">
         {% csrf_token %}
         {{ form }}
         <input type="submit" value="S'abonner" />
diff --git a/templates/timetable.html b/templates/timetable.html
index 28f6005..9d05be6 100644
--- a/templates/timetable.html
+++ b/templates/timetable.html
@@ -1,9 +1,9 @@
 {% extends "index.html" %}
 
-{% block title %}{{ timetable.name }} &ndash; {{ group.name }} &ndash; Semaine {{ week }} &ndash; {% endblock %}
+{% block title %}{{ group.timetable.name }} &ndash; {{ group.name }} &ndash; Semaine {{ week }} &ndash; {% endblock %}
 
 {% block body %}
-      <h2>{{ timetable.name }} &ndash; {{ group.name }} &ndash; Semaine {{ week }}</h2>
+      <h2>{{ group.timetable.name }} &ndash; {{ group.name }} &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>{{ day.0.begin|date:"l j F o" }} &ndash; de {{ day.0.begin|date:"H:i" }} à {% with day|last as last %}{{ last.end|date:"H:i" }}{% endwith %}</h3>
@@ -11,4 +11,4 @@
           <li class="course"><b>{{ course.name }}</b>, de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}<br /><em>Salle{% if course.rooms.all|length > 1 %}s{% endif %} {% for room in course.rooms.all %}{{ room }} {% endfor %}</em>{% endif %}</li>{% endfor %}
         </ul>
       </section>{% endfor %}
-      <p><a class="subscribe" href="{% url "subscribe" timetable.slug year week group.slug %}">S'abonner à cet emploi du temps</a></p>{% endblock %}
+      <p><a class="subscribe" href="{% url "subscribe" group.slug year week %}">S'abonner à cet emploi du temps</a></p>{% endblock %}
-- 
cgit v1.2.1