From 7c381ca992e85dab73f7bf0103a579b4ad0d2cbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=83taireau?= <alexis@notmyidea.org>
Date: Sun, 7 Jun 2020 17:12:54 +0200
Subject: [PATCH] Reorder descriptive info for deliveries. Fix #20.

---
 copanier/templates/delivery/list_deliveries.html | 14 +++++++-------
 copanier/templates/delivery/show_delivery.html   |  8 ++------
 copanier/templates/includes/delivery_head.html   |  7 +++++--
 copanier/templates/includes/delivery_status.html |  6 ++++++
 4 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 copanier/templates/includes/delivery_status.html

diff --git a/copanier/templates/delivery/list_deliveries.html b/copanier/templates/delivery/list_deliveries.html
index cac622b..9fa033e 100644
--- a/copanier/templates/delivery/list_deliveries.html
+++ b/copanier/templates/delivery/list_deliveries.html
@@ -3,13 +3,6 @@
 
 <div class="header">
     <h1>Distributions</h1>
-    <div class="pure-menu pure-menu-horizontal">
-        <ul class="pure-menu-list">
-            <li class="pure-menu-item">
-                <a class="pure-menu-link" href="{{ url_for('list_archives') }}"><i class="icon-telescope"></i>&nbsp;Voir les distributions archivées</a>&nbsp;
-            </li>
-        </ul>
-    </div>
 </div>
 
     {% with deliveries=incoming %}
@@ -27,4 +20,11 @@
     <a href="/archives">Voir les distributions archivées</a>
     <hr>
     {% endif %}
+    <div class="pure-menu pure-menu-horizontal">
+        <ul class="pure-menu-list">
+            <li class="pure-menu-item">
+                <a class="pure-menu-link" href="{{ url_for('list_archives') }}"><i class="icon-telescope"></i>&nbsp;Aller aux distributions archivées</a>&nbsp;
+            </li>
+        </ul>
+    </div>
 {% endblock body %}
diff --git a/copanier/templates/delivery/show_delivery.html b/copanier/templates/delivery/show_delivery.html
index 6197201..82e11e3 100644
--- a/copanier/templates/delivery/show_delivery.html
+++ b/copanier/templates/delivery/show_delivery.html
@@ -5,12 +5,8 @@
 <div class="header">
     <h1>{{ delivery.name }}</h1>
     <h4>{% 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
-        {% elif delivery.status == delivery.ARCHIVED %}Archivée
-        {% elif delivery.status == delivery.NEED_PRICE_UPDATE %}Mise à jour des prix*
-        {% endif %}{% endif %}
+        {% include "includes/delivery_status.html" %}
+        {% endif %}
         {% include "includes/order_button.html" %}
     </h4>
     <h4>
diff --git a/copanier/templates/includes/delivery_head.html b/copanier/templates/includes/delivery_head.html
index 0c1db26..4aa5fc2 100644
--- a/copanier/templates/includes/delivery_head.html
+++ b/copanier/templates/includes/delivery_head.html
@@ -1,12 +1,15 @@
 <ul class="delivery-head">
     {% if delivery.description %}<li><i class="icon-basket"></i> <strong>Produits</strong> {{ delivery.description }}</li>{% endif %}
+    <li><i class="icon-clock"></i> <strong>Distribution le</strong> <time datetime="{{ delivery.from_date }}">{{ delivery.from_date|date }} ({{ delivery.from_date|time }} à {{ delivery.to_date|time }}</time></li>
+    <li><i class="icon-hourglass"></i> <strong>Commandes avant le</strong> <time datetime="{{ delivery.order_before }}">{{ delivery.order_before|date }}</time></li>
+    <li class="hide-on-print"><i class="icon-calendar"></i>
+    {% include "includes/delivery_status.html" %}
+    </li>
     {% if display_counts %}
     <li><i class="icon-lightbulb"></i> <strong>{{ delivery.orders|length }}</strong> colocs</strong>, <strong>{{ delivery.products|length }}</strong> produits et <strong>{{ delivery.producers | length}}</strong> product⋅eurs⋅rices, <strong>{{ delivery.total }}€</strong></li>
     {% else %}
     <li class="hide-on-print"><i class="icon-strategy"></i> <strong>Référent⋅e</strong> <a href="mailto:{{ delivery.contact }}">{{ delivery.contact }}</a></li>
     {% endif %}
-    <li><i class="icon-clock"></i> <strong>Date de distribution</strong> <time datetime="{{ delivery.from_date }}">{{ delivery.from_date|date|capitalize }} de {{ delivery.from_date|time }} à {{ delivery.to_date|time }}</time></li>
-    <li class="hide-on-print"><i class="icon-hourglass"></i> {% if delivery.status == delivery.OPEN %}<strong>Date limite de commande</strong> <time datetime="{{ delivery.order_before.date() }}">{{ delivery.order_before|date|capitalize }}</time>{% elif delivery.status == delivery.ADJUSTMENT %}<strong>Ajustement en cours</strong>{% elif delivery.status == delivery.CLOSED %}<strong>Fermée</strong>{% else %}<strong>Archivée</strong>{% endif %}</li>
     {% if delivery.instructions %}<li><i class="icon-lightbulb"></i> <strong>À savoir</strong> {{ delivery.instructions }}</li>{% endif %}
     {% if delivery.infos_url %}<li><i class="icon-global"></i><strong>Plus d'infos</strong> <a href="{{ delivery.infos_url }}" title="{{ delivery.infos_url }}">{{ delivery.infos_url|truncate(20)}}</a></li>{% endif %}
 </ul>
\ No newline at end of file
diff --git a/copanier/templates/includes/delivery_status.html b/copanier/templates/includes/delivery_status.html
new file mode 100644
index 0000000..e1b29dc
--- /dev/null
+++ b/copanier/templates/includes/delivery_status.html
@@ -0,0 +1,6 @@
+{% 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
+{% elif delivery.status == delivery.ARCHIVED %}Archivée
+{% elif delivery.status == delivery.NEED_PRICE_UPDATE %}Mise à jour des prix*
+{% endif %}
\ No newline at end of file