From 28f4932925be7e1d01eb1a68b1046d110cc95232 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Mon, 28 Oct 2013 14:43:04 +0100
Subject: Fix wizard navigation (missing <form>) (refs #1463)

---
 ishtar_common/templates/ishtar/wizard/confirm_wizard.html | 2 ++
 ishtar_common/templates/ishtar/wizard/default_wizard.html | 5 +++--
 ishtar_common/templates/ishtar/wizard/parcels_wizard.html | 1 +
 ishtar_common/templates/ishtar/wizard/towns_wizard.html   | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'ishtar_common')

diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
index 5d1b1c042..76877a716 100644
--- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
@@ -10,6 +10,8 @@
 {% endfor %}
   <li class='current'>&raquo;&nbsp;<a href='#'>{{current_step.form_label}}</a></li>
 </ul>
+</form>
+<form action="." method="post">{% csrf_token %}
 <div class='form'>
   <p>{%if confirm_msg %}{{confirm_msg|safe}}{%else%}{% trans "You have entered the following informations:" %}{%endif%}</p>
   {% for form_label, form_data in datas %}
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index 6b4bce709..b2c7189cf 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -6,7 +6,7 @@
 {% block content %}
 {% block wizard_head %}
 <h2>{{wizard_label}}</h2>
-<form action="." method="post" name='wizard'{% if wizard.form.file_upload %} enctype="multipart/form-data"{% endif %}>{% csrf_token %}
+<form action="." method="post">{% csrf_token %}
 <ul id='form_path'>
 {% for step in previous_steps %}
   <li>&raquo;&nbsp;<button class='change_step' name="form_prev_step" value="{{forloop.counter0}}">{{step.form_label}}</button></li>
@@ -16,8 +16,10 @@
   <li>&raquo;&nbsp;<button class='change_step' name="form_prev_step" value="{{forloop.counter|add:previous_step_counter}}">{{step.form_label}}</button></li>
 {% endfor %}
 </ul>
+</form>
 {% endblock %}
 {% block wizard_form %}
+<form action="." method="post" name='wizard'{% if wizard.form.file_upload %} enctype="multipart/form-data"{% endif %}>{% csrf_token %}
 <div class='form'>
 {% if reminder %}<div class='reminder'>{{ reminder }}</div>{%endif%}
 {{ wizard.form.media }}
@@ -55,7 +57,6 @@ $(document).ready(function(){
         }
         return false;
     });
-
 });
 </script>
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
index 1d54cf1d3..5d135a563 100644
--- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
@@ -4,6 +4,7 @@
 {{wizard.form.media}}
 {% endblock %}
 {% block wizard_form %}
+<form action="." method="post">{% csrf_token %}
 <div class='form'>
 {% if reminder %}<div class='reminder'>{{ reminder }}</div>{%endif%}
 {{ wizard.form.media }}
diff --git a/ishtar_common/templates/ishtar/wizard/towns_wizard.html b/ishtar_common/templates/ishtar/wizard/towns_wizard.html
index cc3487df3..8e0b3551f 100644
--- a/ishtar_common/templates/ishtar/wizard/towns_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/towns_wizard.html
@@ -5,6 +5,7 @@
 {{wizard.form.media}}
 {% endblock %}
 {% block wizard_form %}
+<form action="." method="post">{% csrf_token %}
 <div class='form'>
 {% if TOWNS %}
 {% if wizard.form.forms %}
-- 
cgit v1.2.3