diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-09 23:08:51 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-03-09 23:08:51 +0100 |
| commit | c2d86b659a9ad00b1e2cb0485e1310504c8fd03c (patch) | |
| tree | d95d1ca9e9971b465f235cbb86091cd2cf3c7325 /archaeological_operations/templates/ishtar | |
| parent | 1c381564ea9ed133f73e0b330468b204e7a034f1 (diff) | |
| parent | 53f0a5c95c34c0db67528422583dc3e90f20f705 (diff) | |
| download | Ishtar-c2d86b659a9ad00b1e2cb0485e1310504c8fd03c.tar.bz2 Ishtar-c2d86b659a9ad00b1e2cb0485e1310504c8fd03c.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_operations/templates/ishtar')
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 16 |
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 %} |