diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-18 13:18:48 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-06-18 13:18:48 +0200 |
| commit | be373cc41b42e571b5c6fba5ed208c3fddf57f00 (patch) | |
| tree | d350bed33815bbaf9e630a24f53764d9c93d697c | |
| parent | b0254d998afe249471fe88f15dfc35dce46a2c5e (diff) | |
| download | Ishtar-be373cc41b42e571b5c6fba5ed208c3fddf57f00.tar.bz2 Ishtar-be373cc41b42e571b5c6fba5ed208c3fddf57f00.zip | |
UI: put forms into container inside wizards
11 files changed, 15 insertions, 11 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index eb653de12..d35d2f5e6 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -444,6 +444,7 @@ class MergeIntoForm(forms.Form): class OrgaMergeFormSelection(ManualMerge, forms.Form): + SEARCH_AND_SELECT = True form_label = _(u"Organization to merge") associated_models = {'to_merge': models.Organization} currents = {'to_merge': models.Organization} diff --git a/ishtar_common/templates/ishtar/form.html b/ishtar_common/templates/ishtar/form.html index 4303aba58..03bd0d207 100644 --- a/ishtar_common/templates/ishtar/form.html +++ b/ishtar_common/templates/ishtar/form.html @@ -11,7 +11,7 @@ {% endblock %} {% block content %} <h2>{{page_name}}</h2> -<div class='form'> +<div class='form{% if not form.SEARCH_AND_SELECT %} container{% endif %}'> {% for error in form.non_field_errors %} <p>{{ error }}</p> {% endfor %} diff --git a/ishtar_common/templates/ishtar/form_delete.html b/ishtar_common/templates/ishtar/form_delete.html index 6243e9423..d91b47c54 100644 --- a/ishtar_common/templates/ishtar/form_delete.html +++ b/ishtar_common/templates/ishtar/form_delete.html @@ -2,7 +2,7 @@ {% load i18n inline_formset %} {% block content %} <h2>{{page_name}}</h2> -<div class='form'> +<div class='form{% if not form.SEARCH_AND_SELECT %} container{% endif %}'> <form enctype="multipart/form-data" action="." method="post" onsubmit="return confirm('Do you really want to delete this item?');">{% csrf_token %} <table> diff --git a/ishtar_common/templates/ishtar/forms/document.html b/ishtar_common/templates/ishtar/forms/document.html index 38bb3cacf..b3a9a8e15 100644 --- a/ishtar_common/templates/ishtar/forms/document.html +++ b/ishtar_common/templates/ishtar/forms/document.html @@ -10,7 +10,7 @@ {% endblock %} {% block content %} <h2>{{page_name}}</h2> -<div class='form'> +<div class='form{% if not form.SEARCH_AND_SELECT %} container{% endif %}'> {% for error in form.non_field_errors %} <p>{{ error }}</p> {% endfor %} diff --git a/ishtar_common/templates/ishtar/formset.html b/ishtar_common/templates/ishtar/formset.html index 5454ae7e5..11728e717 100644 --- a/ishtar_common/templates/ishtar/formset.html +++ b/ishtar_common/templates/ishtar/formset.html @@ -2,7 +2,7 @@ {% load i18n inline_formset %} {% block content %} <h2>{{page_name}}</h2> -<div class='form' id='global-vars'> +<div class='form container' id='global-vars'> <form action="." method="post">{% csrf_token %} {% inline_formset ' ' formset %} <input type="submit" value="{% trans 'Validate' %}"/> diff --git a/ishtar_common/templates/ishtar/merge.html b/ishtar_common/templates/ishtar/merge.html index de46e95c6..a0bd0dcfd 100644 --- a/ishtar_common/templates/ishtar/merge.html +++ b/ishtar_common/templates/ishtar/merge.html @@ -2,7 +2,7 @@ {% load i18n inline_formset %} {% block content %} <h2>{% trans "Merge" %}</h2> -<div class='form'> +<div class='form container'> <p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> <label>{%trans "Every operation on this form is irreversible"%}</label></p> <p>{% if previous_page %}<a href='{% url current_url 1 %}'>↞</a><a href='{% url current_url previous_page %}'>←</a>{% else %} {% endif %} {% trans "Page " %}{{current_page}}/{{max_page}} diff --git a/ishtar_common/templates/ishtar/simple_form.html b/ishtar_common/templates/ishtar/simple_form.html index e3a464459..f981a174b 100644 --- a/ishtar_common/templates/ishtar/simple_form.html +++ b/ishtar_common/templates/ishtar/simple_form.html @@ -1,7 +1,7 @@ {% load i18n %} <html> <body> -<div class='form'> +<div class='form{% if not form.SEARCH_AND_SELECT %} container{% endif %}'> <form enctype="multipart/form-data" action="." method="post">{% csrf_token %} {{form}} <input type="submit" value="{% trans "Validate" %}"/> diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html index 9829058a8..e78a2f4a6 100644 --- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html @@ -7,7 +7,7 @@ {% include "ishtar/blocks/wizard_breadcrumb.html" %} <form action="." method="post">{% csrf_token %} -<div class='form'> +<div class='form container'> {% block "warning_informations" %}{% endblock %} {% block "warning_message" %} <div class="alert alert-info"> diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html index 8d6b1c48e..732a0a64f 100644 --- a/ishtar_common/templates/ishtar/wizard/default_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html @@ -12,7 +12,7 @@ {% endblock %} {% block wizard_form %} <form action="." class='wizard-form' id="wizard-form" method="post" name='wizard'{% if wizard.form.file_upload %} enctype="multipart/form-data"{% endif %}>{% csrf_token %} -<div class='form'> +<div class='form{% if not form.SEARCH_AND_SELECT %} container{% endif %}'> {{ wizard.form.media }} {{ wizard.management_form }} {% block form_head %}{% endblock %} diff --git a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html index 6a553d3c1..2028d8792 100644 --- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html @@ -5,7 +5,7 @@ {% endblock %} {% block wizard_form %} <form action="." method="post">{% csrf_token %} -<div class='form'> +<div class='form container'> {{ wizard.form.media }} {{ wizard.management_form }} {{ wizard.form.management_form }} diff --git a/ishtar_common/templates/ishtar/wizard/relations_wizard.html b/ishtar_common/templates/ishtar/wizard/relations_wizard.html index 3f12bcd60..c22b58f3d 100644 --- a/ishtar_common/templates/ishtar/wizard/relations_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/relations_wizard.html @@ -5,7 +5,7 @@ {% endblock %} {% block wizard_form %} <form action="." method="post">{% csrf_token %} -<div class='form'> +<div class='form container'> {{ wizard.form.media }} {{ wizard.management_form }} {{ wizard.form.management_form }} @@ -20,7 +20,10 @@ <tr><td>({% trans "all"%} <input type='checkbox' name='check-all' class='check-all'/>)</td></tr> {% inline_formset 'Parcels' wizard.form.forms False %} </table> -<p><button name="formset_modify" value="{{wizard.steps.current}}">{% trans "Add/Modify" %}</button></p> +<p> + <button name="formset_modify" value="{{wizard.steps.current}}" class="btn btn-success wait-button"> + {% trans "Add/Modify" %}</button> +</p> <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" /> {{ previous_fields|safe }} {% block "footer" %} |