1 files changed, 25 insertions, 8 deletions
diff --git a/ishtar_common/templates/ishtar/form.html b/ishtar_common/templates/ishtar/form.html
index 236818c66..b99d504a0 100644
--- a/ishtar_common/templates/ishtar/form.html
+++ b/ishtar_common/templates/ishtar/form.html
@@ -1,17 +1,34 @@
 {% extends "base.html" %}
-{% load i18n inline_formset %}
+{% load i18n inline_formset table_form %}
+{% block pre_container %}
+<form enctype="multipart/form-data" action="." method="post"{% if confirm %}
+      onsubmit='return confirm("{{confirm}}");'{% endif %}>{% csrf_token %}
+{% endblock %}
 {% block content %}
 <h2>{{page_name}}</h2>
 <div class='form'>
-<form enctype="multipart/form-data" action="." method="post"{% if confirm %}
-    onsubmit='return confirm("{{confirm}}");'{% endif %}>{% csrf_token %}
     {% 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>
+    {% bs_form 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>
+</form>
+{% endblock %}
+