From bb049a8d5954bbcf3ae5207a0ab4445591555d6e Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 18 Nov 2017 18:21:52 +0100 Subject: Tentative de mise en commun de la template des edts --- templates/timetable.html | 12 ++++++------ views.py | 3 ++- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/templates/timetable.html b/templates/timetable.html index fc2065f..4c921fd 100644 --- a/templates/timetable.html +++ b/templates/timetable.html @@ -1,21 +1,21 @@ {% extends "index.html" %} -{% block head %} +{% block head %}{% if group_mode %} -{% endblock %} +{% endif %}{% endblock %} -{% block title %}{{ group.timetable }} – {{ group }} – Semaine {{ week }} – {% endblock %} +{% block title %}{% if group_mode %}{{ group.timetable }} –{% else %}Salle{% endif %} {{ group }} – Semaine {{ week }} – {% endblock %} {% block body %} -

{{ group.timetable }} – {{ group }} – Semaine {{ week }}

+

{% if group_mode %}{{ group.timetable }} –{% else %}Salle{% endif %} {{ group }} – Semaine {{ week }}

{% if is_old_timetable %} - Accéder à l’emploi du temps de cette semaine.
+ Accéder à l’emploi du temps de cette semaine.
{% endif %} {% if last_update %}Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}{% endif %}

{% include "timetable_common.html" %} -

ICSRSSAtom

{% endblock %} + {% if group_mode %}

ICSRSSAtom

{% endif %}{% endblock %} diff --git a/views.py b/views.py index 428711f..cb6978b 100644 --- a/views.py +++ b/views.py @@ -83,7 +83,8 @@ def timetable_common(request, obj, year=None, week=None): return render(request, "timetable.html", {"group": obj, "courses": grouped_courses, "last_update": last_update, "year": year, "week": int(week), - "is_old_timetable": is_old_timetable}) + "is_old_timetable": is_old_timetable, + "group_mode": isinstance(obj, Group)}) def timetable(request, year_slug, timetable_slug, group_slug, year=None, week=None): timetable = get_object_or_404(Timetable, year__slug=year_slug, slug=timetable_slug) -- cgit v1.2.1