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

Conflicts:
	archaeological_operations/templates/ishtar/sheet_operation.html

1 files changed, 6 insertions, 1 deletions

diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
index 172719604..7845da2c1 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_container.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -6,14 +6,19 @@
 {% block content %}
 {% window_nav item window_id 'show-container' 'container_modify' '' '' previous next 1 %}
 
+{% if item.image %}
+<a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}" class='photo'><img src='{{item.thumbnail.url}}'/></a>
+{% endif%}
+
 <p class="window-refs">{{ item.reference|default:"" }}</p>
 <p class="window-refs">{{ item.container_type|default:"" }}</p>
+<p class="window-refs">{{ item.responsible.name }} - {{ item.index }}</p>
 {% include "ishtar/blocks/sheet_external_id.html" %}
 
 <ul class='form-flex'>
     {% field_li_detail "Responsible warehouse" item.responsible %}
-    {% include "ishtar/blocks/sheet_creation_section.html" %}
     {% field_li_detail "Location (warehouse)" item.location %}
+    {% include "ishtar/blocks/sheet_creation_section.html" %}
 </ul>
 {% field "Location" item.precise_location %}
 {% field "Comment" item.comment "<pre>" "</pre>" %}