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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/mail') 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 }}. -- 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/mail') 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 }}. -- cgit v1.2.1 From bfa42fa2fbd93336227b28a096250fcdd756ea78 Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Fri, 8 Sep 2017 11:56:55 +0200 Subject: Simplification de certaines templates --- templates/mail/mail_confirm.txt | 2 +- templates/mail/mail_timetable.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/mail') 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 %} -- cgit v1.2.1 From c7fce37ad4c8dee76f5d58eafefd0c73a03ea00c Mon Sep 17 00:00:00 2001 From: Alban Gruin Date: Sat, 9 Sep 2017 14:56:17 +0200 Subject: Suppression de l’envoi des mails --- templates/mail/mail_confirm.txt | 9 --------- templates/mail/mail_footer.txt | 2 -- templates/mail/mail_timetable.txt | 7 ------- templates/mail/mail_unsubscribed.txt | 2 -- 4 files changed, 20 deletions(-) delete mode 100644 templates/mail/mail_confirm.txt delete mode 100644 templates/mail/mail_footer.txt delete mode 100644 templates/mail/mail_timetable.txt delete mode 100644 templates/mail/mail_unsubscribed.txt (limited to 'templates/mail') diff --git a/templates/mail/mail_confirm.txt b/templates/mail/mail_confirm.txt deleted file mode 100644 index 14fe33c..0000000 --- a/templates/mail/mail_confirm.txt +++ /dev/null @@ -1,9 +0,0 @@ -Vous avez été abonné à l’emploi du temps {{ group.timetable }} - {{ group }} - -Pour valider l’abonnement, suivez ce lien : {{ domain }}{% url "confirm" token %} - -Si vous pensez que vous avez été abonné par erreur, suivez ce lien : {{ domain }}{% url "cancel" token %} - -Vous ne recevrez aucun mail tant que vous n'avez pas validé votre abonnement. - -{% include "mail/mail_footer.txt" %} diff --git a/templates/mail/mail_footer.txt b/templates/mail/mail_footer.txt deleted file mode 100644 index b39f738..0000000 --- a/templates/mail/mail_footer.txt +++ /dev/null @@ -1,2 +0,0 @@ -Pour vous désinscrire de cet emploi du temps, suivez ce lien : {{ domain }}{% url "cancel" token %} -Pour contacter l’administrateur du service, envoyez un mail à cette adresse : {{ admins|first|last }} diff --git a/templates/mail/mail_timetable.txt b/templates/mail/mail_timetable.txt deleted file mode 100644 index 524611e..0000000 --- a/templates/mail/mail_timetable.txt +++ /dev/null @@ -1,7 +0,0 @@ -{% 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 }} ({{ 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 %} - -{% endfor %}{% empty %}Aucun cours pour le groupe {{ group }} pendant la semaine {{ week }}. -{% endfor %}{% endautoescape %} diff --git a/templates/mail/mail_unsubscribed.txt b/templates/mail/mail_unsubscribed.txt deleted file mode 100644 index 8d75ccf..0000000 --- a/templates/mail/mail_unsubscribed.txt +++ /dev/null @@ -1,2 +0,0 @@ -Vous avez été désabonné de l’emploi du temps {{ group.timetable.name }} - {{ group.name }} -Notez que si vous vous êtes abonné à un autre emploi du temps, vous recevrez toujours les mails de ceux-ci. -- cgit v1.2.1