diff options
author | Andrew Dolgov <[email protected]> | 2009-10-13 19:07:26 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2009-10-13 19:07:26 +0400 |
commit | 394bfafd8097442f91e262e1986039d383d685ec (patch) | |
tree | 27eb4d47c339adae13e9ab599c38fb983358b043 | |
parent | f69281f7ebb030429a724621570524d3d03902cb (diff) | |
parent | e9a174b1212fb932c399d01346ff0a12f03e1b38 (diff) |
Merge branch 'master' of /home/fox/public_html/testbox/tt-rss
-rw-r--r-- | feedlist.js | 22 | ||||
-rw-r--r-- | functions.js | 29 | ||||
-rwxr-xr-x | images/fresh_sign.png | bin | 177 -> 176 bytes | |||
-rw-r--r-- | modules/pref-feeds.php | 2 | ||||
-rw-r--r-- | offline.js | 2 | ||||
-rw-r--r-- | tt-rss.css | 25 | ||||
-rw-r--r-- | tt-rss.php | 1 |
7 files changed, 68 insertions, 13 deletions
diff --git a/feedlist.js b/feedlist.js index 860122bd0..b4e7b60ef 100644 --- 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 6ab23b0f2..fcfddaa52 100644 --- 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 «%s». <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 Binary files differindex 9f3d96a34..6ec38eeb6 100755 --- a/images/fresh_sign.png +++ b/images/fresh_sign.png 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 010bbe05e..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"; + window.location.href = "tt-rss.php?online=1"; } } diff --git a/tt-rss.css b/tt-rss.css index 0511979bb..a41d49d79 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,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 1dcee23a4..7b87c320f 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -105,6 +105,7 @@ window.onload = init; <div id="infoBoxShadow" style="display : none"><div id="infoBox"> </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"> |