valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Andrew Dolgov 2009-10-14 15:46:06 +04:00
parent e8188aa667 7c057b1a2a
commit 36a3673cfe
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
functions.js
View File

@ -531,7 +531,10 @@ function parse_counters(reply, scheduled_call) {
if (feedctr && feedu && feedr) { 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); displayNewContentPrompt(id);
} }
@ -2204,7 +2207,8 @@ function hideAuxDlg() {
function displayNewContentPrompt(id) { function displayNewContentPrompt(id) {
try { try {
var msg = __("New articles in &laquo;%s&raquo;. <a href='#' onclick='viewCurrentFeed()'>Click to view</a>."); var msg = __("New articles in &laquo;%s&raquo;.") +
" <a href='#' onclick='viewfeed("+id+")'>" + __('Click to view') + "</a>.";
msg = msg.replace("%s", getFeedName(id)); msg = msg.replace("%s", getFeedName(id));

5
tt-rss.css
View File

@ -2242,8 +2242,8 @@ div#cmdline {
div#auxDlg { div#auxDlg {
position : absolute; position : absolute;
z-index : 3; z-index : 3;
bottom : 10px; bottom : 5px;
right : 10px; right : 25px;
padding : 5px; padding : 5px;
border-width : 1px; border-width : 1px;
border-style : solid; border-style : solid;
@ -2251,6 +2251,7 @@ div#auxDlg {
background-color : #fff7d5; background-color : #fff7d5;
color : black; color : black;
text-align : center; text-align : center;
font-size : 13px;
} }
div#auxDlg a { div#auxDlg a {

2
tt-rss.php
View File

@ -105,7 +105,7 @@ window.onload = init;
<div id="infoBoxShadow" style="display : none"><div id="infoBox">&nbsp;</div></div> <div id="infoBoxShadow" style="display : none"><div id="infoBox">&nbsp;</div></div>
<div id="cmdline" style="display : none"></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="errorBoxShadow" style="display : none">
<div id="errorBox"> <div id="errorBox">