Merge branch 'master' of /home/fox/public_html/testbox/tt-rss

diff --git a/feedlist.js b/feedlist.js
index 860122bd0244fe8a9c2c9fae86042633197e8431..b4e7b60ef95d3cd29e5cd8ddc39249f12fcbfdf3 100644 (file)
--- a/feedlist.js
+++ b/feedlist.js
@@ -157,7 +157,7 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
                }
 
                enableHotkeys();
-
+               hideAuxDlg();
                closeInfoBox();
 
                Form.enable("main_toolbar_form");
@@ -329,20 +329,22 @@ function viewfeed(feed, subop, is_cat, subop_param, skip_history, offset) {
 
                                        if (!is_cat && img) {
 
-                                               img.alt = img.src;
-                                               img.src = 'images/indicator_white.gif';
+                                               if (!img.src.match("indicator_white")) {
+                                                       img.alt = img.src;
+                                                       img.src = 'images/indicator_white.gif';
+                                               }
 
                                        } else {
 
-                                               var ll = document.createElement('img');
+                                               if (!$('FLL-' + feed)) {
+                                                       var ll = document.createElement('img');
 
-                                               ll.src = 'images/indicator_tiny.gif';
-                                               ll.className = 'hlLoading';
-                                               ll.id = 'FLL-' + feed;
+                                                       ll.src = 'images/indicator_tiny.gif';
+                                                       ll.className = 'hlLoading';
+                                                       ll.id = 'FLL-' + feed;
        
-                                               feedr.appendChild(ll);
-
-
+                                                       feedr.appendChild(ll);
+                                               }
                                        }
                                }
                        }

diff --git a/functions.js b/functions.js
index 6ab23b0f2b55022c8b806094414f40b50aa819d4..fcfddaa52f2778ecadf4891172fb411c8d347b90 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -532,7 +532,7 @@ function parse_counters(reply, scheduled_call) {
                        if (feedctr && feedu && feedr) {
 
                                if (feedu.innerHTML != ctr && id == getActiveFeedId() && scheduled_call) {
-                                       viewCurrentFeed();
+                                       displayNewContentPrompt(id);
                                }
 
                                var row_needs_hl = (ctr > 0 && ctr > parseInt(feedu.innerHTML));
@@ -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];
@@ -2190,4 +2194,25 @@ function hotkey_prefix_timeout() {
        }
 }
 
+function hideAuxDlg() {
+       try {
+               Element.hide('auxDlg');
+       } catch (e) {
+               exception_error("hideAuxDlg", e);
+       }
+}
 
+function displayNewContentPrompt(id) {
+       try {
+               var msg = __("New articles in &laquo;%s&raquo;. <a href='#' onclick='viewCurrentFeed()'>Click to view</a>.");
+
+               msg = msg.replace("%s", getFeedName(id));
+
+               $('auxDlg').innerHTML = msg;
+
+               Element.show('auxDlg');
+
+       } catch (e) {
+               exception_error("displayNewContentPrompt", e);
+       }
+}

diff --git a/images/fresh_sign.png b/images/fresh_sign.png
index 9f3d96a349bdf07440d13c0fa3cd700b91cebb23..6ec38eeb6c4bc1471e7e6fc78592fbd40daaa086 100755 (executable)
Binary files a/images/fresh_sign.png and b/images/fresh_sign.png differ

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 010bbe05e2b94e00425face108b46890e497bb79..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";
+               window.location.href = "tt-rss.php?online=1";
        }
 }
 

diff --git a/tt-rss.css b/tt-rss.css
index 0511979bb8dcc13489fda45a65446d60a3f1d324..a41d49d791941dfe57832908351b37a46533f7ea 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,27 @@ div#cmdline {
        padding : 3px 5px 3px 5px;
        z-index : 5;
 }
+
+#feed_browser_spinner {
+       vertical-align : middle;
+       height : 18px;
+       width : 18px;
+}
+
+div#auxDlg {
+       position : absolute;
+       z-index : 3;
+       bottom : 10px;
+       right : 10px;
+       padding : 5px;
+       border-width : 1px;
+       border-style : solid;
+       border-color : #d7c47a;
+       background-color : #fff7d5;
+       color : black;
+       text-align : center;
+}
+
+div#auxDlg a {
+       color : #4684ff;
+}

diff --git a/tt-rss.php b/tt-rss.php
index 1dcee23a4fede2ef30a86722bff55dc637d03531..7b87c320f2bcc9ab1e3f4cb5173f952d3ed6e110 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -105,6 +105,7 @@ window.onload = init;
 <div id="infoBoxShadow" style="display : none"><div id="infoBox">&nbsp;</div></div>
 
 <div id="cmdline" style="display : none"></div>
+<div id="auxDlg" style="zdisplay : none"></div>
 
 <div id="errorBoxShadow" style="display : none">
        <div id="errorBox">