summaryrefslogtreecommitdiff
path: root/archaeological_context_records
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2024-09-16 19:51:16 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2024-09-17 10:04:01 +0200
commitcdff3fb497a7ad7beeb67d2d913b8c2eafb22c7c (patch)
treed6269b4909732fad0c4e0a693be608cbba91762e /archaeological_context_records
parentfd5e330ede426a7152deab41620b6a60b63df220 (diff)
downloadIshtar-cdff3fb497a7ad7beeb67d2d913b8c2eafb22c7c.tar.bz2
Ishtar-cdff3fb497a7ad7beeb67d2d913b8c2eafb22c7c.zip
✨ update context record, town sheets for new fields (refs #6024)
Diffstat (limited to 'archaeological_context_records')
-rw-r--r--archaeological_context_records/templates/ishtar/sheet_contextrecord.html38
1 files changed, 24 insertions, 14 deletions
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index 712ba48ee..984be20bd 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -133,19 +133,27 @@
<div class='row'>
{% field_flex_2 "Complete ID" item.full_label %}
{% field_flex_2 "Type" item.unit %}
+ {% field_flex_full "General comment" item.comment "<pre>" "</pre>" has_image %}
</div>
</div>
<hr class="clearfix">
- <h3>{% trans "Description"%}</h3>
+ <h3>{% trans "Description" %}</h3>
<div class="row">
- {% field_flex_multiple_obj "Excavation techniques" item 'excavation_technics' has_image %}
- {% field_flex_multiple_obj "Documentation" item 'documentations' has_image %}
- {% field_flex "Opening date" item.opening_date|date:"DATE_FORMAT" '' '' has_image %}
- {% field_flex "Closing date" item.closing_date|date:"DATE_FORMAT" '' '' has_image %}
+ {% field_flex_multiple_obj "Excavation techniques" item 'excavation_technics' %}
+ {% 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>" has_image %}
- {% field_flex_full "Description" item.description "<pre>" "</pre>" has_image %}
- {% field_flex_full "General comment" item.comment "<pre>" "</pre>" has_image %}
+ {% 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>" %}
+ </div>
+ <h3>{% trans "Dimensions" %}</h3>
+ <div class="row">
{% if item.surface %}
<dl class="col-12 col-md-6 col-lg-3 flex-wrap">
<dt>{%trans "Surface"%}</dt>
@@ -154,12 +162,14 @@
</dd>
</dl>
{% endif %}
- {% field_flex "Length (m)" item.length '' '' has_image %}
- {% field_flex "Width (m)" item.width '' '' has_image %}
- {% field_flex "Diameter (m)" item.diameter '' '' has_image %}
- {% field_flex "Depth (m)" item.depth '' '' has_image %}
- {% field_flex "Thickness (m)" item.thickness '' '' has_image %}
- {% field_flex "Depth of appearance (m)" item.depth_of_appearance '' '' has_image %}
+ {% field_flex "Length (m)" item.length %}
+ {% field_flex _("Excavated length (m)") item.excavated_length %}
+ {% field_flex "Width (m)" item.width %}
+ {% field_flex _("Excavated width (m)") item.excavated_width %}
+ {% field_flex "Diameter (m)" item.diameter %}
+ {% field_flex "Depth (m)" item.depth %}
+ {% field_flex "Thickness (m)" item.thickness %}
+ {% field_flex "Depth of appearance (m)" item.depth_of_appearance %}
</div>
{% if item.main_geodata %}