summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-02-19 17:36:25 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-04-24 19:38:56 +0200
commit4f63ed814f96bbc68c22c98b799c3911d62aa737 (patch)
tree1ac2de99841b7a28fee128a68700f59458594f14 /archaeological_warehouse/templates
parentb6d3f2dc4a24bb055b73b7c80815685572a83086 (diff)
downloadIshtar-4f63ed814f96bbc68c22c98b799c3911d62aa737.tar.bz2
Ishtar-4f63ed814f96bbc68c22c98b799c3911d62aa737.zip
Geo: manage container and warehouse - manage geo save dependencies
Diffstat (limited to 'archaeological_warehouse/templates')
-rw-r--r--archaeological_warehouse/templates/ishtar/sheet_container.html12
-rw-r--r--archaeological_warehouse/templates/ishtar/sheet_warehouse.html15
2 files changed, 26 insertions, 1 deletions
diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
index 27cbf9bee..f40020a92 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_container.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -39,6 +39,18 @@
</div>
</div>
+{% if item.point_2d or item.multi_polygon %}
+<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"%}
+ </div>
+ {% endwith %}
+</div>
+{% endif %}
+
{% if item.finds.count %}
<h4>{% trans "Content" %}</h4>
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
index eed484d5a..6be884e8e 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
@@ -31,13 +31,26 @@
<div class='row'>
{% field_flex "Person in charge" item.person_in_charge %}
{% include "ishtar/blocks/sheet_creation_section.html" %}
- {% include "ishtar/blocks/sheet_address_section.html" %}
{% field_flex "Divisions" item.location_types|join:", " %}
{% field_flex_full "Comment" item.comment "<pre>" "</pre>" %}
{% include "ishtar/blocks/sheet_json.html" %}
</div>
+{% if item.point_2d or item.multi_polygon or item.address or item.address_complement or item.postal_code or item.town %}
+<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"%}
+ {% with full=True %}{% include "ishtar/blocks/sheet_address_section.html" %}{% endwith %}
+ </div>
+ {% endwith %}
+</div>
+{% endif %}
+
+
{% if item.containers.count %}
<h4>{% trans "Containers" %}</h4>
{% dynamic_table_document '' 'containers' 'location_id' item.pk 'TABLE_COLS' output %}