4 files changed, 63 insertions, 4 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 3bfe95141..4854c43d0 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -193,6 +193,14 @@
         {% include 'ishtar/blocks/footer.html' %}
     </div>
     {% endblock %}
+    <div class="modal" id="modal-dynamic-form" tabindex="-1" role="dialog"
+         data-backdrop="static" data-keyboard="true" aria-hidden="true">
+    </div>
+    {% for extra_form in extra_form_modals %}
+    <div class="modal" id="modal-dynamic-form-{{extra_form}}" tabindex="-1" role="dialog"
+         data-backdrop="static" data-keyboard="true" aria-hidden="true">
+    </div>
+    {% endfor %}
     <div class="modal modal-progress" tabindex="-1" role="dialog"
          data-backdrop="static" data-keyboard="false" aria-hidden="true">
       <div class="modal-dialog modal-sm modal-dialog-centered">
@@ -219,9 +227,6 @@
         </div>
       </div>
     </div>
-    <div class="modal" id="modal-dynamic-form" tabindex="-1" role="dialog"
-         data-backdrop="static" data-keyboard="true" aria-hidden="true">
-    </div>
     <div id='message'>
         <div class='information'><i class="fa fa-info-circle" aria-hidden="true"></i> <span class='content'></span></div>
     </div>
diff --git a/ishtar_common/templates/blocks/bs_compact_form_snippet.html b/ishtar_common/templates/blocks/bs_compact_form_snippet.html
new file mode 100644
index 000000000..6857c0343
--- /dev/null
+++ b/ishtar_common/templates/blocks/bs_compact_form_snippet.html
@@ -0,0 +1,21 @@
+{% load i18n from_dict %}
+{% if form.non_field_errors %}
+<div class="alert alert-danger" role="alert">
+    {{form.non_field_errors}}
+</div>
+{% endif %}
+
+{% for hidden in form.hidden_fields %}
+{{hidden}}
+{% if hidden.errors %}<div class="invalid-feedback">
+    {{ hidden.errors }}
+</div>{% endif %}
+{% endfor %}
+
+{% csrf_token %}
+<div class="form-row">
+{% for field in form.visible_fields %}
+  {% include "blocks/bs_field_snippet.html" %}
+{% endfor %}
+</div>
+
diff --git a/ishtar_common/templates/ishtar/forms/qa_base.html b/ishtar_common/templates/ishtar/forms/qa_base.html
index 367acfcd8..57e2d3979 100644
--- a/ishtar_common/templates/ishtar/forms/qa_base.html
+++ b/ishtar_common/templates/ishtar/forms/qa_base.html
@@ -9,7 +9,7 @@
             </button>
         </div>
         <form enctype="multipart/form-data" action="{{url}}" method="post"
-            id="qa-action">{% csrf_token %}
+            id="qa-{% if slug %}new-{{slug}}{% else %}action{% endif %}">{% csrf_token %}
             <div class="modal-body body-scroll">
                 <div class='form'>
                     {% block main_form %}
@@ -69,7 +69,13 @@
     {% block js %}
     {% endblock %}
     $(document).ready(function(){
+        {% if slug %}
+        qa_action_register("{{url}}", "{{slug}}");
+        {% else %}}
         qa_action_register("{{url}}");
+        {% endif %}
+    {% block js_ready %}
+    {% endblock %}
     });
 </script>
 
diff --git a/ishtar_common/templates/ishtar/forms/qa_new_item.html b/ishtar_common/templates/ishtar/forms/qa_new_item.html
new file mode 100644
index 000000000..78162d759
--- /dev/null
+++ b/ishtar_common/templates/ishtar/forms/qa_new_item.html
@@ -0,0 +1,27 @@
+{% extends "ishtar/forms/qa_base.html" %}
+{% load i18n inline_formset table_form %}
+
+{% block main_form %}
+{% if new_item_label %}
+<p>{{new_item_label}} {% trans "created." %}</p>
+{% else %}
+    {% bs_compact_form form %}
+{% endif %}
+{% endblock %}
+
+{% block footer %}
+{% if new_item_label %}
+<button type="button" data-dismiss="modal"
+        aria-label="Close" class="btn btn-secondary">
+    {% trans "Close" %}
+</button>
+{% else %}
+    {{ block.super }}
+{% endif %}
+{% endblock %}
+
+{% block js_ready %}
+{% if new_item_label %}
+save_and_close_window{% if many %}_many{% endif %}_data(null, "{{parent_name}}", "{{parent_pk}}", "{{new_item_label|safe}}", "{{new_item_pk}}");
+{% endif %}
+{% endblock %}
+\ No newline at end of file