diff options
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index ef54be952..96a1cee61 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -38,16 +38,8 @@ {% trans "Administrative index" as admin_index_label %} {% field_flex admin_index_label item.administrative_index %} {% field_flex_multiple "Material types" item.material_types %} - {% field_flex "Dating" item.dating %} - {% field_flex "Length (cm)" item.length %} - {% field_flex "Width (cm)" item.width %} - {% field_flex "Height (cm)" item.height %} - {% field_flex "Diameter (cm)" item.diameter %} - {% field_flex "Thickness (cm)" item.thickness %} - {% field_flex "Volume (l)" item.volume %} - {% trans "Weight (g)" as weight_label %} - {% field_flex weight_label item.weight_string %} - {% field_flex_full "Dimensions comment" item.dimensions_comment "<pre>" "</pre>" %} + {% field_flex_full "Description" item.description "<pre>" "</pre>" %} + {% field_flex_full "Mark" item.mark "<pre>" "</pre>" %} {% field_flex "Find number" item.find_number %} {% field_flex "Minimum number of individuals (MNI)" item.min_number_of_individuals %} @@ -56,6 +48,7 @@ {% field_flex_multiple "Remarkability" item.remarkabilities %} {% field_flex_multiple "Communicability" item.communicabilities %} {% field_flex "Estimated value" item.estimated_value|default_if_none:''|intcomma '' ' '|add:CURRENCY %} + {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} {% trans "Checked" as checked_label %} {% if item.CHECK_DICT %} {% field_flex checked_label item.checked|from_dict:item.CHECK_DICT %} @@ -63,12 +56,32 @@ {% if item.history_object and item.history_object.CHECK_DICT %} {% field_flex checked_label item.checked|from_dict:item.history_object.CHECK_DICT %} {% endif%} - {% field_flex_full "Description" item.description "<pre>" "</pre>" %} - {% field_flex_full "Comment" item.comment "<pre>" "</pre>" %} + {% field_flex "Check date" item.check_date %} </div> {% include "ishtar/blocks/sheet_json.html" %} +{% if item.dating or item.dating_comment %} +<h3>{% trans "Dating" %}</h3> + {% field_flex "Dating" item.dating %} + {% field_flex_full "Comment on dating" item.dating_comment "<pre>" "</pre>" %} +{% endif %} + +{% if item.length or item.width or item.height or item.diameter or item.thickness or item.volume or item.weight_string or item.dimensions_comment %} +<h3>{% trans "Dimensions" %}</h3> +<div class='row'> + {% field_flex "Length (cm)" item.length %} + {% field_flex "Width (cm)" item.width %} + {% field_flex "Height (cm)" item.height %} + {% field_flex "Diameter (cm)" item.diameter %} + {% field_flex "Thickness (cm)" item.thickness %} + {% field_flex "Volume (l)" item.volume %} + {% trans "Weight (g)" as weight_label %} + {% field_flex weight_label item.weight_string %} + {% field_flex_full "Dimensions comment" item.dimensions_comment "<pre>" "</pre>" %} +</div> +{% endif %} + {% if item.conservatory_state or item.conservatory_comment or item.alterations.count or item.alteration_causes.count or item.preservation_to_considers.count or item.treatment_emergency or item.insurance_value %} <h3>{% trans "Preservation" %}</h3> <div class='row'> @@ -197,7 +210,8 @@ {% if item.history_creation_date != item.last_edition_date %} {% with item.last_edition_date|date:"SHORT_DATETIME_FORMAT" as edition_date %} {% with item.history_modifier.ishtaruser.full_label|add:"<br/><i>"|add:edition_date|add:"</i>" as modifier %} - {% field_flex "Last modified by" modifier|safe %} + {% trans "Last modified by" as lastmodifiedby_label %} + {% field_flex lastmodifiedby_label modifier|safe %} {% endwith %}{% endwith %} {% endif %} {% field_flex "Batch/object" base_find.batch %} |