diff options
| author | Alban Gruin | 2017-09-08 11:56:55 +0200 |
|---|---|---|
| committer | Alban Gruin | 2017-09-08 11:56:55 +0200 |
| commit | bfa42fa2fbd93336227b28a096250fcdd756ea78 (patch) | |
| tree | 438fd1f3ab3901178edc5cca45f95ab27160a9b8 | |
| parent | 57ffdbf0658042069abcf0b1f9184ff69a3139e2 (diff) | |
Simplification de certaines templates
| -rw-r--r-- | templates/mail/mail_confirm.txt | 2 | ||||
| -rw-r--r-- | templates/mail/mail_timetable.txt | 2 | ||||
| -rw-r--r-- | templates/subscribe.html | 4 | ||||
| -rw-r--r-- | templates/timetable.html | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/templates/mail/mail_confirm.txt b/templates/mail/mail_confirm.txt index 34aca3d..14fe33c 100644 --- a/templates/mail/mail_confirm.txt +++ b/templates/mail/mail_confirm.txt @@ -1,4 +1,4 @@ -Vous avez été abonné à l’emploi du temps {{ group.timetable.name }} - {{ group.name }} +Vous avez été abonné à l’emploi du temps {{ group.timetable }} - {{ group }} Pour valider l’abonnement, suivez ce lien : {{ domain }}{% url "confirm" token %} diff --git a/templates/mail/mail_timetable.txt b/templates/mail/mail_timetable.txt index 258db0c..524611e 100644 --- a/templates/mail/mail_timetable.txt +++ b/templates/mail/mail_timetable.txt @@ -1,5 +1,5 @@ {% 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 %} +{% for course in day %} * {{ course }} ({{ 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 != "" and course.notes is not None %} Remarques : {{ course.notes }}{% endif %} diff --git a/templates/subscribe.html b/templates/subscribe.html index 5e885df..08b27a8 100644 --- a/templates/subscribe.html +++ b/templates/subscribe.html @@ -1,9 +1,9 @@ {% extends "index.html" %} -{% block title %}S’abonner à {{ group.timetable.name }} – {{ group.name }}{% endblock %} +{% block title %}S’abonner à {{ group.timetable }} – {{ group }}{% endblock %} {% block body %} - <h2>S'abonner à {{ group.timetable.name }} – {{ group.name }}</h2> + <h2>S'abonner à {{ group.timetable }} – {{ group }}</h2> <form action="{% url "subscribe" group.timetable.year.slug group.timetable.slug group.slug year week %}" method="post"> {% csrf_token %} {{ form }} diff --git a/templates/timetable.html b/templates/timetable.html index a867fd0..b84a27d 100644 --- a/templates/timetable.html +++ b/templates/timetable.html @@ -1,16 +1,16 @@ {% extends "index.html" %} {% load rooms %} -{% block title %}{{ group.timetable.name }} – {{ group.name }} – Semaine {{ week }} – {% endblock %} +{% block title %}{{ group.timetable }} – {{ group }} – Semaine {{ week }} – {% endblock %} {% block body %} - <h2>{{ group.timetable.name }} – {{ group.name }} – Semaine {{ week }}</h2> + <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.name }}</b> ({{ course.type }}), de {{ course.begin|date:"H:i" }} à {{ course.end|date:"H:i" }}{% if course.rooms.all|length > 0 %}<br /> + <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 != "" and courses.notes is not None %}<br /> <small>Remarques : {{ course.notes }}</small>{% endif %} </li>{% endfor %} |