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

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 &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));
 

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 {

tt-rss.php

@@ -105,7 +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="auxDlg" style="display : none"></div>
 
 <div id="errorBoxShadow" style="display : none">
 	<div id="errorBox">