From a8df13b353369c83896320212c0f90a8e805d2ca Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 14 Feb 2019 06:08:16 +0100
Subject: Sheets (operations, site, context records and finds): display small
 map

---
 .../templates/ishtar/sheet_site.html               | 40 +++++++++++-----------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'archaeological_operations/templates')

diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html
index 14c30bd38..a293cb10b 100644
--- a/archaeological_operations/templates/ishtar/sheet_site.html
+++ b/archaeological_operations/templates/ishtar/sheet_site.html
@@ -40,26 +40,6 @@
     {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %}
 </div>
 
-{% if next %}
-{% if item|m2m_listing:'towns' or item.locality_ngi or item.locality_cadastral %}
-<h3>{% trans "Localisation"%}</h3>
-<div class="row">
-    {% field_flex_full "Towns" item|m2m_listing:'towns'|join:" ; "  %}
-    {% field_flex_full "National Geographic Institute locality" item.locality_ngi "<pre>" "</pre>" %}
-    {% field_flex_full "Cadastral locality" item.locality_cadastral "<pre>" "</pre>" %}
-</div>
-{% endif %}
-{% else %}
-{% if item.towns.count or item.locality_ngi or item.locality_cadastral %}
-<h3>{% trans "Localisation"%}</h3>
-<div class="row">
-    {% field_flex_full "Towns" item.towns_codes|join:" ; "  %}
-    {% field_flex_full "National Geographic Institute locality" item.locality_ngi "<pre>" "</pre>" %}
-    {% field_flex_full "Cadastral locality" item.locality_cadastral "<pre>" "</pre>" %}
-</div>
-{% endif %}
-{% endif %}
-
 {% if item.affmar_number or item.drassm_number or item.oceanographic_service_localisation or item.shipwreck_code or item.sinking_date or item.discovery_area or item.shipwreck_name %}
 <h3>{% trans "Underwater"%}</h3>
 
@@ -74,6 +54,26 @@
 </div>
 {% endif %}
 
+{% if item.x or item.towns.count or item|m2m_listing:'towns' or item.locality_ngi or item.locality_cadastral %}
+<h3>{% trans "Localisation"%}</h3>
+<div class="row">
+    {% with geo_item=item %}
+    {% include "ishtar/blocks/sheet_simple_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 %}
+    {% field_flex_full "Towns" item.towns_codes|join:" ; "  %}
+    {% 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 %}
+
 {% include "ishtar/blocks/sheet_json.html" %}
 
 {% trans "Operations" as operations %}
-- 
cgit v1.2.3