wait #6670 @0.25

diff --git a/.docker/config/cron/host b/.docker/config/cron/host
index 457af078ab31180bb0b30fab784f8d40b43d88e6..973efaa073c6138641145b6447c1181ee7ba6741 100644 (file)
--- a/.docker/config/cron/host
+++ b/.docker/config/cron/host
@@ -1,4 +1,2 @@
 3 4 * * *   root    /docker/fluidbook-toolbox/build  >/dev/null 2>/dev/null
 3 5 * * *   root    /docker/fluidbook-toolbox-dev/build  >/dev/null 2>/dev/null
-45 */6 * * *   root    docker restart fluidbook-toolbox-redis  >/dev/null 2>/dev/null
-15 */6 * * *   root    docker restart fluidbook-toolbox-dev-redis  >/dev/null 2>/dev/null

diff --git a/resources/linkeditor/js/linkeditor.js b/resources/linkeditor/js/linkeditor.js
index 7ebf4d89c4e5090f242698b3d946bf20d8caeb30..a2a6bc3b2907b4400af59a786cf60acd6ac48ac9 100644 (file)
--- a/resources/linkeditor/js/linkeditor.js
+++ b/resources/linkeditor/js/linkeditor.js
@@ -561,6 +561,14 @@ LinkEditor.prototype = {
         return this.currentPage;
     },
 
+    displayLoader: function () {
+        $("#loader").show();
+    },
+
+    hideLoader() {
+        $("#loader").hide();
+    }
+
 }
 
 

diff --git a/resources/linkeditor/js/linkeditor.toolbar.js b/resources/linkeditor/js/linkeditor.toolbar.js
index b363b05f3550657178e0fdb7178b54a486c79050..bf6d6205ba2647efc89bd73698c5aff6017a2b3d 100644 (file)
--- a/resources/linkeditor/js/linkeditor.toolbar.js
+++ b/resources/linkeditor/js/linkeditor.toolbar.js
@@ -59,6 +59,7 @@ LinkeditorToolbar.prototype = {
     },
 
     submitFormAndReload: function (form) {
+        this.linkeditor.displayLoader();
         var $this = this;
         var callback = function () {
             $(form).ajaxSubmit(
@@ -69,6 +70,7 @@ LinkeditorToolbar.prototype = {
                             window.location.reload();
                         }, 1000);
                     }, error: function (data) {
+                        $this.linkeditor.hideLoader();
                         $this.linkeditor.notification(TRANSLATIONS.error + ' : ' + data.responseJSON.message, 'error');
                     },
                 }
@@ -82,4 +84,4 @@ LinkeditorToolbar.prototype = {
         }
     },
 };
-export default  LinkeditorToolbar;
+export default LinkeditorToolbar;

diff --git a/resources/linkeditor/style/style.sass b/resources/linkeditor/style/style.sass
index 564daa20240dbe7862578f2aa1cafb82b661819e..d43720f4e0a39b6e8d9f5b9c7c0334bfd1e6b8cf 100644 (file)
--- a/resources/linkeditor/style/style.sass
+++ b/resources/linkeditor/style/style.sass
@@ -176,6 +176,16 @@ body, #linkeditor, html
 #linkeditor-preload, #linkeditor-clipboard
     display: none
 
+#loader
+    position: absolute
+    top: 0
+    left: 0
+    cursor: wait
+    width: 100%
+    height: 100%
+    z-index: 20000000
+    display: none
+
 @import "inc/_panels"
 @import "inc/_toolbar"
 @import "inc/_rulers"

diff --git a/resources/views/fluidbook_publication/link_editor.blade.php b/resources/views/fluidbook_publication/link_editor.blade.php
index 913d9dfc1be2ce654c7b1d005ad3d38f1bde87cb..0f9f8db802dbac59dbfa51f0cd28edfc1e8e39bf 100644 (file)
--- a/resources/views/fluidbook_publication/link_editor.blade.php
+++ b/resources/views/fluidbook_publication/link_editor.blade.php
@@ -142,6 +142,7 @@
 
         </div>
     </div>
+    <div id="loader"></div>
     <div id="popup-templates">
         <div class="popup" data-popup="moveLinks" style="max-width: 300px">
             <h2>{{__('Déplacer les liens')}}</h2>