Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar

Conflicts:
	archaeological_operations/templates/ishtar/sheet_operation.html

1 files changed, 7 insertions, 5 deletions

diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 1e6d71c44..e711def8c 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -29,11 +29,12 @@
   {% include "ishtar/blocks/sheet_creation_section.html" %}
   {% trans "Begining date" as begining_date_label %}
   {% field_li begining_date_label item.start_date %}
-{% field_li "Excavation end date" item.excavation_end_date|default:"-" %}
-{% field_li_detail "Head scientist" item.scientist %}
-{% field_li_detail "In charge" item.in_charge %}
-{% field_li_detail "Operator" item.operator %}
-<li><label>{%trans "State"%}</label> <span class='value'>{% if item.is_active %}{%trans "Active file"%}</span></p>
+  {% field_li "Excavation end date" item.excavation_end_date|default:"-" %}
+  {% field_li_detail "Head scientist" item.scientist %}
+  {% field_li_detail "In charge" item.in_charge %}
+  {% field_li_multiple "Collaborators" item.collaborators %}
+  {% field_li_detail "Operator" item.operator %}
+<li><label>{%trans "State:"%}</label> <span class='value'>{% if item.is_active %}{%trans "Active file"%}</span></p>
 {% else %}{%trans "Closed operation"%}</span></li> {% endif %}
 {% if item.closing.date %}<li><label>{%trans "Closing date"%}</label> <span class='value'>{{ item.closing.date }} <strong>{%trans "by" %}</strong> {{ item.closing.user }}</span></li>{% endif %}
 {% field_li "Type" item.operation_type %}
@@ -141,6 +142,7 @@
 {% endif %}
 
 <h3>{% trans "Statistics" %}</h3>
+<small class="centered"><em>{% trans "Theses number are updated hourly" %}</em></small>
 
 <h4>{% trans "Administrative acts" %}</h4>
 <ul class='form-flex'>