Treatment deletion: more explicit messages.

4 files changed, 36 insertions, 2 deletions

diff --git a/archaeological_finds/templates/ishtar/wizard/wizard_treatement_deletion.html b/archaeological_finds/templates/ishtar/wizard/wizard_treatement_deletion.html
new file mode 100644
index 000000000..b0ebe7409
--- /dev/null
+++ b/archaeological_finds/templates/ishtar/wizard/wizard_treatement_deletion.html
@@ -0,0 +1,27 @@
+{% extends "ishtar/wizard/confirm_wizard.html" %}
+{% load i18n %}
+
+{% block "warning_message" %}
+{% with has_downstream=current_object.downstream.count %}
+<div class="alert alert-{% if has_downstream %}danger{% else %}warning{% endif%}">
+    <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+    {% trans "Are you sure you want to delete this treatment?" %}
+{% if has_downstream %}
+    {% trans "The following finds will be deleted and restored to a previous version."%}
+    <ul>{% for item in current_object.downstream.all %}
+        <li>
+            {{item}}
+        </li>
+    {% endfor %}</ul>
+    {% trans "All changes made to the associated finds since this treatment record will be lost!" %}
+{% endif %}
+</div>
+
+<div class="alert alert-info">
+    {% trans "Treatment informations:" %}
+</div>
+
+
+
+{% endwith %}
+{% endblock %}
diff --git a/archaeological_finds/wizards.py b/archaeological_finds/wizards.py
index 29ca50056..8ed7061e2 100644
--- a/archaeological_finds/wizards.py
+++ b/archaeological_finds/wizards.py
@@ -396,6 +396,7 @@ class Treatment1NWizard(TreatmentBase):
 
 
 class TreatmentDeletionWizard(DeletionWizard):
+    wizard_confirm = 'ishtar/wizard/wizard_treatement_deletion.html'
     model = models.Treatment
     fields = ['label', 'other_reference', 'year', 'index',
               'treatment_types', 'location', 'person', 'organization',
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index 9aae1d52d..fde4b3440 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -133,7 +133,7 @@ class ImporterType(models.Model):
         ImporterModel, verbose_name=_(u"Models that can accept new items"),
         blank=True, help_text=_(u"Leave blank for no restrictions"),
         related_name='+')
-    is_template = models.BooleanField(_(u"Is template"), default=False)
+    is_template = models.BooleanField(_(u"Can be exported"), default=False)
     unicity_keys = models.CharField(_(u"Unicity keys (separator \";\")"),
                                     blank=True, null=True, max_length=500)
     available = models.BooleanField(_(u"Available"), default=True)
diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
index 401fe570c..9829058a8 100644
--- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
@@ -9,7 +9,12 @@
 <form action="." method="post">{% csrf_token %}
 <div class='form'>
   {% block "warning_informations" %}{% endblock %}
-  <p>{% if confirm_msg %}{{confirm_msg|safe}}{%else%}{% trans "You have entered the following informations:" %}{%endif%}</p>
+  {% block "warning_message" %}
+  <div class="alert alert-info">
+    {% if confirm_msg %}{{confirm_msg|safe}}{%else%}{% trans "You have entered the following informations:" %}{%endif%}
+  </div>
+  {% endblock %}
+  {% block "detailed_informations" %}
   {% for form_label, form_data in datas %}
 
   <div class="card">
@@ -42,6 +47,7 @@
   {{ extra_form }}
   </table>
   {% endif %}
+  {% endblock %}
   {% block "extra_informations" %}{% endblock %}
 
   {% block "footer" %}