diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-12-14 23:52:13 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-12-14 23:52:13 +0100 |
| commit | ccb709bfa5d06737e70c171202ba85aa5410194c (patch) | |
| tree | e702a5e335c4366a1e27499a4db51e31b7f5c7b7 /ishtar_common/templates/ishtar | |
| parent | 9b3ede3e6d5d2b076975c188454a39c2b45d155d (diff) | |
| parent | 1a1040243a10366b01b9bc2c4d3140f2fbd321e4 (diff) | |
| download | Ishtar-ccb709bfa5d06737e70c171202ba85aa5410194c.tar.bz2 Ishtar-ccb709bfa5d06737e70c171202ba85aa5410194c.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'ishtar_common/templates/ishtar')
| -rw-r--r-- | ishtar_common/templates/ishtar/wizard/confirm_wizard.html | 7 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/wizard/wizard_done.html | 5 |
2 files changed, 11 insertions, 1 deletions
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 %} |