Simpler home page

- remove category titles
- we still show first open deliveries, ordered by dead line
- passed but non archived delivery status label is "À solder"

copanier/models.py

@@ -239,7 +239,9 @@ class Delivery(Base):
 
     @classmethod
     def incoming(cls):
-        return [d for d in cls.all() if d.is_foreseen]
+        return sorted(
+            [d for d in cls.all() if d.is_foreseen], key=lambda d: d.order_before
+        )
 
     @classmethod
     def former(cls):

copanier/templates/delivery.html

@@ -70,7 +70,7 @@
     </li>
         {% if request.user and request.user.is_staff %}
         <li>
-            <a href="/livraison/{{ delivery.id }}/exporter/produits"><i class="icon-layers"></i> Télécharger les produits</a>
+            <a href="/livraison/{{ delivery.id }}/exporter/produits"><i class="icon-download"></i> Télécharger les produits</a>
         </li>
         <li>
             <a href="/livraison/{{ delivery.id }}/edit"><i class="icon-adjustments"></i> Modifier la livraison</a>

copanier/templates/edit_delivery.html

@@ -48,7 +48,7 @@
 <ul class="toolbox">
     {% if delivery.status == delivery.CLOSED %}
     <li>
-        <a href="/livraison/{{ delivery.id }}/archiver" class="button danger"><i class="icon-hazardous"></i>&nbsp;Archiver</a>
+        <a href="/livraison/{{ delivery.id }}/archiver" class="button danger"><i class="icon-layers"></i>&nbsp;Archiver</a>
     </li>
     {% endif %}
     <li>

copanier/templates/home.html

@@ -1,12 +1,10 @@
 {% extends "base.html" %}
 {% block body %}
-    <h2>Livraisons à venir</h2>
     {% with deliveries=incoming %}
         {% include "includes/delivery_list.html" %}
     {% endwith %}
-    <h2>Livraisons passées</h2>
     {% with deliveries=former %}
         {% include "includes/delivery_list.html" %}
     {% endwith %}
-    <a href="/archives">Voir les livraisons archivées</a>
+    <a href="/archives"><i class="icon-layers"></i> Voir les livraisons archivées</a>
 {% endblock body %}

copanier/templates/includes/delivery_head.html

@@ -3,7 +3,7 @@
     <li><i class="icon-streetsign"></i> <strong>Lieu</strong> {{ delivery.where }}</li>
     <li><i class="icon-strategy"></i> <strong>Référent</strong> <a href="mailto:{{ delivery.contact }}">{{ delivery.contact }}</a></li>
     <li><i class="icon-clock"></i> <strong>Date de livraison</strong> <time datetime="{{ delivery.from_date }}">{{ delivery.from_date|date }} de {{ delivery.from_date|time }} à {{ delivery.to_date|time }}</time></li>
-    <li><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 }}</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>
+    <li><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 }}</time>{% elif delivery.status == delivery.ADJUSTMENT %}<strong>Ajustement en cours</strong>{% elif delivery.status == delivery.CLOSED %}<strong>{% if delivery.is_foreseen %}Fermée{% else %}À solder{% endif %}</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>