Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

3 files changed, 8 insertions, 7 deletions

diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
index 9007c867c..1fbaadcd1 100644
--- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
@@ -6,9 +6,9 @@
 <form action="." method="post">{% csrf_token %}
 <ul id='form_path'>
 {% for step in previous_steps %}
-  <li><button name="form_prev_step" value="{{forloop.counter0}}">{{step.form_label}}</button></li>
+  <li><button name="form_prev_step" value="{{forloop.counter0}}">{{step}}</button></li>
 {% endfor %}
-  <li class='current'><a href='#'>{{current_step.form_label}}</a></li>
+  <li class='current'><a href='#'>{{current_step_label}}</a></li>
 </ul>
 </form>
 <form action="." method="post">{% csrf_token %}
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index 6491b7a0f..fad1895bd 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -10,11 +10,11 @@
 <form action="." method="post">{% csrf_token %}
 <ul id='form_path'>
 {% for step in previous_steps %}
-  <li><button class='change_step' name="form_prev_step" value="{{forloop.counter0}}">{{step.form_label}}</button></li>
+  <li><button class='change_step' name="form_prev_step" value="{{forloop.counter0}}">{{step}}</button></li>
 {% endfor %}
-  <li class='current'><a href='#'>{{current_step.form_label}}</a></li>
+  <li class='current'><a href='#'>{{current_step_label}}</a></li>
 {% for step in next_steps %}
-  <li><button class='change_step' name="form_prev_step" value="{{forloop.counter|add:previous_step_counter}}">{{step.form_label}}</button></li>
+  <li><button class='change_step' name="form_prev_step" value="{{forloop.counter|add:previous_step_counter}}">{{step}}</button></li>
 {% endfor %}
 </ul>
 </form>
@@ -24,6 +24,7 @@
 <div class='form'>
 {{ wizard.form.media }}
 {{ wizard.management_form }}
+{% block form_head %}{% endblock %}
 {% block form_detail %}
 {% if wizard.form.forms %}
   {{ wizard.form.management_form }}
@@ -55,7 +56,7 @@ $(document).ready(function(){
     $('form :input').change(function(){form_changed=true;});
     $('.change_step').click(function(){
         if(!form_changed ||
-           confirm("{% trans "The form has changed if you don't validate it all your changes will be lost." %}")){
+           confirm("{% trans "The form has changed. If you don't validate it, all your changes will be lost." %}")){
             return true;
         }
         return false;
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html
index 03b941c60..86286fad0 100644
--- a/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_person_deletion.html
@@ -19,7 +19,7 @@
 {% endif %}
 
 {% if current_object.responsible_town_planning_service.count %}
-<h3>{% trans "Responsible town planning service of archaeological files" %}</h3>
+<h3>{% trans "Responsible for planning service of archaeological files" %}</h3>
 <ul class='list'>
 {% for file in current_object.responsible_town_planning_service.all %}
   <li>{{file}} <a class='display_details_inline' href="#" onclick='load_window("{%url show-file file.pk ''%}")'><i class="fa fa-info-circle" aria-hidden="true"></i></a></li>{% endfor %}