Archaeological files: small improve on the window presentation

1 files changed, 18 insertions, 13 deletions

diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index 0e68f8a98..10ee82232 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -1,5 +1,5 @@
 {% extends "ishtar/sheet.html" %}
-{% load i18n window_ope_tables %}
+{% load i18n window_ope_tables window_field %}
 
 {% block head_sheet %}
 {{block.super}}
@@ -29,32 +29,37 @@
 {%endif%}
 
 <h3>{% trans "General"%}</h3>
-<p><label>{%trans "Year:"%}</label> <span class='value strong'>{{ item.year }}</span></p>
-{% if item.numeric_reference %}<p><label>{%trans "Numerical reference:"%}</label> <span class='value strong'>{{ item.numeric_reference }}</span></p>{% endif %}
-{% if item.internal_reference %}<p><label>{%trans "Other reference:"%}</label> <span class='value'>{{ item.internal_reference }}</span></p>{% endif %}
-{% if item.name %}
-<p><label>{%trans "Name:"%}</label> <span class='value'>{{ item.name }}</span></p>
-{% endif %}
+
+{% field "Year" item.year "<strong>" "</strong>" %}
+{% field "Numerical reference" item.numeric_reference "<strong>" "</strong>" %}
+{% field "Other reference" item.internal_reference %}
+{% field "Name" item.name %}
+
 <p><label>{%trans "Edition date:"%}</label> <span class='value'>{% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}</span></p> <!-- date = now -->
-{% if item.reception_date %}<p><label>{%trans "Reception date:"%}</label> <span class='value'>{{ item.reception_date }}</span></p>{% endif %}
-<p><label>{%trans "Creation date:"%}</label> <span class='value'>{{ item.creation_date }}</span></p>
-<p><label>{%trans "Created by:"%}</label> <span class='value'>{{ item.history_creator.ishtaruser.full_label }}</span></p>
+
+{% field "Reception date" item.reception_date %}
+{% field "Creation date" item.creation_date %}
+{% field "Created by" item.history_creator.ishtaruser.full_label %}
+
 {% comment %}
 {% if item.deadline_date and not item.acts %}
     <p><label>{%trans "Deadline:"%}</label> <span class='value'>{% item.deadline_date %}</span></p> <!-- calculated deadline for some preventive files , see saisine_type, not displayed if an act as been send -->
 {% endif %}
 {% endcomment %}
 
-<p><label>{%trans "In charge:"%}</label> <span class='value'>{{ item.in_charge.full_label }}</span></p>
+{% field "In charge" item.in_charge.full_label %}
+
 <p><label>{%trans "State:"%}</label> <span class='value'>{% if item.is_active %}{%trans "Active file"%}</span></p>
 {% else %}{%trans "Closed file"%}</span></p>
+
 {% if item.closing %}<p><label>{%trans "Closing date:"%}</label> <span class='value'>{{ item.closing.date }} <strong>{%trans "by" %}</strong> {{ item.closing.user.full_label }}</span></p>{% endif %}
 {% endif %}
 
-<p><label>{%trans "Type:"%}</label> <span class='value'>{{ item.file_type }}</span></p>
+{% field "Type" item.file_type %}
 
 {% if item.related_file %}<p><label>{%trans "Related file:"%}</label> <span class='value'><a href='#' onclick='load_window("{% url show-file item.related_file.pk ''%}")'>{{ item.related_file }}</a></span></p>{% endif %} <!-- Displayed as Year/index/Commune/Common_name This should be a link to the file sheet of the related file -->
-{% if item.comment %}<p><label>{%trans "Comment:"%}</label> <span class='value'>{{ item.comment }}</span></p>{%endif%}
+
+{% field "Comment" item.comment "<pre>" "</pre>" %}
 
 <h3>{% trans "Localisation"%}</h3>
 {% if item.towns.count %}<p><label>{%trans "Towns:"%}</label> <span class='value'>{{ item.towns.all|join:", " }}</span></p>{% endif %}