Sheets: better display of creation and modification date/user (refs #3486)

1 files changed, 15 insertions, 12 deletions

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index a6a0ccf69..b088f3161 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -20,18 +20,21 @@
 
 <ul class='form-flex'>
 {% field_li "Previous ID" item.previous_id %}
-{% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %}
-{% with item.history_creator.ishtaruser.full_label|add:"<br/><i>"|add:creation_date|add:"</i>" as creator %}
-{% field_li "Created by" creator|safe %}
-{% endwith %}
-{% endwith %}
-{% 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_li "Last modified by" modifier|safe %}
-{% endwith %}
-{% endwith %}
-{% endif %}
+
+  <li><label>{%trans "Creation:"%}</label>
+    <span class='value'>
+        {{item.history_creator.ishtaruser.person}}<br/>
+        <small><em>{{item.history_creation_date|date:"DATETIME_FORMAT"}}</em></small>
+    </span>
+  </li>
+  {% if item.history_creation_date != item.last_edition_date %}
+  <li><label>{%trans "Modification:"%}</label>
+    <span class='value'>
+        {{item.history_modifier.ishtaruser.person}}<br/>
+        <small><em>{% firstof item.history_date|date:"DATETIME_FORMAT" item.history.all.0.history_date|date:"DATETIME_FORMAT" %}</em></small>
+    </span>
+  </li>
+  {% endif %}
 {% field_li "Administrative index" item.administrative_index %}
 {% field_li_multiple "Material types" item.material_types %}
 {% field_li "Dating" item.dating %}