Merge branch 'stable/0.13.z' into prod/pa1ch/0.y.z

1 files changed, 10 insertions, 7 deletions

diff --git a/templates/group_list.html b/templates/group_list.html
index f21b2b1..d88f144 100644
--- a/templates/group_list.html
+++ b/templates/group_list.html
@@ -2,12 +2,15 @@
 {% load dt_week %}
 
 {% block title %}{{ timetable }} – {% endblock %}
+{% block pagetitle %}<a href="{{ timetable.source.url }}">{{ timetable }}</a>{% endblock %}
 
-{% block body %}
-      <h3><a href="{{ timetable.url }}">{{ timetable }}</a></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>
-        {% endfor %}
-      </ul>
+{% 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|date:"Y/m/d" }}</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 %}