2 files changed, 7 insertions, 2 deletions
diff --git a/ishtar_common/templates/ishtar/forms/qa_base.html b/ishtar_common/templates/ishtar/forms/qa_base.html
index f6e43ad15..822f39c58 100644
--- a/ishtar_common/templates/ishtar/forms/qa_base.html
+++ b/ishtar_common/templates/ishtar/forms/qa_base.html
@@ -3,7 +3,7 @@
 <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>
+            <h2>{% if icon %}<i class="{{icon}}"></i>&nbsp;&nbsp;{% endif %}{{page_name|safe}}</h2>
             <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                 <span aria-hidden="true">&times;</span>
             </button>
@@ -48,6 +48,7 @@
             </div>
             <div class="modal-footer">
                 {% block footer %}
+                {% if not unavailable %}
                 <button type="submit" id="submit_form" name='validate'
                         value="validate" class="btn btn-success">
                     {% if action_name %}
@@ -56,9 +57,11 @@
                     {% trans "Modify" %}
                     {% endif %}
                 </button>
+                {% endif %}
                 <button type="button" data-dismiss="modal"
                         aria-label="Close" class="btn btn-secondary">
-                    {% trans "Cancel" %}
+                    {% if cancel_name %}{{cancel_name}}{% else %}
+                    {% trans "Cancel" %}{% endif %}
                 </button>
                 {% endblock %}
             </div>
diff --git a/ishtar_common/templates/ishtar/forms/qa_form.html b/ishtar_common/templates/ishtar/forms/qa_form.html
index 178910215..ef4f9f149 100644
--- a/ishtar_common/templates/ishtar/forms/qa_form.html
+++ b/ishtar_common/templates/ishtar/forms/qa_form.html
@@ -6,9 +6,11 @@
     <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}}
+        {% if not message.no_dismiss %}
         <button type="button" class="close" data-dismiss="alert" aria-label="Close">
             <span aria-hidden="true">×</span>
         </button>
+        {% endif %}
     </div>
     {% endfor %}
     {% for error in form.non_field_errors %}