From ab4bf57445401fb19b813162524fd926091211d7 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 6 Feb 2017 19:58:59 +0100
Subject: Fix UI bug: validation button at the bottom of the page (refs #3441)

---
 .../templates/ishtar/wizard/wizard_instruction.html       | 11 ++++++++---
 .../templates/ishtar/wizard/wizard_person_orga.html       | 11 ++++++++---
 .../templates/ishtar/wizard/wizard_planningservice.html   | 11 ++++++++---
 .../ishtar/wizard/wizard_preventiveplanning.html          | 11 ++++++++---
 ishtar_common/static/media/style.css                      |  8 ++++++++
 ishtar_common/templates/ishtar/wizard/confirm_wizard.html | 15 +++++++++++----
 ishtar_common/templates/ishtar/wizard/default_wizard.html | 10 +++++-----
 ishtar_common/templates/ishtar/wizard/parcels_wizard.html | 11 ++++++++---
 .../templates/ishtar/wizard/relations_wizard.html         | 11 ++++++++---
 9 files changed, 72 insertions(+), 27 deletions(-)

diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html
index f579a9d47..72dc1d35d 100644
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html
+++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_instruction.html
@@ -58,9 +58,14 @@
 
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
-{% block "validation_bar" %}
-{% include 'ishtar/wizard/validation_bar.html' %}
-{% endblock %}
+  {% block "footer" %}
+  <div id="footer">
+    {% block "validation_bar" %}
+    {% include 'ishtar/wizard/validation_bar.html' %}
+    {% endblock %}
+    {% include 'ishtar/blocks/footer.html' %}
+  </div>
+  {% endblock %}
 </div>
 </form>
 <script type='text/javascript'>
diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html
index d520c1ec8..36f1aa4f8 100644
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html
+++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_person_orga.html
@@ -62,9 +62,14 @@ $(function() {
 
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
-{% block "validation_bar" %}
-{% include 'ishtar/wizard/validation_bar.html' %}
-{% endblock %}
+  {% block "footer" %}
+  <div id="footer">
+    {% block "validation_bar" %}
+    {% include 'ishtar/wizard/validation_bar.html' %}
+    {% endblock %}
+    {% include 'ishtar/blocks/footer.html' %}
+  </div>
+  {% endblock %}
 </div>
 </form>
 {% endblock %}
diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html
index bfa490680..5eb7c014b 100644
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html
+++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_planningservice.html
@@ -37,9 +37,14 @@
 
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
-{% block "validation_bar" %}
-{% include 'ishtar/wizard/validation_bar.html' %}
-{% endblock %}
+  {% block "footer" %}
+  <div id="footer">
+    {% block "validation_bar" %}
+    {% include 'ishtar/wizard/validation_bar.html' %}
+    {% endblock %}
+    {% include 'ishtar/blocks/footer.html' %}
+  </div>
+  {% endblock %}
 </div>
 </form>
 {% endblock %}
diff --git a/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html b/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html
index 304b58b76..95e8e8841 100644
--- a/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html
+++ b/archaeological_files_pdl/templates/ishtar/wizard/wizard_preventiveplanning.html
@@ -103,9 +103,14 @@
 
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
-{% block "validation_bar" %}
-{% include 'ishtar/wizard/validation_bar.html' %}
-{% endblock %}
+  {% block "footer" %}
+  <div id="footer">
+    {% block "validation_bar" %}
+    {% include 'ishtar/wizard/validation_bar.html' %}
+    {% endblock %}
+    {% include 'ishtar/blocks/footer.html' %}
+  </div>
+  {% endblock %}
 </div>
 </form>
 {% endblock %}
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 5ff9e9895..06c80c194 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -382,6 +382,14 @@ div#header{
     background-repeat:no-repeat;
 }
 
+.confirm-message{
+    background-color: rgb(170, 170, 170);
+    margin: 0px;
+    color: rgb(255, 255, 255);
+    padding: 2px;
+    font-weight: bold;
+}
+
 div#validation-bar p{
     margin:0;
 }
diff --git a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
index 1fbaadcd1..565256552 100644
--- a/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/confirm_wizard.html
@@ -37,10 +37,17 @@
   </table>
   {% endif %}
   {% block "extra_informations" %}{% endblock %}
-<div id='validation-bar' class='big'>
-  <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>
+
+  {% block "footer" %}
+  <div id="footer">
+    {% block "validation_bar" %}
+    <p class="confirm-message">{%if confirm_end_msg %}{{confirm_end_msg|safe}}{%else%}{% trans "Would you like to save them?" %}{%endif%}</p>
+    {% include 'ishtar/wizard/validation_bar.html' %}
+    {% endblock %}
+    {% include 'ishtar/blocks/footer.html' %}
+  </div>
+  {% endblock %}
+
 </div>
 </form>
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index e77484e61..204feeebe 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -46,12 +46,12 @@
 {{ previous_fields|safe }}
 {% block "footer" %}
   <div id="footer">
-{% block "validation_bar" %}
-{% include 'ishtar/wizard/validation_bar.html' %}
-{% endblock %}
-{% include 'ishtar/blocks/footer.html' %}
-{% endblock %}
+  {% block "validation_bar" %}
+  {% include 'ishtar/wizard/validation_bar.html' %}
+  {% endblock %}
+  {% include 'ishtar/blocks/footer.html' %}
   </div>
+{% endblock %}
 </div>
 </form>
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
index e417b5e4d..28ec962f4 100644
--- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html
@@ -24,9 +24,14 @@
 <p><button name="formset_modify" value="{{wizard.steps.current}}">{% trans "Add/Modify" %}</button></p>
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
-{% block "validation_bar" %}
-{% include 'ishtar/wizard/validation_bar.html' %}
-{% endblock %}
+  {% block "footer" %}
+  <div id="footer">
+    {% block "validation_bar" %}
+    {% include 'ishtar/wizard/validation_bar.html' %}
+    {% endblock %}
+    {% include 'ishtar/blocks/footer.html' %}
+  </div>
+  {% endblock %}
 </div>
 </form>
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/relations_wizard.html b/ishtar_common/templates/ishtar/wizard/relations_wizard.html
index 9ca592ca8..3f12bcd60 100644
--- a/ishtar_common/templates/ishtar/wizard/relations_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/relations_wizard.html
@@ -23,9 +23,14 @@
 <p><button name="formset_modify" value="{{wizard.steps.current}}">{% trans "Add/Modify" %}</button></p>
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
 {{ previous_fields|safe }}
-{% block "validation_bar" %}
-{% include 'ishtar/wizard/validation_bar.html' %}
-{% endblock %}
+  {% block "footer" %}
+  <div id="footer">
+    {% block "validation_bar" %}
+    {% include 'ishtar/wizard/validation_bar.html' %}
+    {% endblock %}
+    {% include 'ishtar/blocks/footer.html' %}
+  </div>
+  {% endblock %}
 </div>
 </form>
 {% endblock %}
-- 
cgit v1.2.3