Merge branch 'master' into v0.9

1 files changed, 10 insertions, 1 deletions

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index d21c85856..d23de0e8e 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -45,10 +45,19 @@
 {% if item.weight %}{% with item.weight|add:' '|add:item.weight_unit as weight %}
 {% field_li "Weight" weight %}
 {% endwith %}{% endif %}
-{% field_li "Weight" item.weight %}
+{% if item.dimensions_comment %}
+</ul>
+{% field "Dimensions comment" item.dimensions_comment "<pre>" "</pre>" %}
+<ul class='form-flex'>
+{% endif %}
 
 {% field_li "Find number" item.find_number %}
 {% field_li "Conservatory state" item.conservatory_state %}
+{% if item.conservatory_comment %}
+</ul>
+{% field "Conservatory comment" item.conservatory_comment "<pre>" "</pre>" %}
+<ul class='form-flex'>
+{% endif %}
 {% field_li_multiple "Type of preservation to consider" item.preservation_to_considers %}
 {% field_li_multiple "Object types" item.object_types %}
 {% field_li_multiple "Integrity" item.integrities %}