summaryrefslogtreecommitdiff
path: root/archaeological_operations/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-07 00:04:06 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-07 00:04:06 +0100
commit0dcab5e02a38a4151bb5a4d44bc351ce1062e072 (patch)
tree21b664de58d64b8ca91a7885174730a0b2eeb3ee /archaeological_operations/templates
parentf904cd735ae649669767ca8b6cd9c9d6d711b9d8 (diff)
downloadIshtar-0dcab5e02a38a4151bb5a4d44bc351ce1062e072.tar.bz2
Ishtar-0dcab5e02a38a4151bb5a4d44bc351ce1062e072.zip
Sheets: better display of creation and modification date/user (refs #3486)
Diffstat (limited to 'archaeological_operations/templates')
-rw-r--r--archaeological_operations/templates/ishtar/sheet_operation.html16
1 files changed, 14 insertions, 2 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 28e4ae6b5..d3eb980c4 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -24,8 +24,20 @@
<h3>{% trans "General"%}</h3>
<ul class='form-flex'>
{% field_li "Old code" item.old_code %}
-<li><label>{%trans "Last modification 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_detail "Created by" item.history_creator.ishtaruser.person %}
+ <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 "Begining date" item.start_date %}
{% field_li "Excavation end date" item.excavation_end_date|default:"-" %}
{% field_li_detail "Head scientist" item.scientist %}