From e0bcbeaa84c2adf3b8a179cdea792dd58fa109b2 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 1 Sep 2022 12:08:11 +0200
Subject: Geo: select geo item to display on the sheet

---
 .../templates/ishtar/sheet_operation.html          | 30 ++++++++++------------
 .../templates/ishtar/sheet_site.html               |  8 +++---
 2 files changed, 16 insertions(+), 22 deletions(-)

(limited to 'archaeological_operations')

diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index f884ed435..b868185df 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -302,25 +302,21 @@
         <div class="row">
             {% with geo_item=item %}
             {% include "ishtar/blocks/sheet_map.html"%}
-            <div class="col-12 col-lg-6 flex-wrap">
-                {% include "ishtar/blocks/sheet_coordinates.html"%}
-                {% if next %}
-                {% field_flex_full "Towns" item|m2m_listing:'towns'|join:" ; "  %}
-                {% else %}
-                {{ item.cached_towns_label }}
-                {% endif %}
-                {% field_flex "Address" item.address %}
-                {% if not item.address %}
-                {% field_flex "Main address" item.associated_file.address %}
-                {% field_flex "Complement" item.associated_file.address_complement %}
-                {% field_flex "Postal code" item.associated_file.postal_code %}
-                {% endif %}
-                {% if PROFILE.experimental_feature %}
-                {% include "ishtar/blocks/sheet_geo_items.html"%}
-                {% endif %}
-            </div>
             {% endwith %}
         </div>
+        <div class="row">
+            {% if next %}
+            {% field_flex "Towns" item|m2m_listing:'towns'|join:" ; "  %}
+            {% else %}
+            {% field_flex "Towns" item.cached_towns_label %}
+            {% endif %}
+            {% field_flex "Address" item.address %}
+            {% if not item.address %}
+            {% field_flex "Main address" item.associated_file.address %}
+            {% field_flex "Complement" item.associated_file.address_complement %}
+            {% field_flex "Postal code" item.associated_file.postal_code %}
+            {% endif %}
+        </div>
     </div>
 
     {% if display_sites %}   
diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html
index b5401c9fb..a3ddb38bf 100644
--- a/archaeological_operations/templates/ishtar/sheet_site.html
+++ b/archaeological_operations/templates/ishtar/sheet_site.html
@@ -69,9 +69,9 @@
 <div class="row">
     {% with geo_item=item %}
     {% include "ishtar/blocks/sheet_map.html"%}
-
-    <div class="col-12 col-lg-6 flex-wrap">
-    {% include "ishtar/blocks/sheet_coordinates.html"%}
+    {% endwith %}
+</div>
+<div class="row">
     {% if next %}
     {% field_flex_full "Towns" item|m2m_listing:'towns'|join:" ; "  %}
     {% else %}
@@ -79,8 +79,6 @@
     {% endif %}
     {% field_flex_full "National Geographic Institute locality" item.locality_ngi "<pre>" "</pre>" %}
     {% field_flex_full "Cadastral locality" item.locality_cadastral "<pre>" "</pre>" %}
-    </div>
-    {% endwith %}
 </div>
 {% endif %}
 
-- 
cgit v1.2.3