Merge branch 'v0.9' into wheezy

3 files changed, 27 insertions, 7 deletions

diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html
index 4a7b2f0b9..7845da2c1 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_container.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_container.html
@@ -4,13 +4,21 @@
 {% block head_title %}{% trans "Container" %}{% endblock %}
 
 {% block content %}
-{% window_nav item window_id 'show-container' '' '' '' previous next 1 %}
+{% 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 "Reference" item.reference %}
-    {% field_li "Container type" item.container_type %}
     {% field_li_detail "Responsible warehouse" item.responsible %}
     {% 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>" %}
diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
index 9fd022281..c31fc93b4 100644
--- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
+++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html
@@ -4,12 +4,15 @@
 {% block head_title %}{% trans "Warehouse" %}{% endblock %}
 
 {% block content %}
-{% window_nav item window_id 'show-warehouse' '' '' '' previous next 1 %}
+{% window_nav item window_id 'show-warehouse' 'warehouse_modify' '' '' previous next 1 %}
+
+<p class="window-refs">{{ item.name|default:"" }}</p>
+<p class="window-refs">{{ item.warehouse_type|default:"" }}</p>
+{% include "ishtar/blocks/sheet_external_id.html" %}
 
 <ul class='form-flex'>
-    {% field_li "Name" item.name %}
-    {% field_li "Warehouse type" item.warehouse_type %}
     {% field_li "Person in charge" item.person_in_charge %}
+    {% include "ishtar/blocks/sheet_creation_section.html" %}
 </ul>
 {% field "Comment" item.comment "<pre>" "</pre>" %}
 
diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
index 4a21368ae..2e817ff41 100644
--- a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
+++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
@@ -1,7 +1,16 @@
 {% extends "ishtar/wizard/default_wizard.html" %}
 {% load i18n %}
+{% load url from future %}
 {% block form_head %}
 {% if not wizard.form.fields %}
-<p class='warning'>{% trans "No division set for this warehouse. Define it to localise container in this warehouse." %}</p>
+<p class='warning'>{% trans "No division set for this warehouse. Define at least one division to localise containers in this warehouse." %}<br/>
+    {{wizard.form.warehouse}}
+    <a href="{% url 'warehouse_modify' wizard.form.warehouse.pk  %}">
+        <span class="fa-stack fa-lg">
+            <i class="fa fa-circle fa-stack-2x"></i>
+            <i class="fa fa-pencil fa-stack-1x fa-inverse"></i>
+        </span>
+    </a>
+</p>
 {% endif %}
 {% endblock %}