Change merlin-session-wizard to django-formwizard

2 files changed, 29 insertions, 6 deletions

diff --git a/ishtar/templates/file_done.html b/ishtar/templates/file_done.html
new file mode 100644
index 000000000..6bbeb53d4
--- /dev/null
+++ b/ishtar/templates/file_done.html
@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block content %}
+<ul id='form_path'>
+{% for step in previous_steps %}
+  <li>&raquo; <a href='?form_prev_step={{forloop.counter0}}'>{{step.form_label}}</a></li>
+{% endfor %}
+  <li class='current'>&raquo; <a href='#'>{{current_step.form_label}}</a></li>
+</ul>
+<div class='form'>
+<pre>
+{{ form_list|pprint }}
+</pre>
+</form>
+</div>
+{% endblock %}
diff --git a/ishtar/templates/file_wizard.html b/ishtar/templates/file_wizard.html
index 4bb6a59c8..9ebf4adb3 100644
--- a/ishtar/templates/file_wizard.html
+++ b/ishtar/templates/file_wizard.html
@@ -2,20 +2,27 @@
 {% load i18n %}
 {% load range %}
 {% block content %}
+<form action="." method="post">{% csrf_token %}
 <ul id='form_path'>
-{% for step in extra_context.previous_steps %}
-  <li>&raquo; <a href='{%url action-form CURRENT_ACTION step.slug%}'>{{step.label}}</a></li>
+{% for step in previous_steps %}
+  <li>&raquo; <button name="form_prev_step" value="{{forloop.counter0}}">{{step.form_label}}</button></li>
 {% endfor %}
-  <li class='current'>&raquo; <a href='{%url action-form CURRENT_ACTION extra_context.current_step.slug%}'>{{extra_context.current_step.label}}</a></li>
+  <li class='current'>&raquo; <a href='#'>{{current_step.form_label}}</a></li>
 </ul>
 <div class='form'>
-<form action="." method="post">{% csrf_token %}
 <table>
-{{ form }}
+{% if form.forms %}
+  {{ form.management_form }}
+  {% for formsetform in form.forms %}
+    {{ formsetform.as_table }}
+  {% endfor %}
+{% else %}
+  {{ form.as_table }}
+{% endif %}
 </table>
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
 <input type="submit" value="{% trans "Validate" %}"/>
-</form>
 </div>
+</form>
 {% endblock %}