From 0dcab5e02a38a4151bb5a4d44bc351ce1062e072 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 7 Mar 2017 00:04:06 +0100
Subject: Sheets: better display of creation and modification date/user (refs
 #3486)

---
 .../templates/ishtar/sheet_file.html                | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'archaeological_files')

diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html
index 071db20ee..408edde34 100644
--- a/archaeological_files/templates/ishtar/sheet_file.html
+++ b/archaeological_files/templates/ishtar/sheet_file.html
@@ -18,12 +18,23 @@
 {% field_li "Numerical reference" item.numeric_reference "<strong>" "</strong>" %}
 {% field_li "Other reference" item.internal_reference %}
 {% field_li "Name" item.name %}
+  {% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %}
+
+  <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 %}
 
-<li><label>{%trans "Edition date:"%}</label> <span class='value'>{% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}</span></li> <!-- date = now -->
-
-{% field_li "Reception date" item.reception_date|date:"DATE_FORMAT" %}
-{% field_li "Creation date" item.creation_date|date:"DATE_FORMAT" %}
-{% field_li_detail "Created by" item.history_creator.ishtaruser.person %}
 
 {% comment %}
 {% if item.deadline_date and not item.acts %}
-- 
cgit v1.2.3