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

Conflicts:
	archaeological_operations/templates/ishtar/sheet_operation.html

2 files changed, 23 insertions, 1 deletions

diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
index 4a21368ae..41be02748 100644
--- a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
+++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html
@@ -1,7 +1,18 @@
 {% 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="alert">
+    <i class="fa fa-exclamation-triangle"></i>
+    {% 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 %}
diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html
new file mode 100644
index 000000000..83dbfc0fe
--- /dev/null
+++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html
@@ -0,0 +1,11 @@
+{% extends "ishtar/wizard/default_wizard.html" %}
+{% load i18n %}
+{% load url from future %}
+{% block form_head %}
+{% if wizard.form.readonly %}
+<p class="alert">
+    <i class="fa fa-exclamation-triangle"></i>
+    {% trans "Containers with localisation are associated to this warehouse. You cannot change divisions." %}<br/>
+</p>
+{% endif %}
+{% endblock %}