Merge branch 'master' into v0.9

Conflicts:
	Makefile.example
	archaeological_operations/migrations/0061_regenerate_cached_label.py
	archaeological_warehouse/migrations/0024_generate_cache_lbl_for_containers.py

1 files changed, 17 insertions, 16 deletions

diff --git a/ishtar_common/templates/ishtar/import_delete.html b/ishtar_common/templates/ishtar/import_delete.html
index 30217bf8d..4b48ebc8c 100644
--- a/ishtar_common/templates/ishtar/import_delete.html
+++ b/ishtar_common/templates/ishtar/import_delete.html
@@ -4,21 +4,22 @@
 {% block content %}
 <h2>{{page_name}}</h2>
 <div class='form'>
-<form action="." method="post">{% csrf_token %}
-<p>{% trans "The current items are linked to this import:" %}</p>
-{% for accessor, imported in object.get_all_imported %}
-{% ifchanged imported|verbose_model_name %}
-{% if forloop.counter %}</ul>{% endif %}
-<h4>{{imported|verbose_model_name}}</h4>
-<ul class='item-list'>
-{%endifchanged%}
-    <li>{{imported}}</li>
-{% endfor %}
-</ul>
-<p>{% trans "All these items will be deleted with this import." %}</p>
-<strong>{% trans "Are you sure?" %}</strong>
-<input type="submit" value="{% trans "Yes" %}"/>
-</form>
-<p><a href='{% url 'current_imports' %}'>{% trans "Back" %}</a></p>
+    <h3>{{object}}</h3>
+    <form action="." method="post">{% csrf_token %}
+        <p>{% trans "The current items are linked to this import:" %}</p>
+        {% for accessor, imported in object.get_all_imported %}
+        {% ifchanged imported|verbose_model_name %}
+        {% if forloop.counter %}</ul>{% endif %}
+        <h4>{{imported|verbose_model_name}}</h4>
+        <ul class='item-list'>
+        {%endifchanged%}
+            <li>{{imported}}</li>
+        {% endfor %}
+        </ul>
+        <p>{% trans "All these items will be deleted with this import." %}</p>
+        <strong>{% trans "Are you sure?" %}</strong>
+        <input type="submit" value="{% trans "Yes" %}"/>
+    </form>
+    <p><a href='{% url 'current_imports' %}'>{% trans "Back" %}</a></p>
 </div>
 {% endblock %}