Merge branch 'master' into v0.9

Conflicts:
	archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py

1 files changed, 5 insertions, 4 deletions

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;