diff options
| -rw-r--r-- | feeds.py | 2 | ||||
| -rw-r--r-- | templates/timetable.html | 14 | ||||
| -rw-r--r-- | templates/timetable_common.html | 12 |
3 files changed, 15 insertions, 13 deletions
@@ -105,7 +105,7 @@ class AtomFeed(Feed): return item.description def items(self, obj): - template = loader.get_template("timetable.html") + template = loader.get_template("timetable_common.html") group = obj[0] for update in obj[1]: diff --git a/templates/timetable.html b/templates/timetable.html index 948aab4..b5117e2 100644 --- a/templates/timetable.html +++ b/templates/timetable.html @@ -1,19 +1,9 @@ {% extends "index.html" %} -{% load rooms %} {% block title %}{{ group.timetable }} – {{ group }} – Semaine {{ week }} – {% endblock %} {% block body %} <h2>{{ group.timetable }} – {{ group }} – Semaine {{ week }}</h2> - <p>Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}</p>{% for day in courses %} - <section> - <h3>{% 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 %}</h3> - <ul>{% for course in day %} - <li class="course"> - <b>{{ course }}</b> ({{ course.type }}), de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}<br /> - <em>{{ course.rooms.all|format_rooms }}</em>{% endif %}{% if course.notes %}<br /> - <small>Remarques : {{ course.notes }}</small>{% endif %} - </li>{% endfor %} - </ul> - </section>{% endfor %} + <p>Dernière mise à jour le {{ last_update|date:"l j F o" }} à {{ last_update|date:"H:i" }}</p> + {% include "timetable_common.html" %} <p><a class="subscribe" href="{% url "subscribe" group.timetable.year.slug group.timetable.slug group.slug year week %}">S’abonner à cet emploi du temps</a></p>{% endblock %} diff --git a/templates/timetable_common.html b/templates/timetable_common.html new file mode 100644 index 0000000..4319e60 --- /dev/null +++ b/templates/timetable_common.html @@ -0,0 +1,12 @@ +{% load rooms %} +{% for day in courses %} + <section> + <h3>{% 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 %}</h3> + <ul>{% for course in day %} + <li class="course"> + <b>{{ course }}</b> ({{ course.type }}), de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}<br /> + <em>{{ course.rooms.all|format_rooms }}</em>{% endif %}{% if course.notes %}<br /> + <small>Remarques : {{ course.notes }}</small>{% endif %} + </li>{% endfor %} + </ul> + </section>{% endfor %} |