2 files changed, 45 insertions, 11 deletions
diff --git a/ishtar_common/templates/ishtar/qa_form.html b/ishtar_common/templates/ishtar/forms/qa_base.html
index fe373ed57..ee4c242b7 100644
--- a/ishtar_common/templates/ishtar/qa_form.html
+++ b/ishtar_common/templates/ishtar/forms/qa_base.html
@@ -1,6 +1,7 @@
 {% load i18n inline_formset table_form %}
 
-<div class="modal-dialog modal-lg modal-dialog-centered">
+<div
+        class="modal-dialog {% if modal_size == 'large' %}modal-lg {% elif modal_size == 'small'%}modal-sm {% endif%}modal-dialog-centered">
     <div class="modal-content">
         <div class="modal-header">
             <h2>{{page_name|safe}}</h2>
@@ -12,6 +13,8 @@
             id="qa-action">{% csrf_token %}
             <div class="modal-body body-scroll">
                 <div class='form'>
+                    {% block main_form %}
+
                     {% for error in form.non_field_errors %}
                     <p>{{ error }}</p>
                     {% endfor %}
@@ -40,9 +43,12 @@
                         {% endfor %}
                     </table>
                     {% endif %}
+
+                    {% endblock %}
                 </div>
             </div>
             <div class="modal-footer">
+                {% block footer %}
                 <button type="submit" id="submit_form" name='validate'
                         value="validate" class="btn btn-success">
                     {% if confirm %}
@@ -55,21 +61,16 @@
                         aria-label="Close" class="btn btn-secondary">
                     {% trans "Cancel" %}
                 </button>
+                {% endblock %}
             </div>
         </form>
     </div>
 </div>
 <script type="text/javascript">
-    $('#qa-action').on('submit', function(event){
-        event.preventDefault();
-        $('#modal-dynamic-form').modal("hide");
-        short_wait();
-        ajax_post(
-            "{{url}}", $(this).serialize(), "#modal-dynamic-form",
-            function(){
-                $('#modal-dynamic-form').modal("show");
-            }
-        );
+    {% block js %}
+    {% endblock %}
+    $(document).ready(function(){
+        qa_action_register("{{url}}");
     });
 </script>
 
diff --git a/ishtar_common/templates/ishtar/forms/qa_form.html b/ishtar_common/templates/ishtar/forms/qa_form.html
new file mode 100644
index 000000000..c843dbd2d
--- /dev/null
+++ b/ishtar_common/templates/ishtar/forms/qa_form.html
@@ -0,0 +1,33 @@
+{% extends "ishtar/forms/qa_base.html" %}
+{% load i18n inline_formset table_form %}
+
+{% block main_form %}
+    {% for error in form.non_field_errors %}
+    <p>{{ error }}</p>
+    {% endfor %}
+    {% bs_form form %}
+
+    {% if confirm %}
+    <input type="hidden" name="confirm" value="1"/>
+    <h4>{% trans "Modified items" %}</h4>
+    <ul>{% for item in items %}
+        <li>{{item}}</li>{% endfor %}
+    </ul>
+    <h4>{% trans "Modification" %}</h4>
+    <table>
+        {% for field in form %}
+        {% if field.value %}
+        <tr>
+            <th>{{field.label}}{% trans ":" %}&nbsp;</th>
+            <td>{% if field.field.rendered_value %}
+                {{ field.field.rendered_value }}
+                {% else %}
+                {{ field.value }}
+                {% endif %}
+            </td>
+        </tr>
+        {% endif %}
+        {% endfor %}
+    </table>
+    {% endif %}
+{% endblock %}