From 78920718408ab411680b7f5dd003b70c4e458e37 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Tue, 5 Sep 2017 10:38:23 +0200 Subject: Correction de l’affichage des remarques --- templates/mail/mail_timetable.txt | 2 +- templates/timetable.html | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/mail/mail_timetable.txt b/templates/mail/mail_timetable.txt index 7cc6b26..20da575 100644 --- a/templates/mail/mail_timetable.txt +++ b/templates/mail/mail_timetable.txt @@ -1,6 +1,6 @@ {% load rooms %}{% autoescape off %}{% for day in courses %}{% filter title %}{{ day.0.begin|date:"l j F o" }}{% endfilter %} - de {{ day.0.begin|date:"H:i" }} à {% with day|last as last %}{{ last.end|date:"H:i" }}{% endwith %} {% for course in day %} * {{ course.name }} ({{ course.type }}), de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %} - {{ course.rooms.all|format_rooms }}{% endif %}{% if course.notes is not None %} + {{ course.rooms.all|format_rooms }}{% endif %}{% if course.notes != "" %} Remarques : {{ course.notes }}{% endif %} {% endfor %}{% empty %}Aucun cours pour le groupe {{ group }} pendant la semaine {{ week }}. diff --git a/templates/timetable.html b/templates/timetable.html index 264a25c..ba673ce 100644 --- a/templates/timetable.html +++ b/templates/timetable.html @@ -9,7 +9,11 @@

{% filter title %}{{ day.0.begin|date:"l j F o" }}{% endfilter %} – de {{ day.0.begin|date:"H:i" }} à {% with day|last as last %}{{ last.end|date:"H:i" }}{% endwith %}

{% endfor %}

S’abonner à cet emploi du temps

{% endblock %} -- cgit v1.2.1 From 0426214423e7a43c31d62ecd4e7d8f29cb65d251 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Tue, 5 Sep 2017 11:42:45 +0200 Subject: Re-correction de l’affichage des remarques --- templates/mail/mail_timetable.txt | 2 +- templates/timetable.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/mail/mail_timetable.txt b/templates/mail/mail_timetable.txt index 20da575..258db0c 100644 --- a/templates/mail/mail_timetable.txt +++ b/templates/mail/mail_timetable.txt @@ -1,6 +1,6 @@ {% load rooms %}{% autoescape off %}{% for day in courses %}{% filter title %}{{ day.0.begin|date:"l j F o" }}{% endfilter %} - de {{ day.0.begin|date:"H:i" }} à {% with day|last as last %}{{ last.end|date:"H:i" }}{% endwith %} {% for course in day %} * {{ course.name }} ({{ course.type }}), de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %} - {{ course.rooms.all|format_rooms }}{% endif %}{% if course.notes != "" %} + {{ course.rooms.all|format_rooms }}{% endif %}{% if course.notes != "" and course.notes is not None %} Remarques : {{ course.notes }}{% endif %} {% endfor %}{% empty %}Aucun cours pour le groupe {{ group }} pendant la semaine {{ week }}. diff --git a/templates/timetable.html b/templates/timetable.html index ba673ce..149068d 100644 --- a/templates/timetable.html +++ b/templates/timetable.html @@ -11,7 +11,7 @@ -- cgit v1.2.1 From f18b2cc4f4aa7b2ed2d7801c19ddf75acbb6abc2 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Thu, 7 Sep 2017 22:22:46 +0200 Subject: Remplacement de la page d’acceuil par la liste des années, menant sur une liste de mentions, puis une liste de groupes, etc etc. --- templates/index.html | 18 +++++++++++------- templates/mention_list.html | 14 ++++++++++++++ templates/timetables_list.html | 9 +++++++++ 3 files changed, 34 insertions(+), 7 deletions(-) create mode 100644 templates/mention_list.html create mode 100644 templates/timetables_list.html (limited to 'templates') diff --git a/templates/index.html b/templates/index.html index d834884..09bb0f6 100644 --- a/templates/index.html +++ b/templates/index.html @@ -58,13 +58,17 @@ li.course {

celcatsanitizer

-
{% block body %}{% for timetable in timetables %} -
-

{{ timetable.name }}

- -
{% endfor %}{% endblock %} +
+ {% block body %} +

Choisissez votre année

+ + {% endblock %}