From 16b54ce820e0f522164a12819ffc18197be59b33 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 14 Feb 2019 16:31:17 +0100 Subject: Sheet operation: display map --- .../templates/ishtar/sheet_operation.html | 30 ++++++++++------------ 1 file changed, 14 insertions(+), 16 deletions(-) (limited to 'archaeological_operations/templates') diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index f13a21336..6ed3c1b4c 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -155,23 +155,23 @@ {% endif %} -{% if next %} -{% if item|m2m_listing:'towns' %}

{% trans "Localisation"%}

- {% field_flex_full "Towns" item|m2m_listing:'towns'|join:" ; " %} -
-{% endif %} -{% else %} -{% if item.towns.count %} -

{% trans "Localisation"%}

-
- {% field_flex_full "Towns" item.towns_codes|join:" ; " %} - {% 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 %} + {% with geo_item=item %} + {% include "ishtar/blocks/sheet_simple_map.html"%} +
+ {% 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 "Main address" item.associated_file.address %} + {% field_flex "Complement" item.associated_file.address_complement %} + {% field_flex "Postal code" item.associated_file.postal_code %} +
+ {% endwith %}
-{% endif %} {% if item.right_relations.count %}

{% trans "Relations"%}

@@ -364,6 +364,4 @@ {% endif %} -{% endif %} - {% endblock %} \ No newline at end of file -- cgit v1.2.3