summaryrefslogtreecommitdiff
path: root/ishtar/templates
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2010-12-29 12:54:34 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2010-12-29 12:57:37 +0100
commit8c6aeb1609df5a56b68f2c57da6028e95f88e0ae (patch)
treee18f26c62e0e59ac925d4524e5be4e64da5eecf6 /ishtar/templates
parentf1eca7a1eef6a2ff8bb87c4626001c231eb4c8fd (diff)
downloadIshtar-8c6aeb1609df5a56b68f2c57da6028e95f88e0ae.tar.bz2
Ishtar-8c6aeb1609df5a56b68f2c57da6028e95f88e0ae.zip
Remind of the current step in the wizard (closes #51)
Diffstat (limited to 'ishtar/templates')
-rw-r--r--ishtar/templates/base.html2
-rw-r--r--ishtar/templates/file_wizard.html4
2 files changed, 3 insertions, 3 deletions
diff --git a/ishtar/templates/base.html b/ishtar/templates/base.html
index 97d3fda7e..12954a70d 100644
--- a/ishtar/templates/base.html
+++ b/ishtar/templates/base.html
@@ -36,7 +36,7 @@
{% if section.available %}<li>{{section.label}}
<ul>
{% for menu_item in section.childs %}{%if menu_item.available%}
- <li{%ifequal menu_item.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url action menu_item.idx 1%}'>{{menu_item.label}}</a></li>
+ <li{%ifequal menu_item.idx CURRENT_ACTION%} class='selected'{%endifequal%}><a href='{% url action menu_item.idx%}'>{{menu_item.label}}</a></li>
{%endif%}{% endfor %}
</ul>
</li>{%endif%}
diff --git a/ishtar/templates/file_wizard.html b/ishtar/templates/file_wizard.html
index 4ac4644e6..99719920c 100644
--- a/ishtar/templates/file_wizard.html
+++ b/ishtar/templates/file_wizard.html
@@ -4,9 +4,9 @@
{% block content %}
<ul id='form_path'>
{% for step in extra_context.previous_steps %}
- <li>&raquo; <a href='{%url action CURRENT_ACTION step.slug%}'>Step {{step.slug}}</a></li>
+ <li>&raquo; <a href='{%url action_form CURRENT_ACTION step.slug%}'>{{step.label}}</a></li>
{% endfor %}
- <li class='current'>&raquo; <a href='{%url action CURRENT_ACTION current_step.slug%}'>Step {{current_step.slug}}</a></li>
+ <li class='current'>&raquo; <a href='{%url action_form CURRENT_ACTION extra_context.current_step.slug%}'>{{extra_context.current_step.label}}</a></li>
</ul>
<form action="." method="post">{% csrf_token %}
<table>