feed browser: add local spinner

diff --git a/functions.js b/functions.js
index 6ab23b0f2b55022c8b806094414f40b50aa819d4..22490fd1c4ec5392e02d8d342e19ddedc9ad1b5f 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -2052,12 +2052,16 @@ function updateFeedBrowser() {
                        query = query + "&search=" + param_escape(search.value);
                }
 
-               notify_progress("Loading, please wait...", true);
+               //notify_progress("Loading, please wait...", true);
+
+               Element.show('feed_browser_spinner');
 
                new Ajax.Request(query, {
                        onComplete: function(transport) { 
                                notify('');
 
+                               Element.hide('feed_browser_spinner');
+
                                var c = $("browseFeedList");
                                var r = transport.responseXML.getElementsByTagName("content")[0];
                                var nr = transport.responseXML.getElementsByTagName("num-results")[0];

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 6b510bc9d6dccb4398f57a3464f88f258f4caae2..17379a2bfa16abded8cae529a12f2d5f64e0a644 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -70,6 +70,8 @@
 
                        print "
                                <div style='float : right'>
+                               <img style='display : none' 
+                                       id='feed_browser_spinner' src='images/indicator_white.gif'>
                                <input id=\"feed_browser_search\" size=\"20\" type=\"search\"
                                onfocus=\"javascript:disableHotkeys();\" 
                                onblur=\"javascript:enableHotkeys();\"

diff --git a/offline.js b/offline.js
index d37946da9f34173ea0b339cd369a7401a288f847..f62bd46b9b76ee52178eb2e6c6f10aef5f0647a2 100644 (file)
--- a/offline.js
+++ b/offline.js
@@ -1222,7 +1222,7 @@ function gotoOnline() {
 //     if (confirm(__("You won't be able to access offline version of Tiny Tiny RSS until you switch it into offline mode again. Go online?"))) {
        if (confirm(__("Tiny Tiny RSS will reload. Go online?"))) {
                //localServer.removeManagedStore("tt-rss");
-               window.location.href = "tt-rss.php?online";
+               window.location.href = "tt-rss.php?online=1";
        }
 }
 

diff --git a/tt-rss.css b/tt-rss.css
index 0511979bb8dcc13489fda45a65446d60a3f1d324..4510ad705fdbd1c95fd08ade27d439d184bc910d 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -216,6 +216,7 @@ ul.feedList img, img.tinyFeedIcon {
        margin : 0px 3px 0px 0px;
        width : 16px;
        height : 16px;
+       vertical-align : middle;
        border-width : 0px;
 }
 
@@ -2231,3 +2232,9 @@ div#cmdline {
        padding : 3px 5px 3px 5px;
        z-index : 5;
 }
+
+#feed_browser_spinner {
+       vertical-align : middle;
+       height : 18px;
+       width : 18px;
+}