diff options
author | Andrew Dolgov <[email protected]> | 2009-10-14 15:46:06 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2009-10-14 15:46:06 +0400 |
commit | 36a3673cfeacb8c87b92173635abb7913ae0f531 (patch) | |
tree | 393e6927cd07c90d61509c07ba5f0ed18c48feeb | |
parent | e8188aa667036280e4142919c36f944a17c08d94 (diff) | |
parent | 7c057b1a2a824410cd1c6886b74c337c2524fad7 (diff) |
Merge branch 'master' of /home/fox/public_html/testbox/tt-rss
-rw-r--r-- | functions.js | 8 | ||||
-rw-r--r-- | tt-rss.css | 5 | ||||
-rw-r--r-- | tt-rss.php | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/functions.js b/functions.js index 27823adc9..db2b4a887 100644 --- a/functions.js +++ b/functions.js @@ -531,7 +531,10 @@ function parse_counters(reply, scheduled_call) { if (feedctr && feedu && feedr) { - if (parseInt(ctr) > 0 && feedu.innerHTML != ctr && id == getActiveFeedId() && scheduled_call) { + if (parseInt(ctr) > 0 && + parseInt(feedu.innerHTML) < parseInt(ctr) && + id == getActiveFeedId() && scheduled_call) { + displayNewContentPrompt(id); } @@ -2204,7 +2207,8 @@ function hideAuxDlg() { function displayNewContentPrompt(id) { try { - var msg = __("New articles in «%s». <a href='#' onclick='viewCurrentFeed()'>Click to view</a>."); + var msg = __("New articles in «%s».") + + " <a href='#' onclick='viewfeed("+id+")'>" + __('Click to view') + "</a>."; msg = msg.replace("%s", getFeedName(id)); diff --git a/tt-rss.css b/tt-rss.css index a41d49d79..0172d6c30 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -2242,8 +2242,8 @@ div#cmdline { div#auxDlg { position : absolute; z-index : 3; - bottom : 10px; - right : 10px; + bottom : 5px; + right : 25px; padding : 5px; border-width : 1px; border-style : solid; @@ -2251,6 +2251,7 @@ div#auxDlg { background-color : #fff7d5; color : black; text-align : center; + font-size : 13px; } div#auxDlg a { diff --git a/tt-rss.php b/tt-rss.php index 7b87c320f..9caa666dd 100644 --- a/tt-rss.php +++ b/tt-rss.php @@ -105,7 +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="auxDlg" style="display : none"></div> <div id="errorBoxShadow" style="display : none"> <div id="errorBox"> |