Merge branch 'fusion/alban' into qsjps

5 files changed, 11 insertions, 2 deletions

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 081f663..007ab35 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 8fafeed..5848e04 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,9 @@
         {% 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 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 %}
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 %}