From c1ea72455c411552b3a5db0744c6754689eba713 Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Mon, 22 Apr 2019 23:14:14 +0200
Subject: [PATCH 1/3] Add Delivery.url to a link to an external source

---
 copanier/models.py                             | 1 +
 copanier/templates/edit_delivery.html          | 4 ++++
 copanier/templates/includes/delivery_head.html | 1 +
 3 files changed, 6 insertions(+)

diff --git a/copanier/models.py b/copanier/models.py
index 699fef5..83e49ac 100644
--- a/copanier/models.py
+++ b/copanier/models.py
@@ -163,6 +163,7 @@ class Delivery(Base):
     products: List[Product] = field(default_factory=list)
     orders: Dict[str, Order] = field(default_factory=dict)
     id: str = field(default_factory=lambda *a, **k: uuid.uuid4().hex)
+    url: str = ""
 
     @property
     def status(self):
diff --git a/copanier/templates/edit_delivery.html b/copanier/templates/edit_delivery.html
index bf12c13..4136f0c 100644
--- a/copanier/templates/edit_delivery.html
+++ b/copanier/templates/edit_delivery.html
@@ -35,6 +35,10 @@
         <p>Instructions particulières</p>
         <input type="text" name="instructions" value="{{ delivery.instructions or '' }}">
     </label>
+    <label>
+        <p>URL externe d'information</p>
+        <input type="url" name="url" value="{{ delivery.url or '' }}">
+    </label>
     <div>
         <input type="submit" name="submit" value="Valider" class="primary">
     </div>
diff --git a/copanier/templates/includes/delivery_head.html b/copanier/templates/includes/delivery_head.html
index ff4bdac..97444ea 100644
--- a/copanier/templates/includes/delivery_head.html
+++ b/copanier/templates/includes/delivery_head.html
@@ -5,4 +5,5 @@
     <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>{% else %}<strong>Fermée</strong>{% endif %}</li>
     {% if delivery.instructions %}<li><i class="icon-lightbulb"></i> <strong>À savoir</strong> {{ delivery.instructions }}</li>{% endif %}
+    {% if delivery.url %}<li><i class="icon-global"></i> <strong>En savoir plus</strong><br><a href="{{ delivery.url }}">{{ delivery.url }}</a></li>{% endif %}
 </ul>

From 77bf047974a10bec458b9eaea603fd095f61740c Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Tue, 23 Apr 2019 14:46:12 +0200
Subject: [PATCH 2/3] Truncate Delivery.url in delivery head

---
 copanier/templates/includes/delivery_head.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/copanier/templates/includes/delivery_head.html b/copanier/templates/includes/delivery_head.html
index 97444ea..5fcc3b5 100644
--- a/copanier/templates/includes/delivery_head.html
+++ b/copanier/templates/includes/delivery_head.html
@@ -5,5 +5,5 @@
     <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>{% else %}<strong>Fermée</strong>{% endif %}</li>
     {% if delivery.instructions %}<li><i class="icon-lightbulb"></i> <strong>À savoir</strong> {{ delivery.instructions }}</li>{% endif %}
-    {% if delivery.url %}<li><i class="icon-global"></i> <strong>En savoir plus</strong><br><a href="{{ delivery.url }}">{{ delivery.url }}</a></li>{% endif %}
+    {% if delivery.url %}<li><i class="icon-global"></i><strong>Plus d'infos</strong> <a href="{{ delivery.url }}" title="{{ delivery.url }}">{{ delivery.url|truncate(20)}}</a></li>{% endif %}
 </ul>

From 5437508b03f5d80b5f39ad9fbf23ad4e2f0febfe Mon Sep 17 00:00:00 2001
From: Yohan Boniface <yb@enix.org>
Date: Tue, 23 Apr 2019 23:16:04 +0200
Subject: [PATCH 3/3] Use more specific property Delivery.infos_url

---
 copanier/models.py                             | 2 +-
 copanier/templates/edit_delivery.html          | 2 +-
 copanier/templates/includes/delivery_head.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/copanier/models.py b/copanier/models.py
index 83e49ac..a95b9d9 100644
--- a/copanier/models.py
+++ b/copanier/models.py
@@ -163,7 +163,7 @@ class Delivery(Base):
     products: List[Product] = field(default_factory=list)
     orders: Dict[str, Order] = field(default_factory=dict)
     id: str = field(default_factory=lambda *a, **k: uuid.uuid4().hex)
-    url: str = ""
+    infos_url: str = ""
 
     @property
     def status(self):
diff --git a/copanier/templates/edit_delivery.html b/copanier/templates/edit_delivery.html
index 4136f0c..9aa44a5 100644
--- a/copanier/templates/edit_delivery.html
+++ b/copanier/templates/edit_delivery.html
@@ -37,7 +37,7 @@
     </label>
     <label>
         <p>URL externe d'information</p>
-        <input type="url" name="url" value="{{ delivery.url or '' }}">
+        <input type="url" name="infos_url" value="{{ delivery.infos_url or '' }}">
     </label>
     <div>
         <input type="submit" name="submit" value="Valider" class="primary">
diff --git a/copanier/templates/includes/delivery_head.html b/copanier/templates/includes/delivery_head.html
index 5fcc3b5..2b5cbd8 100644
--- a/copanier/templates/includes/delivery_head.html
+++ b/copanier/templates/includes/delivery_head.html
@@ -5,5 +5,5 @@
     <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>{% else %}<strong>Fermée</strong>{% endif %}</li>
     {% if delivery.instructions %}<li><i class="icon-lightbulb"></i> <strong>À savoir</strong> {{ delivery.instructions }}</li>{% endif %}
-    {% if delivery.url %}<li><i class="icon-global"></i><strong>Plus d'infos</strong> <a href="{{ delivery.url }}" title="{{ delivery.url }}">{{ delivery.url|truncate(20)}}</a></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>