Use Plone default spinner

collective · Mar 2, 2017 · 93d4db4 · 93d4db4
1 parent efb2d97
commit 93d4db4
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 10 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,7 +4,8 @@ Changelog
 1.2b2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Use Plone default spinner (fixes `#35`_).
+  [rodfersou]
 
 
 1.2b1 (2016-06-21)

diff --git a/src/collective/liveblog/browser/templates/update.pt b/src/collective/liveblog/browser/templates/update.pt
@@ -6,8 +6,6 @@
     i18n:domain="collective.liveblog">
 <body>
   <metal:block fill-slot="main">
-    <div id="spinner" tal:condition="view/automatic_updates_enabled"
-        i18n:translate="">Live updating</div>
     <article itemscope itemtype="http://schema.org/BlogPosting">
       <header>
         <h1 class="documentFirstHeading" itemprop="headline"
@@ -138,6 +136,11 @@
             parser.href = location.href;
             parser.pathname = parser.pathname.replace(/\/update*|\/view*/, '');
             parser.pathname = parser.pathname + '/recent-updates';
+            if (typeof require !== 'undefined' && require.defined('mockup-utils')) {
+              var utils = require('mockup-utils');
+              var loading = new utils.Loading();
+              loading.show();
+            }
             $.ajax({
                 url: parser.href,
                 success: function (data) {
@@ -162,6 +165,10 @@
                         $("#kssPortalMessage").show();
                     }
                 }
+            }).always(function() {
+              if (typeof require !== 'undefined' && require.defined('mockup-utils')) {
+                loading.hide();
+              }
             });
         }, 1000 * 60);
     </script>

diff --git a/src/collective/liveblog/browser/templates/view.pt b/src/collective/liveblog/browser/templates/view.pt
@@ -6,8 +6,6 @@
     i18n:domain="collective.liveblog">
 <body>
   <metal:block fill-slot="main">
-    <div id="spinner" tal:condition="view/automatic_updates_enabled"
-        i18n:translate="">Live updating</div>
     <article itemscope itemtype="http://schema.org/BlogPosting">
       <header>
         <div tal:replace="structure provider:plone.abovecontenttitle" />
@@ -93,6 +91,11 @@
             parser.href = location.href;
             parser.pathname = parser.pathname.replace(/\/update*|\/view*/, '');
             parser.pathname = parser.pathname + '/recent-updates';
+            if (typeof require !== 'undefined' && require.defined('mockup-utils')) {
+              var utils = require('mockup-utils');
+              var loading = new utils.Loading();
+              loading.show();
+            }
             $.ajax({
                 url: parser.href,
                 success: function (data) {
@@ -113,6 +116,10 @@
                         window.location.reload();
                     }
                 }
+            }).always(function() {
+              if (typeof require !== 'undefined' && require.defined('mockup-utils')) {
+                loading.hide();
+              }
             });
         }, 1000 * 60);
     </script>

diff --git a/src/collective/liveblog/static/spinner.gif b/src/collective/liveblog/static/spinner.gif
diff --git a/src/collective/liveblog/static/styles.css b/src/collective/liveblog/static/styles.css
@@ -16,11 +16,6 @@
 .portaltype-liveblog #content header {
     margin-bottom: 1em;
 }
-#spinner {
-    background: url('++resource++collective.liveblog/spinner.gif') no-repeat center right;
-    float: right;
-    padding-right: 20px;
-}
 .microupdate-helpers {
     float: right;
 }