From 40370a61b04c0caed748477fe13d2d3a47423bb1 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 18 Jan 2018 17:43:27 +0100
Subject: UI: adapt default form

---
 ishtar_common/forms_common.py            |  1 +
 ishtar_common/templates/ishtar/form.html | 21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index dc18a2108..f98a97385 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -439,6 +439,7 @@ class PersonFormSelection(forms.Form):
 
 
 class PersonMergeFormSelection(ManualMerge, forms.Form):
+    SEARCH_AND_SELECT = True
     form_label = _("Person to merge")
     associated_models = {'to_merge': models.Person}
     currents = {'to_merge': models.Person}
diff --git a/ishtar_common/templates/ishtar/form.html b/ishtar_common/templates/ishtar/form.html
index 236818c66..246f719ed 100644
--- a/ishtar_common/templates/ishtar/form.html
+++ b/ishtar_common/templates/ishtar/form.html
@@ -8,10 +8,25 @@
     {% for error in form.non_field_errors %}
     <p>{{ error }}</p>
     {% endfor %}
-<table>
 {{form}}
-</table>
-<input id="submit_form" type="submit" value="{% if submit_label %}{{submit_label}}{% else%}{% trans "Validate" %}{% endif %}"/>
 </form>
 </div>
 {% endblock %}
+
+{% block footer %}
+<div id="footer">
+    {% if form.SEARCH_AND_SELECT %}
+    <p class="confirm-message">{% trans "Search and select an item in the table" %}</p>
+    {% endif %}
+    <div id='validation-bar' class="row text-center">
+        <div class="col-sm">
+            <button type="submit" id="submit_form" name='validate'
+                    value="validate" class="btn btn-success">
+               {% if submit_label %}{{submit_label}}{% else%}{% trans "Validate" %}{% endif %}
+            </button>
+        </div>
+    </div>
+    {% include 'ishtar/blocks/footer.html' %}
+</div>
+{% endblock %}
+
-- 
cgit v1.2.3