From df09e512f1b52cf785b039e5accef6dc4b63e1f3 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 11 Sep 2018 17:44:09 +0200
Subject: Generic QA form - QA find basket form

---
 ishtar_common/templates/ishtar/forms/qa_base.html | 77 +++++++++++++++++++++++
 ishtar_common/templates/ishtar/forms/qa_form.html | 33 ++++++++++
 ishtar_common/templates/ishtar/qa_form.html       | 76 ----------------------
 3 files changed, 110 insertions(+), 76 deletions(-)
 create mode 100644 ishtar_common/templates/ishtar/forms/qa_base.html
 create mode 100644 ishtar_common/templates/ishtar/forms/qa_form.html
 delete mode 100644 ishtar_common/templates/ishtar/qa_form.html

(limited to 'ishtar_common/templates')

diff --git a/ishtar_common/templates/ishtar/forms/qa_base.html b/ishtar_common/templates/ishtar/forms/qa_base.html
new file mode 100644
index 000000000..ee4c242b7
--- /dev/null
+++ b/ishtar_common/templates/ishtar/forms/qa_base.html
@@ -0,0 +1,77 @@
+{% load i18n inline_formset table_form %}
+
+<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>
+            <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="{{url}}" method="post"
+            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 %}
+                    {% 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 %}
+                </div>
+            </div>
+            <div class="modal-footer">
+                {% block footer %}
+                <button type="submit" id="submit_form" name='validate'
+                        value="validate" class="btn btn-success">
+                    {% if confirm %}
+                    {% trans "Confirm" %}
+                    {% else %}
+                    {% trans "Modify" %}
+                    {% endif %}
+                </button>
+                <button type="button" data-dismiss="modal"
+                        aria-label="Close" class="btn btn-secondary">
+                    {% trans "Cancel" %}
+                </button>
+                {% endblock %}
+            </div>
+        </form>
+    </div>
+</div>
+<script type="text/javascript">
+    {% 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 %}
diff --git a/ishtar_common/templates/ishtar/qa_form.html b/ishtar_common/templates/ishtar/qa_form.html
deleted file mode 100644
index fe373ed57..000000000
--- a/ishtar_common/templates/ishtar/qa_form.html
+++ /dev/null
@@ -1,76 +0,0 @@
-{% load i18n inline_formset table_form %}
-
-<div class="modal-dialog modal-lg modal-dialog-centered">
-    <div class="modal-content">
-        <div class="modal-header">
-            <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="{{url}}" method="post"
-            id="qa-action">{% csrf_token %}
-            <div class="modal-body body-scroll">
-                <div class='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 %}
-                </div>
-            </div>
-            <div class="modal-footer">
-                <button type="submit" id="submit_form" name='validate'
-                        value="validate" class="btn btn-success">
-                    {% if confirm %}
-                    {% trans "Confirm" %}
-                    {% else %}
-                    {% trans "Modify" %}
-                    {% endif %}
-                </button>
-                <button type="button" data-dismiss="modal"
-                        aria-label="Close" class="btn btn-secondary">
-                    {% trans "Cancel" %}
-                </button>
-            </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");
-            }
-        );
-    });
-</script>
-
-
-- 
cgit v1.2.3