From 4f63ed814f96bbc68c22c98b799c3911d62aa737 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 19 Feb 2019 17:36:25 +0100
Subject: Geo: manage container and warehouse - manage geo save dependencies

---
 .../templates/ishtar/blocks/sheet_address_section.html     | 14 +++++++-------
 .../templates/ishtar/blocks/sheet_coordinates.html         |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/ishtar/blocks/sheet_address_section.html b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html
index fe4bd80bb..a42cd6cca 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_address_section.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_address_section.html
@@ -1,10 +1,10 @@
 {% load i18n %}
-{% if item.address or item.address_complement or item.postal_code or item.town %}
-<div class="col-12 col-md-6 col-lg-4 d-flex flex-wrap row">
-    <dt class="col-5">{% trans "Address" %}</dt>
-    <dd class="col-7">
+{% if item.address or item.address_complement or item.postal_code or item.town or item.precise_town%}
+<dl class="{% if full %}col-12 col-lg-6{% else %}col-12 col-md-6 col-lg-4 d-flex row{% endif %} flex-wrap">
+    <dt>{% trans "Address" %}</dt>
+    <dd>
     <pre>{% if item.address %}{{item.address}}{% endif %}{% if item.address_complement %}
-{{item.address_complement}}{% endif %}{% if item.postal_code or item.town %}
-{{item.postal_code}} {{item.town}}{% endif %}</pre>
+{{item.address_complement}}{% endif %}{% if item.postal_code or item.town or item.precise_town %}
+{{item.postal_code}} {% if item.precise_town %}{{item.precise_town}}{% else %}{{item.town}}{% endif %}{% endif %}</pre>
     </dd>
-</div>{% endif %}
+</dl>{% endif %}
diff --git a/ishtar_common/templates/ishtar/blocks/sheet_coordinates.html b/ishtar_common/templates/ishtar/blocks/sheet_coordinates.html
index bd0c1ef19..d73ef9c96 100644
--- a/ishtar_common/templates/ishtar/blocks/sheet_coordinates.html
+++ b/ishtar_common/templates/ishtar/blocks/sheet_coordinates.html
@@ -1,7 +1,7 @@
 {% load i18n window_field %}{% if geo_item.x or geo_item.y or geo_item.z %}
-<dl class="col-12 d-flex flex-wrap">
-    <dt class="col-12">{% trans "Coordinates" %}</dt>
-    <dd class="col-12">
+<dl class="col-12">
+    <dt>{% trans "Coordinates" %}</dt>
+    <dd>
         {% trans "X:"%} {{geo_item.x|default_if_none:"-"}}
         {% if geo_item.estimated_error_x %} ({% trans "error:" %} {{geo_item.estimated_error_x}}){% endif %},
         {% trans "Y:"%} {{geo_item.y|default_if_none:"-"}},
-- 
cgit v1.2.3