From f2928e399ed554fb4f3f2c501008e1b8b3c8a967 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@peacefrogs.net>
Date: Wed, 4 Dec 2013 23:55:07 +0100
Subject: Administrativ acts: generate document from the last step of
 creation/modification (refs #1523)

---
 ishtar_common/templates/ishtar/wizard/confirm_wizard.html | 7 ++++++-
 ishtar_common/templates/ishtar/wizard/wizard_done.html    | 5 +++++
 2 files changed, 11 insertions(+), 1 deletion(-)

(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 76877a716..f67eb5c1e 100644
--- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
@@ -28,9 +28,14 @@
     {{ 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>
   <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
   {{ previous_fields|safe }}
+  {% if extra_form %}
+  <table>
+  {{ extra_form }}
+  </table>
+  {% endif %}
+  <p>{%if confirm_end_msg %}{{confirm_end_msg|safe}}{%else%}{% trans "Would you like to save them?" %}{%endif%}</p>
   <input type="submit" value="{% trans "Validate" %}"/>
 </div>
 </form>
diff --git a/ishtar_common/templates/ishtar/wizard/wizard_done.html b/ishtar_common/templates/ishtar/wizard/wizard_done.html
index a7068bbab..7de3edfce 100644
--- a/ishtar_common/templates/ishtar/wizard/wizard_done.html
+++ b/ishtar_common/templates/ishtar/wizard/wizard_done.html
@@ -2,5 +2,10 @@
 {% load i18n %}
 {% block content %}
 <p>{%trans "Item successfully saved"%}</p>
+{% if redirect %}
+<script type='text/javascript' language='javascript'>
+window.location.href = "{{redirect}}";
+</script>
+{% endif %}
 </div>
 {% endblock %}
-- 
cgit v1.2.3