diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-03 20:14:12 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-03 20:14:12 +0100 |
commit | 4509e950fbe35e6f529c4469dfc7802686fce28e (patch) | |
tree | 97e275e850bf649636c1e0943c0dd32eea10e4d7 /ishtar_common/templates/ishtar/wizard | |
parent | f5992cdf829ce54504cee41da196077e28f6569b (diff) | |
download | Ishtar-4509e950fbe35e6f529c4469dfc7802686fce28e.tar.bz2 Ishtar-4509e950fbe35e6f529c4469dfc7802686fce28e.zip |
Readjust search fields with flex
Diffstat (limited to 'ishtar_common/templates/ishtar/wizard')
-rw-r--r-- | ishtar_common/templates/ishtar/wizard/default_wizard.html | 4 | ||||
-rw-r--r-- | ishtar_common/templates/ishtar/wizard/search.html | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html index a39037d10..1a17cf32b 100644 --- a/ishtar_common/templates/ishtar/wizard/default_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html @@ -35,9 +35,9 @@ <tr class='modify'><td colspan="2"><button name="formset_modify" value="{{wizard.steps.current}}">{% trans "Add/Modify" %}</button></td></tr></li> </table> {% else %} -<table> +{% if not is_search %}<table>{% endif %} {% table_form wizard.form %} -</table> +{% if not is_search %}</table>{% endif %} {% endif %} <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} diff --git a/ishtar_common/templates/ishtar/wizard/search.html b/ishtar_common/templates/ishtar/wizard/search.html index 5cf96552b..e5066cf87 100644 --- a/ishtar_common/templates/ishtar/wizard/search.html +++ b/ishtar_common/templates/ishtar/wizard/search.html @@ -8,8 +8,8 @@ <ul id='form_path'> <li class='current'><a href='#'>{{current_step.form_label}}</a></li> </ul> -<div class='form'> {% if wizard.form.forms %} +<div class='form'> <div class='top_button'><input type="submit" id="submit_form" value="{% trans "Validate" %}"/></div> <table class='formset'> {%if wizard.form.non_form_errors%}<tr class='error'><th colspan='2'>{{wizard.form.non_form_errors}}</th></tr>{%endif%} @@ -20,9 +20,8 @@ <tr class='modify'><td colspan="2"><button name="formset_modify" value="{{wizard.steps.current}}">{% trans "Add/Modify" %}</button></td></tr></li> </table> {% else %} -<table> - {{ wizard.form.as_table }} -</table> -{% endif %} +<div class='form'> + {{ wizard.form.as_p }} </div> +{% endif %} {% endblock %} |