From aa15b0c21b171e54c6a85480d9362dd131088ee7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 9 Oct 2009 13:57:22 +0400 Subject: [PATCH 1/5] update fresh_sign.png --- images/fresh_sign.png | Bin 177 -> 176 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/images/fresh_sign.png b/images/fresh_sign.png index 9f3d96a349bdf07440d13c0fa3cd700b91cebb23..6ec38eeb6c4bc1471e7e6fc78592fbd40daaa086 100755 GIT binary patch delta 126 zcmV-^0D=Fp0k8p(Id@`7L_t&-8Lf`N3BVu}L$!F3ZqoI{DcsLZdTmRDS3>d7gM!4o z{|yOY<*9wYJr6JSs~u+S{oc=zw&Xlt#|r&Uz!kS=e$T(#Jy@(N^ Date: Fri, 9 Oct 2009 14:11:50 +0400 Subject: [PATCH 2/5] offline: add workaround for stuck login screen when going back from offline mode --- offline.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/offline.js b/offline.js index 010bbe05e..d37946da9 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"; } } From f4280bdd13e1a1ad54f6ddfafaccdc0e43aa756e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 9 Oct 2009 14:30:21 +0400 Subject: [PATCH 3/5] feed browser: add local spinner --- functions.js | 6 +++++- modules/pref-feeds.php | 2 ++ offline.js | 2 +- tt-rss.css | 7 +++++++ 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 "
+ Date: Mon, 12 Oct 2009 14:32:18 +0400 Subject: [PATCH 4/5] feedlist: check for progressbar existence before creating one --- feedlist.js | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/feedlist.js b/feedlist.js index 860122bd0..b1968a7ab 100644 --- a/feedlist.js +++ b/feedlist.js @@ -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); + } } } } From 37e93d6ccae51c283f3b480195016d749ecab1a5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 13 Oct 2009 19:05:36 +0400 Subject: [PATCH 5/5] display special dialog when new articles are available in the current feed instead of reloading it --- feedlist.js | 2 +- functions.js | 23 ++++++++++++++++++++++- tt-rss.css | 18 ++++++++++++++++++ tt-rss.php | 1 + 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/feedlist.js b/feedlist.js index 860122bd0..bfd14376c 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"); diff --git a/functions.js b/functions.js index 22490fd1c..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)); @@ -2194,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». Click to view."); + + msg = msg.replace("%s", getFeedName(id)); + + $('auxDlg').innerHTML = msg; + + Element.show('auxDlg'); + + } catch (e) { + exception_error("displayNewContentPrompt", e); + } +} diff --git a/tt-rss.css b/tt-rss.css index 4510ad705..a41d49d79 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -2238,3 +2238,21 @@ div#cmdline { 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; +