From 45c88a21bf4098e74d8facd41af918069df18b9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexis=20M=C3=83taireau?= Date: Sat, 4 Apr 2020 21:17:00 +0200 Subject: [PATCH] Cosmetics --- copanier/templates/delivery/show.html | 4 ++-- copanier/templates/sesame.html | 3 ++- copanier/views/login.py | 5 ++++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/copanier/templates/delivery/show.html b/copanier/templates/delivery/show.html index de57237..2886e0d 100644 --- a/copanier/templates/delivery/show.html +++ b/copanier/templates/delivery/show.html @@ -3,11 +3,11 @@

{{ delivery.name }}

-

{% if delivery.products %}{% if delivery.status == delivery.OPEN %}Commandes jusqu'au {{ delivery.order_before|date|capitalize }}{% elif delivery.status == delivery.ADJUSTMENT %}Ajustements en cours{% elif delivery.status == delivery.CLOSED %}Fermée{% else %}Archivée{% endif %}{% endif %}. +

{% if delivery.products %}{% if delivery.status == delivery.OPEN %}Commandes ouvertes jusqu'au {{ delivery.order_before|date }}{% elif delivery.status == delivery.ADJUSTMENT %}Ajustements en cours{% elif delivery.status == delivery.CLOSED %}Fermée{% else %}Archivée{% endif %}{% endif %}. {% include "includes/order_button.html" %}

- Distribution {{ delivery.from_date|date|capitalize }}, {{ delivery.from_date|time }} - {{ delivery.to_date|time }}, à {{ delivery.where }}. + Distribution le {{ delivery.from_date|date }}, {{ delivery.from_date|time }} - {{ delivery.to_date|time }}, à {{ delivery.where }}.

diff --git a/copanier/templates/sesame.html b/copanier/templates/sesame.html index 6bdd177..4b05d1c 100644 --- a/copanier/templates/sesame.html +++ b/copanier/templates/sesame.html @@ -1,7 +1,8 @@ {% extends "base.html" %} {% block body %} +

Bienvenue ! Pour accéder aux commandes groupées, merci de rentrer votre email.

- +
{% endblock body %} diff --git a/copanier/views/login.py b/copanier/views/login.py index 8725136..5c7d08d 100644 --- a/copanier/views/login.py +++ b/copanier/views/login.py @@ -54,7 +54,10 @@ async def send_sesame(request, response): except RuntimeError: response.message("Oops, impossible d'envoyer le courriel…", status="error") else: - response.message(f"Un sésame vous a été envoyé à l'adresse '{email}'") + response.message( + f"Un sésame vous a été envoyé par mail, cliquez sur le lien pour vous " + "connecter." + ) response.redirect = "/"