feed browser: add local spinner

4 files changed, 15 insertions, 2 deletions

diff --git a/functions.js b/functions.js
index 6ab23b0f2..22490fd1c 100644
--- 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 6b510bc9d..17379a2bf 100644
--- 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 d37946da9..f62bd46b9 100644
--- 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 0511979bb..4510ad705 100644
--- 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;
+}