✨ exhibition: forms/sheets

4 files changed, 15 insertions, 12 deletions

diff --git a/ishtar_common/templates/ishtar/forms/qa_form.html b/ishtar_common/templates/ishtar/forms/qa_form.html
index c843dbd2d..178910215 100644
--- a/ishtar_common/templates/ishtar/forms/qa_form.html
+++ b/ishtar_common/templates/ishtar/forms/qa_form.html
@@ -2,6 +2,15 @@
 {% load i18n inline_formset table_form %}
 
 {% block main_form %}
+    {% for message in messages %}
+    <div class="alert alert-{{message.type}} alert-dismissible fade show" role="alert">
+        {% if message.icon %}<i class="{{message.icon}}" aria-hidden="true"></i>&nbsp;&nbsp;{% endif %}
+        {{message.message}}
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">×</span>
+        </button>
+    </div>
+    {% endfor %}
     {% for error in form.non_field_errors %}
     <p>{{ error }}</p>
     {% endfor %}
diff --git a/ishtar_common/templates/ishtar/manage_basket.html b/ishtar_common/templates/ishtar/manage_basket.html
index 5f3bf2c8f..61def50f6 100644
--- a/ishtar_common/templates/ishtar/manage_basket.html
+++ b/ishtar_common/templates/ishtar/manage_basket.html
@@ -69,9 +69,9 @@ jQuery(document).ready(function(){
     <div id='validation-bar' class="row text-center">
         <div class="col-sm">
             <a class="btn btn-success"
-               href="{% url 'display-findbasket' basket.id %}"
+               href="{% if back_url %}{{back_url}}{% else %}{% url 'display-findbasket' basket.id %}{% endif %}"
                id="validate-button"
-               class='button'>{% trans "Close" %}</a>
+               class='button'>{% trans "Back" %}</a>
         </div>
     </div>
     {% include 'ishtar/blocks/footer.html' %}
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index 0d3863af9..b9364d012 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -6,16 +6,8 @@
 {% block content %}
 {% block wizard_head %}
 <h3>{{wizard_label}}</h3>
-{% if no_context_cr %}
-<div class="row mb-3">
-  <div class="col">
-    <a href="/find_create/{{no_context_cr|unlocalize}}/" class="btn btn-success">
-      <i class="fa fa-plus" aria-hidden="true"></i> {% trans "find without context" %}
-    </a>
-  </div>
-</div>
-{% endif %}
-
+{% block wizard_top_button  %}
+{% endblock %}
 {% include "ishtar/blocks/wizard_breadcrumb.html" %}
 
 {% endblock %}
diff --git a/ishtar_common/templates/ishtar/wizard/search.html b/ishtar_common/templates/ishtar/wizard/search.html
index 9047c47fc..19a6540dd 100644
--- a/ishtar_common/templates/ishtar/wizard/search.html
+++ b/ishtar_common/templates/ishtar/wizard/search.html
@@ -5,6 +5,8 @@
 {% endblock %}
 {% block content %}
 <h3>{{wizard_label}}</h3>
+{% block wizard_top_button  %}
+{% endblock %}
 {% if default_search_vector or open_url %}
 <script type="text/javascript">{% localize off %}
     {% if default_search_vector %}