diff options
| -rw-r--r-- | templates/timetable.html | 12 | ||||
| -rw-r--r-- | 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 %} <meta name="description" content="Emploi du temps du groupe {{ group }} – Semaine {{ week }}" /> <link rel="alternate" type="application/atom+xml" title="Emploi du temps du groupe {{ group }} (Atom)" href="{% url "atom" group.timetable.year.slug group.timetable.slug group.slug %}" /> <link rel="alternate" type="application/rss+xml" title="Emploi du temps du groupe {{ group }} (RSS)" href="{% url "rss" group.timetable.year.slug group.timetable.slug group.slug %}" /> <link rel="alternate" type="text/calendar" title="Emploi du temps du groupe {{ group }} (iCalendar)" href="{% url "ics" group.timetable.year.slug group.timetable.slug group.slug %}"> -{% 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 %} - <h2>{{ group.timetable }} – {{ group }} – Semaine {{ week }}</h2> + <h2>{% if group_mode %}{{ group.timetable }} –{% else %}Salle{% endif %} {{ group }} – Semaine {{ week }}</h2> <p> {% if is_old_timetable %} - <b><a href="{% url "timetable" group.timetable.year.slug group.timetable.slug group.slug %}">Accéder à l’emploi du temps de cette semaine.</b></a><br /> + <b><a href="{% if group_mode %}{% url "timetable" group.timetable.year.slug group.timetable.slug group.slug %}{% else %}{% url "room-timetable" group.slug %}{% endif %}">Accéder à l’emploi du temps de cette semaine.</b></a><br /> {% endif %} {% 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" %} - <p class="subscribe"><a href="{% url "calendars" group.timetable.year.slug group.timetable.slug group.slug %}">ICS</a> – <a href="{% url "rss" group.timetable.year.slug group.timetable.slug group.slug %}">RSS</a> – <a href="{% url "atom" group.timetable.year.slug group.timetable.slug group.slug %}">Atom</a></p>{% endblock %} + {% if group_mode %}<p class="subscribe"><a href="{% url "calendars" group.timetable.year.slug group.timetable.slug group.slug %}">ICS</a> – <a href="{% url "rss" group.timetable.year.slug group.timetable.slug group.slug %}">RSS</a> – <a href="{% url "atom" group.timetable.year.slug group.timetable.slug group.slug %}">Atom</a></p>{% endif %}{% endblock %} @@ -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) |