From 038d2ddee75aaccf0ad0c60d66efe09de69958e8 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 20 Sep 2024 14:19:50 +0200
Subject: ✨ context_record, find sheet: add new fields
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/ishtar/sheet_contextrecord.html                 | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'archaeological_context_records')

diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 984be20bd..17f063fa3 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -133,6 +133,7 @@
             <div class='row'>
                 {% field_flex_2 "Complete ID" item.full_label %}
                 {% field_flex_2 "Type" item.unit %}
+                {% field_flex_detail _("Excavator") item.excavator %}
                 {% field_flex_full "General comment" item.comment "<pre>" "</pre>" has_image %}
             </div>
         </div>
@@ -143,14 +144,13 @@
             {% field_flex_multiple_obj "Documentation" item 'documentations'  %}
             {% field_flex "Opening date" item.opening_date|date:"DATE_FORMAT" %}
             {% field_flex "Closing date" item.closing_date|date:"DATE_FORMAT" %}
-            {% field_flex_full "Filling" item.filling "<pre>" "</pre>" %}
-            {% field_flex_full "Location" item.location "<pre>" "</pre>"  %}
-            {% field_flex_full "Description" item.description "<pre>" "</pre>"  %}
             {% field_flex_multiple_obj _("Structure") item 'structures' %}
             {% field_flex_multiple_obj _("Texture") item 'textures' %}
             {% field_flex_multiple_obj _("Inclusion") item 'inclusions' %}
             {% field_flex_multiple_obj _("Colors") item 'colors' %}
-            {% field_flex_full _("Details on color") item.details_on_color "<pre>" "</pre>" %}
+            {% field_flex _("Details on color") item.details_on_color %}
+            {% field_flex_full "Filling" item.filling "<pre>" "</pre>" %}
+            {% field_flex_full "Description" item.description "<pre>" "</pre>"  %}
         </div>
         <h3>{% trans "Dimensions" %}</h3>
         <div class="row">
@@ -172,7 +172,7 @@
             {% field_flex "Depth of appearance (m)" item.depth_of_appearance %}
         </div>
 
-        {% if item.main_geodata %}
+        {% if item.main_geodata or item.town or item.location %}
         <h3>{% trans "Geographic localisation" %}</h3>
         <div class='row'>
             {% with geo_item=item %}
@@ -181,6 +181,7 @@
         </div>
         <div class='row'>
             {% field_flex_detail_full "Town" item.town has_image %}
+            {% field_flex_full "Location" item.location "<pre>" "</pre>"  %}
         </div>
         {% endif %}
 
-- 
cgit v1.2.3