From 0ac73f914da511773d7604041cd45ee942a5319e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Wed, 14 Oct 2009 09:38:04 +0400
Subject: new articles prompt tweak

---
 functions.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'functions.js')

diff --git a/functions.js b/functions.js
index 27823adc9..496f760ca 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);
 				}
 
-- 
cgit v1.2.3-54-g00ecf


From 7c057b1a2a824410cd1c6886b74c337c2524fad7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Wed, 14 Oct 2009 15:45:47 +0400
Subject: more auxDlg tweaks

---
 functions.js | 3 ++-
 tt-rss.css   | 4 ++--
 tt-rss.php   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'functions.js')

diff --git a/functions.js b/functions.js
index 496f760ca..db2b4a887 100644
--- a/functions.js
+++ b/functions.js
@@ -2207,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));
 
diff --git a/tt-rss.css b/tt-rss.css
index b08ffba90..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;
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">&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">
-- 
cgit v1.2.3-54-g00ecf