summaryrefslogtreecommitdiff
path: root/archaeological_finds/templates/ishtar/sheet_find.html
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-07-12 13:12:48 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-07-12 13:12:48 +0200
commit6faa87a30294b0f555602f2738858cb078647236 (patch)
tree22e64211f860463583d7a58330f44292916992f1 /archaeological_finds/templates/ishtar/sheet_find.html
parentbcf6241a42958c3364578aad2dc0283f10100e3e (diff)
parent1821e59c0d60dff25ce06a6d8f477c6ce614f22a (diff)
downloadIshtar-6faa87a30294b0f555602f2738858cb078647236.tar.bz2
Ishtar-6faa87a30294b0f555602f2738858cb078647236.zip
Merge branch 'master' into master-WIP-treatments
Diffstat (limited to 'archaeological_finds/templates/ishtar/sheet_find.html')
-rw-r--r--archaeological_finds/templates/ishtar/sheet_find.html11
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 %}