diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-07 12:16:37 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-07 12:16:37 +0200 |
| commit | 6b87dae76d931ead9838db1f66a6ff1fe1cc1dd1 (patch) | |
| tree | 0a2273d9db0499214e18a041987339eac9d20ac9 /archaeological_warehouse/templates/ishtar/wizard | |
| parent | 75730c0ac55c935c03e58977405b4b8a2233595d (diff) | |
| parent | 3d8b8d86f01ecb9b37e24e25fd15500b8f4fb2a0 (diff) | |
| download | Ishtar-6b87dae76d931ead9838db1f66a6ff1fe1cc1dd1.tar.bz2 Ishtar-6b87dae76d931ead9838db1f66a6ff1fe1cc1dd1.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_warehouse/templates/ishtar/wizard')
| -rw-r--r-- | archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html | 4 | ||||
| -rw-r--r-- | archaeological_warehouse/templates/ishtar/wizard/wizard_warehouse_divisions.html | 11 |
2 files changed, 14 insertions, 1 deletions
diff --git a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html b/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html index 2e817ff41..41be02748 100644 --- a/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html +++ b/archaeological_warehouse/templates/ishtar/wizard/wizard_containerlocalisation.html @@ -3,7 +3,9 @@ {% load url from future %} {% block form_head %} {% if not wizard.form.fields %} -<p class='warning'>{% trans "No division set for this warehouse. Define at least one division to localise containers in this warehouse." %}<br/> +<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"> 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 %} |