From 76709af37905fde01e342c626f336034b44e2b67 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 18 Jun 2019 13:18:48 +0200
Subject: UI: put forms into container inside wizards

---
 ishtar_common/templates/ishtar/form.html                    | 2 +-
 ishtar_common/templates/ishtar/form_delete.html             | 2 +-
 ishtar_common/templates/ishtar/forms/document.html          | 2 +-
 ishtar_common/templates/ishtar/formset.html                 | 2 +-
 ishtar_common/templates/ishtar/merge.html                   | 2 +-
 ishtar_common/templates/ishtar/simple_form.html             | 2 +-
 ishtar_common/templates/ishtar/wizard/confirm_wizard.html   | 2 +-
 ishtar_common/templates/ishtar/wizard/default_wizard.html   | 2 +-
 ishtar_common/templates/ishtar/wizard/parcels_wizard.html   | 2 +-
 ishtar_common/templates/ishtar/wizard/relations_wizard.html | 7 +++++--
 10 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'ishtar_common/templates')

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 %}'>&Larr;</a><a href='{% url current_url previous_page %}'>&larr;</a>{% else %}&nbsp;{% 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" %}
-- 
cgit v1.2.3