2 files changed, 10 insertions, 7 deletions
diff --git a/ishtar/templates/confirm_wizard.html b/ishtar/templates/ishtar/wizard/confirm_wizard.html
index 371de39c3..bd80e3967 100644
--- a/ishtar/templates/confirm_wizard.html
+++ b/ishtar/templates/ishtar/wizard/confirm_wizard.html
@@ -19,9 +19,10 @@
     {% endfor %}
   </table>
   {% endfor %}
-  {%if not form.is_hidden %}
+{{wizard.management_form}}
+  {%if not wizard.form.is_hidden %}
   <table>
-    {{ form.as_table }}
+    {{ wizard.form.as_table }}
    </table>
   {%endif%}
   <p>{%if confirm_end_msg %}{{confirm_end_msg|safe}}{%else%}{% trans "Would you like to save them?" %}{%endif%}</p>
diff --git a/ishtar/templates/default_wizard.html b/ishtar/templates/ishtar/wizard/default_wizard.html
index a71565b6e..1996f4e46 100644
--- a/ishtar/templates/default_wizard.html
+++ b/ishtar/templates/ishtar/wizard/default_wizard.html
@@ -18,19 +18,21 @@
 </ul>
 <div class='form'>
 {% if reminder %}<div class='reminder'>{{ reminder }}</div>{%endif%}
-{% if form.forms %}
+{{ wizard.form.media }}
+{{ wizard.management_form }}
+{% if wizard.form.forms %}
+  {{ wizard.form.management_form }}
 <div class='top_button'><input type="submit" id="submit_form" value="{% trans "Validate" %}"/></div>
 <table class='formset'>
-  {%if form.non_form_errors%}<tr class='error'><th colspan='2'>{{form.non_form_errors}}</th></tr>{%endif%}
-  {{ form.management_form }}
-  {% for formsetform in form.forms %}
+  {%if wizard.form.non_form_errors%}<tr class='error'><th colspan='2'>{{wizard.form.non_form_errors}}</th></tr>{%endif%}
+  {% for formsetform in wizard.form.forms %}
   {% table_form formsetform %}
   {% endfor %}
   <tr class='modify'><td colspan="2"><button name="formset_modify" value="{{form_step}}">{% trans "Add/Modify" %}</button></td></tr></li>
 </table>
 {% else %}
 <table>
-{% table_form form %}
+{% table_form wizard.form %}
 </table>
 {% endif %}
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />