Fix display of QA form. Improve layout of criteria search.

1 files changed, 7 insertions, 2 deletions

diff --git a/ishtar_common/templates/ishtar/qa_form.html b/ishtar_common/templates/ishtar/qa_form.html
index 95f8887a8..2df3775ea 100644
--- a/ishtar_common/templates/ishtar/qa_form.html
+++ b/ishtar_common/templates/ishtar/qa_form.html
@@ -3,16 +3,21 @@
 <div class="modal-dialog modal-lg modal-dialog-centered">
     <div class="modal-content" id='progress-content'>
         <div class="modal-header">
-            <h2>{{page_name}}</h2>
+            <h2>{{page_name|safe}}</h2>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+            </button>
         </div>
         <form enctype="multipart/form-data" action="." method="post">{% csrf_token %}
-            <div class="modal-body">
+            <div class="modal-body body-scroll">
                 <div class='form'>
                     {% for error in form.non_field_errors %}
                     <p>{{ error }}</p>
                     {% endfor %}
                     {% bs_form form %}
                 </div>
+            </div>
+            <div class="modal-footer">
                 <button type="submit" id="submit_form" name='validate'
                         value="validate" class="btn btn-success">
                     {% trans "Modify" %}