From a43041b385cb6ccd82cfc30f310c4b447eaf8789 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Thu, 11 Apr 2019 11:47:09 +0200
Subject: Wait window for quick actions - responsive adaptation

---
 ishtar_common/static/js/ishtar.js                     | 6 +++++-
 ishtar_common/templates/ishtar/blocks/window_nav.html | 4 ++--
 scss/custom.scss                                      | 2 +-
 version.py                                            | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index ff488463f..19bec49e3 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -406,9 +406,12 @@ $(document).ready(function(){
     $("#submit-search").click(function(){
         $(".search_button").click();
     });
+    register_wait_button();
+});
 
+var register_wait_button = function(){
     $(".wait-button").click(function(){short_wait()});
-});
+};
 
 $(document).on("click", '#to_bottom_arrow', function(){
   $("html, body").animate({ scrollTop: $(document).height() }, 1000);
@@ -594,6 +597,7 @@ function load_window(url, speed, on_success, no_jump){
                 location.href = "#" + last_window;
                 history.replaceState(null, null, url);
             }
+            register_wait_button();
             if (on_success) on_success();
         },
         error:function(XMLHttpRequest, textStatus, errorThrows){
diff --git a/ishtar_common/templates/ishtar/blocks/window_nav.html b/ishtar_common/templates/ishtar/blocks/window_nav.html
index 30e364ae5..a53e62b0d 100644
--- a/ishtar_common/templates/ishtar/blocks/window_nav.html
+++ b/ishtar_common/templates/ishtar/blocks/window_nav.html
@@ -45,13 +45,13 @@
       <div class="btn-group btn-group-sm" role="group" aria-label="{% trans 'Actions' %}">
         {% block extra_actions %}{% endblock %}
         {% if modify_url %}
-        <a class="btn btn-success" href='{% url modify_url item.pk %}'
+        <a class="btn btn-success wait-button" href='{% url modify_url item.pk %}'
            title="{% trans 'Modify' %}">
             <i class="fa fa-pencil"></i>
         </a>
         {% endif %}
         {% for url, base_text, icon, extra_text, css_class, is_qa in extra_actions %}
-        <a class="{% if is_qa %}btn-qa {% endif %}btn btn-success{% if css_class %} {{css_class}}{% endif %}"
+        <a class="{% if is_qa %}btn-qa{% else %}wait-button{% endif %} btn btn-success{% if css_class %} {{css_class}}{% endif %}"
            {% if is_qa %}href="#" data-target="{{url}}"{% else %}href='{{url}}'{% endif %} title="{{base_text}}">
             <i class="{{icon}}"></i> {{extra_text}}
         </a>
diff --git a/scss/custom.scss b/scss/custom.scss
index 5a237639c..4ef16121d 100644
--- a/scss/custom.scss
+++ b/scss/custom.scss
@@ -422,7 +422,7 @@ textarea {
 
 .container{
     margin-top: 1em;
-    margin-bottom: 8em;
+    margin-bottom: 16em;
 }
 
 .bg-dark{
diff --git a/version.py b/version.py
index f2010896e..f2204c1c2 100644
--- a/version.py
+++ b/version.py
@@ -1,5 +1,5 @@
-# 2.1.master.32
-VERSION = (2, 1, 'master', 32)
+# 2.1.master.33
+VERSION = (2, 1, 'master', 33)
 
 
 def get_version():
-- 
cgit v1.2.3