1 files changed, 21 insertions, 22 deletions
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index b088f3161..912bf1b93 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -15,27 +15,15 @@
 <p class='window-refs'>{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} &ndash; {% endif %}{{base_find.short_id}}{% endfor %}</p>
 <p class="window-refs">{{ item.administrative_index|default:"" }}</p>
 <p class="window-refs">{{ item.contextrecord|default:"" }}</p>
-
+{% include "ishtar/blocks/sheet_external_id.html" %}
 
 
 <ul class='form-flex'>
-{% field_li "Previous ID" item.previous_id %}
-
-  <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 "Previous ID" item.previous_id %}
+
+  {% include "ishtar/blocks/sheet_creation_section.html" %}
+  {% trans "Administrative index" as admin_index_label %}
+  {% field_li admin_index_label item.administrative_index %}
 {% field_li_multiple "Material types" item.material_types %}
 {% field_li "Dating" item.dating %}
 {% field_li "Length (cm)" item.length %}
@@ -154,7 +142,7 @@
       </a>
     </td>
     <td class='string'>{{ treatment.year }} - {{treatment.index}}</td>
-    <td class='string'>{{ treatment.label }}</td>
+    <td class='string'>{{ treatment.label|default_if_none:"-" }}</td>
     <td class='string'>{{ treatment.treatment_types_lbl }}</td>
     <td class='string'>{{ treatment.treatment_state|default_if_none:"-" }}</td>
     <td class='item-list'>{% for item in items %}<span>{{item}} {{ item|link_to_window}}</span>{% endfor %}</td>
@@ -176,9 +164,16 @@
 <h3>{% trans "Associated base finds"%}</h3>
 
 {% for base_find in item.base_finds.all %}
+<p class='window-refs'>{{base_find.complete_id }}</p>
+<p class='window-refs'>{{base_find.short_id }}</p>
+{% if base_find.external_id %}
+<p class='window-refs external-id'>
+  <small title="{% trans 'Internal ID' %}">
+    <i class="fa fa-key" aria-hidden="true"></i>
+    {{base_find.external_id|default:''}}
+  </small>
+</p>{% endif %}
 <ul class='form-flex'>
-{% field_li "Complete ID" base_find.complete_id %}
-{% field_li "Short ID" base_find.short_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 %}
@@ -228,6 +223,7 @@
 <table id='{{window_id}}-docs'>
   <caption>{%trans "Documents"%}</caption>
   <tr>
+    <th>&nbsp;</th>
     <th>{% trans "Title" %}</th>
     <th>{% trans "Type" %}</th>
     <th>{% trans "Authors" %}</th>
@@ -235,8 +231,11 @@
   </tr>
   {% for doc in item.source.all %}
   <tr>
+    <td><a class="display_details" href="#"
+         onclick="load_window('{% url 'show-findsource' doc.id %}/');"><i class="fa fa-info-circle" aria-hidden="true"></i>
+      </a></td>
     <td class='string'>{{ doc.title }}</td>
-    <td class='string'>{{doc.source_type}}</td>
+    <td class='string'>{{ doc.source_type }}</td>
     <td class='string'>{{ doc.authors.all|join:", " }}</td>
     <td class='string'>{% if doc.associated_url  %}<a href='{{doc.associated_url}}' target="_blank">{{doc.associated_url}}</a>{% endif %}</td>
   </tr>