Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar

Conflicts:
	archaeological_operations/templates/ishtar/sheet_operation.html

1 files changed, 10 insertions, 8 deletions

diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index c5693edfb..29e45d3a9 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -26,15 +26,17 @@
 </ul>
 {% field "Comment on datings" item.datings_comment "<pre>" "</pre>" %}
 
-{% if item.description or item.lenght or item.width or item.depth or item.thickness or item.comment %}
+{% if item.diameter or item.depth_of_appearance or item.documentations.count or item.description or item.lenght or item.width or item.depth or item.thickness or item.comment %}
 <h3>{% trans "Description"%}</h3>
 {% field "Description" item.description "<pre>" "</pre>" %}
 {% field "Comment" item.comment "<pre>" "</pre>" %}
 <ul class='form-flex'>
-{% field_li "Length (m)" item.lenght %}
-{% field_li "Width (m)" item.width %}
-{% field_li "Depth (m)" item.depth %}
-{% field_li "Thickness (m)" item.thickness %}
+    {% field_li "Length (m)" item.lenght %}
+    {% field_li "Width (m)" item.width %}
+    {% field_li "Diameter (m)" item.diameter %}
+    {% field_li "Depth (m)" item.depth %}
+    {% field_li "Thickness (m)" item.thickness %}
+    {% field_li "Depth of appearance (m)" item.depth_of_appearance %}
 </ul>
 {% endif %}
 
@@ -42,9 +44,9 @@
 <h3>{% trans "Interpretation"%}</h3>
 
 <ul class='form-flex'>
-{% field_li "Activity" item.activity %}
-{% field_li "Identification" item.identification %}
-{% field_li "Has furniture?" item.has_furniture %}
+    {% field_li_multiple "Documentation" item.documentations %}
+    {% field_li "Activity" item.activity %}
+    {% field_li "Identification" item.identification %}
 </ul>
 {% field "Filling" item.filling "<pre>" "</pre>" %}
 {% field "Interpretation" item.interpretation "<pre>" "</pre>" %}