From c01f40f4d9c8fae847ecec5a18ff52c0a15dd57b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Thu, 9 Sep 2010 16:50:10 +0400
Subject: add experimental digest thingie (2)

---
 digest.js | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 108 insertions(+)
 create mode 100644 digest.js

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
new file mode 100644
index 000000000..7bfd9df27
--- /dev/null
+++ b/digest.js
@@ -0,0 +1,108 @@
+var last_feeds = [];
+
+function find_feed(feeds, feed_id) {
+	try {
+		for (var i = 0; i < feeds.length; i++) {
+			if (feeds[i].id == feed_id)
+				return feeds[i];
+		}
+
+		return false;
+
+	} catch (e) {
+		exception_error("find_feed", e);
+	}
+}
+
+function add_feed_entry(feed) {
+	try {
+		var icon_part = "";
+
+		if (feed.has_icon) 
+			icon_part = "<img alt='zz' src='icons/" + feed.id + ".ico'/>";
+
+		var tmp_html = "<li>" + 
+			icon_part +
+			feed.title +
+			"<div class='unread-ctr'>" + feed.unread + "</div>" +	
+			"</li>";
+
+		$("feeds-content").innerHTML += tmp_html;
+
+	} catch (e) {
+		exception_error("add_feed_entry", e);
+	}
+}
+
+function add_latest_entry(article) {
+	try {
+
+	} catch (e) {
+		exception_error("add_latest_entry", e);
+	}
+}
+
+function add_headline_entry(article, feed) {
+	try {
+
+		var icon_part = "";
+
+		if (article.has_icon) 
+			icon_part = "<img alt='zz' src='icons/" + article.feed_id + ".ico'/>";
+
+		var tmp_html = "<li>" + 
+			icon_part +
+			"<a class='title'>" + article.title + "</a>" +
+			"<div class='excerpt'>" + article.excerpt + "</div>" +
+			"<div class='info'><a>" + feed.title + "</a> " + " @ " + 
+				article.updated + "</div>" +
+			"</li>";
+
+		$("headlines-content").innerHTML += tmp_html;
+
+	} catch (e) {
+		exception_error("add_headline_entry", e);
+	}
+}
+
+function digest_update(transport) {
+	try {
+		var feeds = transport.responseXML.getElementsByTagName('feeds')[0];
+		var headlines = transport.responseXML.getElementsByTagName('headlines')[0];
+
+		if (feeds) {
+			last_feeds = feeds;
+
+			feeds = eval("(" + feeds.firstChild.nodeValue + ")");
+
+			for (var i = 0; i < feeds.length; i++) {
+				add_feed_entry(feeds[i]);
+			}
+		}
+
+		if (headlines) {
+			headlines = eval("(" + headlines.firstChild.nodeValue + ")");
+
+			for (var i = 0; i < headlines.length; i++) {
+				add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id));
+			}
+		}
+
+	} catch (e) {
+		exception_error("digest_update", e);
+	}
+	}
+
+function digest_init() {
+	try {
+		
+		new Ajax.Request("backend.php",	{
+			parameters: "backend.php?op=rpc&subop=digest-init",
+			onComplete: function(transport) {
+				digest_update(transport);
+				} });
+
+	} catch (e) {
+		exception_error("digest_init", e);
+	}
+}
-- 
cgit v1.2.3-54-g00ecf


From b41c254984df3fcb9fc7db4bb5218f2391e62164 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Thu, 9 Sep 2010 19:02:12 +0400
Subject: small digest page improvements

---
 digest.css              |  8 +++++
 digest.js               | 57 +++++++++++++++++++++++++++++---
 digest.php              |  1 -
 functions.php           | 88 ++++++++++++++++++++++++++-----------------------
 modules/backend-rpc.php | 14 +++++---
 5 files changed, 115 insertions(+), 53 deletions(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index 5139114f0..62852adb0 100644
--- a/digest.css
+++ b/digest.css
@@ -126,6 +126,14 @@ a:hover {
 	padding : 0px;
 }
 
+#feeds ul#feeds-content li a {
+	color : #659a4c;
+}
+
+#feeds ul#feeds-content li a:hover {
+	color : gray;
+}
+
 #headlines {
 	padding : 5px;
 	font-size : 14px;
diff --git a/digest.js b/digest.js
index 7bfd9df27..3d58ca95f 100644
--- a/digest.js
+++ b/digest.js
@@ -1,5 +1,19 @@
 var last_feeds = [];
 
+function view(feed_id) {
+	try {
+
+		new Ajax.Request("backend.php",	{
+			parameters: "backend.php?op=rpc&subop=digest-init&feed_id=" + feed_id,
+			onComplete: function(transport) {
+				digest_update(transport);
+				} });
+
+	} catch (e) {
+		exception_error("view", e);
+	}
+}
+
 function find_feed(feeds, feed_id) {
 	try {
 		for (var i = 0; i < feeds.length; i++) {
@@ -14,16 +28,40 @@ function find_feed(feeds, feed_id) {
 	}
 }
 
+function get_feed_icon(feed) {
+	try {
+		if (feed.has_icon)
+			return 'icons/' + feed.id + '.ico';
+
+		if (feed.id == -1)
+			return 'images/mark_set.png';
+
+		if (feed.id == -2)
+			return 'images/pub_set.png';
+
+		if (feed.id == -3)
+			return 'images/fresh.png';
+
+		if (feed.id == -4) 
+			return 'images/tag.png';
+
+		if (feed.id < -10) 
+			return 'images/label.png';
+
+	} catch (e) {
+		exception_error("get_feed_icon", e);
+	}
+}
+
 function add_feed_entry(feed) {
 	try {
 		var icon_part = "";
 
-		if (feed.has_icon) 
-			icon_part = "<img alt='zz' src='icons/" + feed.id + ".ico'/>";
+		icon_part = "<img src='" + get_feed_icon(feed) + "'/>";
 
 		var tmp_html = "<li>" + 
 			icon_part +
-			feed.title +
+			"<a href=\"#\" onclick=\"view("+feed.id+")\">" + feed.title +
 			"<div class='unread-ctr'>" + feed.unread + "</div>" +	
 			"</li>";
 
@@ -34,8 +72,11 @@ function add_feed_entry(feed) {
 	}
 }
 
-function add_latest_entry(article) {
+function add_latest_entry(article, feed) {
 	try {
+		
+
+		//$("latest-content").innerHTML += "bbb";
 
 	} catch (e) {
 		exception_error("add_latest_entry", e);
@@ -55,7 +96,7 @@ function add_headline_entry(article, feed) {
 			"<a class='title'>" + article.title + "</a>" +
 			"<div class='excerpt'>" + article.excerpt + "</div>" +
 			"<div class='info'><a>" + feed.title + "</a> " + " @ " + 
-				article.updated + "</div>" +
+				new Date(article.updated * 1000) + "</div>" +
 			"</li>";
 
 		$("headlines-content").innerHTML += tmp_html;
@@ -75,6 +116,8 @@ function digest_update(transport) {
 
 			feeds = eval("(" + feeds.firstChild.nodeValue + ")");
 
+			$('feeds-content').innerHTML = "";
+
 			for (var i = 0; i < feeds.length; i++) {
 				add_feed_entry(feeds[i]);
 			}
@@ -83,9 +126,13 @@ function digest_update(transport) {
 		if (headlines) {
 			headlines = eval("(" + headlines.firstChild.nodeValue + ")");
 
+			$('headlines-content').innerHTML = "";
+
 			for (var i = 0; i < headlines.length; i++) {
 				add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id));
 			}
+
+			$('headlines-content').innerHTML += "<li><a>More articles...</a></li>";
 		}
 
 	} catch (e) {
diff --git a/digest.php b/digest.php
index cfe16cfe4..94489eb0b 100644
--- a/digest.php
+++ b/digest.php
@@ -39,7 +39,6 @@
 	<script type="text/javascript" src="lib/prototype.js"></script>
 	<script type="text/javascript" src="lib/scriptaculous/scriptaculous.js?load=effects,dragdrop,controls"></script>
 	<script type="text/javascript" charset="utf-8" src="localized_js.php?<?php echo $dt_add ?>"></script>
-	<script type="text/javascript" charset="utf-8" src="tt-rss.js?<?php echo $dt_add ?>"></script>
 	<script type="text/javascript" charset="utf-8" src="functions.js?<?php echo $dt_add ?>"></script>
 
 	<script type="text/javascript" src="digest.js"></script>
diff --git a/functions.php b/functions.php
index 78e0d4f18..ce1a06a62 100644
--- a/functions.php
+++ b/functions.php
@@ -6653,51 +6653,9 @@
 	}
 
 	function api_get_feeds($link, $cat_id, $unread_only, $limit, $offset) {
-			if ($limit) {
-				$limit_qpart = "LIMIT $limit OFFSET $offset";
-			} else {
-				$limit_qpart = "";
-			}
-
-			if (!$cat_id) {
-				$result = db_query($link, "SELECT 
-					id, feed_url, cat_id, title, ".
-						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
-						FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] . 
-						" ORDER BY cat_id, title " . $limit_qpart);
-			} else {
-				$result = db_query($link, "SELECT 
-					id, feed_url, cat_id, title, ".
-						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
-						FROM ttrss_feeds WHERE 
-						cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] . 
-						" ORDER BY cat_id, title " . $limit_qpart);
-			}
 
 			$feeds = array();
 
-			while ($line = db_fetch_assoc($result)) {
-
-				$unread = getFeedUnread($link, $line["id"]);
-
-				$has_icon = feed_has_icon($line['id']);
-
-				if ($unread || !$unread_only) {
-
-					$row = array(
-							"feed_url" => $line["feed_url"],
-							"title" => $line["title"],
-							"id" => (int)$line["id"],
-							"unread" => (int)$unread,
-							"has_icon" => $has_icon,
-							"cat_id" => (int)$line["cat_id"],
-							"last_updated" => strtotime($line["last_updated"])
-						);
-	
-					array_push($feeds, $row);
-				}
-			}
-
 			/* Labels */
 
 			if (!$cat_id || $cat_id == -2) {
@@ -6741,6 +6699,52 @@
 
 				}			
 			}
+
+			/* Real feeds */
+
+			if ($limit) {
+				$limit_qpart = "LIMIT $limit OFFSET $offset";
+			} else {
+				$limit_qpart = "";
+			}
+
+			if (!$cat_id) {
+				$result = db_query($link, "SELECT 
+					id, feed_url, cat_id, title, ".
+						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+						FROM ttrss_feeds WHERE owner_uid = " . $_SESSION["uid"] . 
+						" ORDER BY cat_id, title " . $limit_qpart);
+			} else {
+				$result = db_query($link, "SELECT 
+					id, feed_url, cat_id, title, ".
+						SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated
+						FROM ttrss_feeds WHERE 
+						cat_id = '$cat_id' AND owner_uid = " . $_SESSION["uid"] . 
+						" ORDER BY cat_id, title " . $limit_qpart);
+			}
+
+			while ($line = db_fetch_assoc($result)) {
+
+				$unread = getFeedUnread($link, $line["id"]);
+
+				$has_icon = feed_has_icon($line['id']);
+
+				if ($unread || !$unread_only) {
+
+					$row = array(
+							"feed_url" => $line["feed_url"],
+							"title" => $line["title"],
+							"id" => (int)$line["id"],
+							"unread" => (int)$unread,
+							"has_icon" => $has_icon,
+							"cat_id" => (int)$line["cat_id"],
+							"last_updated" => strtotime($line["last_updated"])
+						);
+	
+					array_push($feeds, $row);
+				}
+			}
+
 		return $feeds;
 	}
 
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index f8233a7cd..edf2ae2e4 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -979,13 +979,17 @@
 		}
 
 		if ($subop == "digest-init") {
+			$feed_id = db_escape_string($_REQUEST['feed_id']);
+
+			if (!$feed_id) $feed_id = -4;
+
 			print "<rpc-reply>";
 
 			$tmp_feeds = api_get_feeds($link, false, true, false, 0);
 			$feeds = array();
 
 			foreach ($tmp_feeds as $f) {
-				if ($f['id'] > 0) array_push($feeds, $f);
+				if ($f['id'] > 0 || $f['id'] == -4) array_push($feeds, $f);
 			}
 
 			function feeds_sort_by_unread_rev($a, $b) {
@@ -998,13 +1002,13 @@
 				return ($a < $b) ? 1 : -1;
 			}
 
-//			uasort($feeds, 'feeds_sort_by_unread_rev');
-//			$feeds = array_slice($feeds, 0, 10);
+			//uasort($feeds, 'feeds_sort_by_unread_rev');
+			//$feeds = array_slice($feeds, 0, 10);
 
 			print "<feeds><![CDATA[" . json_encode($feeds) . "]]></feeds>";
 
-			$headlines = api_get_headlines($link, -4, 20, 0,
-				'', true, true, false, "all_articles", "updated DESC");
+			$headlines = api_get_headlines($link, $feed_id, 10, 0,
+				'', ($feed_id == -4), true, false, "all_articles", "updated DESC");
 
 			//function api_get_headlines($link, $feed_id, $limit, $offset,
 			//		$filter, $is_cat, $show_excerpt, $show_content, $view_mode) {
-- 
cgit v1.2.3-54-g00ecf


From 1ca8997bcc818bdfa12f3c979b9e0981422cdbc0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Thu, 9 Sep 2010 21:44:04 +0400
Subject: more digest page improvements

---
 digest.css              |  9 +++++++--
 digest.js               | 45 ++++++++++++++++++++++++++++++++++++---------
 modules/backend-rpc.php | 29 ++++++++++++++++++++---------
 3 files changed, 63 insertions(+), 20 deletions(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index 62852adb0..3c770b765 100644
--- a/digest.css
+++ b/digest.css
@@ -156,6 +156,7 @@ a:hover {
 #headlines ul#headlines-content li {
 	margin : 0px 0px 10px 0px;
 	color : #909090;
+	clear : left;
 }
 
 #headlines ul#headlines-content a.title {
@@ -164,12 +165,16 @@ a:hover {
 }
 
 #headlines ul#headlines-content div.excerpt {
-	margin-left : 22px;
 	color : #404040;
 }
 
+#headlines ul#headlines-content div.body {
+	margin-left : 21px;
+}
+
 #headlines ul#headlines-content div.info {
-	margin-left : 22px;
+	margin-top : 2px;
+	font-size : 11px;
 }
 
 #headlines ul#headlines-content div.info a {
diff --git a/digest.js b/digest.js
index 3d58ca95f..f27f15f86 100644
--- a/digest.js
+++ b/digest.js
@@ -1,12 +1,29 @@
 var last_feeds = [];
 
-function view(feed_id) {
+var _active_feed_id = false;
+var _active_feed_offset = false;
+
+function viewfeed(feed_id, offset) {
 	try {
 
+		if (!feed_id) feed_id = _active_feed_id;
+
+		if (!offset) 
+			offset = 0;
+		else
+			offset = _active_feed_offset + offset;
+
+		var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id +
+				"&offset=" + offset;
+
+		console.log(query);
+
 		new Ajax.Request("backend.php",	{
-			parameters: "backend.php?op=rpc&subop=digest-init&feed_id=" + feed_id,
+			parameters: query, 
 			onComplete: function(transport) {
 				digest_update(transport);
+				_active_feed_id = feed_id;
+				_active_feed_offset = offset;
 				} });
 
 	} catch (e) {
@@ -61,7 +78,7 @@ function add_feed_entry(feed) {
 
 		var tmp_html = "<li>" + 
 			icon_part +
-			"<a href=\"#\" onclick=\"view("+feed.id+")\">" + feed.title +
+			"<a href=\"#\" onclick=\"viewfeed("+feed.id+")\">" + feed.title +
 			"<div class='unread-ctr'>" + feed.unread + "</div>" +	
 			"</li>";
 
@@ -89,15 +106,15 @@ function add_headline_entry(article, feed) {
 		var icon_part = "";
 
 		if (article.has_icon) 
-			icon_part = "<img alt='zz' src='icons/" + article.feed_id + ".ico'/>";
+			icon_part = "<img src='icons/" + article.feed_id + ".ico'/>";
 
 		var tmp_html = "<li>" + 
 			icon_part +
 			"<a class='title'>" + article.title + "</a>" +
-			"<div class='excerpt'>" + article.excerpt + "</div>" +
+			"<div class='body'><div class='excerpt'>" + article.excerpt + "</div>" +
 			"<div class='info'><a>" + feed.title + "</a> " + " @ " + 
 				new Date(article.updated * 1000) + "</div>" +
-			"</li>";
+			"</div></li>";
 
 		$("headlines-content").innerHTML += tmp_html;
 
@@ -112,15 +129,17 @@ function digest_update(transport) {
 		var headlines = transport.responseXML.getElementsByTagName('headlines')[0];
 
 		if (feeds) {
-			last_feeds = feeds;
-
 			feeds = eval("(" + feeds.firstChild.nodeValue + ")");
 
+			last_feeds = feeds;
+
 			$('feeds-content').innerHTML = "";
 
 			for (var i = 0; i < feeds.length; i++) {
 				add_feed_entry(feeds[i]);
 			}
+		} else {
+			feeds = last_feeds;
 		}
 
 		if (headlines) {
@@ -128,11 +147,18 @@ function digest_update(transport) {
 
 			$('headlines-content').innerHTML = "";
 
+			Element.hide('headlines-content');
+
 			for (var i = 0; i < headlines.length; i++) {
 				add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id));
 			}
 
-			$('headlines-content').innerHTML += "<li><a>More articles...</a></li>";
+			$('headlines-content').innerHTML += "<li>" +
+				"<div class='body'><a href=\"#\" onclick=\"viewfeed(false, 10)\">" +
+			  	__("More articles...") + "</a></div></li>";
+
+			new Effect.Appear('headlines-content');
+
 		}
 
 	} catch (e) {
@@ -147,6 +173,7 @@ function digest_init() {
 			parameters: "backend.php?op=rpc&subop=digest-init",
 			onComplete: function(transport) {
 				digest_update(transport);
+				window.setTimeout('viewfeed(-4)', 100);
 				} });
 
 	} catch (e) {
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index edf2ae2e4..80eda7c3f 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -978,11 +978,29 @@
 			return;
 		}
 
-		if ($subop == "digest-init") {
+		if ($subop == "digest-update") {
 			$feed_id = db_escape_string($_REQUEST['feed_id']);
-
+			$offset = db_escape_string($_REQUEST['offset']);
+		
 			if (!$feed_id) $feed_id = -4;
+			if (!$offset) $offset = 0;
+
 
+			print "<rpc-reply>";
+
+			$headlines = api_get_headlines($link, $feed_id, 10, $offset,
+				'', ($feed_id == -4), true, false, "unread", "updated DESC");
+
+			//function api_get_headlines($link, $feed_id, $limit, $offset,
+			//		$filter, $is_cat, $show_excerpt, $show_content, $view_mode) {
+
+			print "<headlines><![CDATA[" . json_encode($headlines) . "]]></headlines>";
+
+			print "</rpc-reply>";
+			return;
+		}
+
+		if ($subop == "digest-init") {
 			print "<rpc-reply>";
 
 			$tmp_feeds = api_get_feeds($link, false, true, false, 0);
@@ -1007,13 +1025,6 @@
 
 			print "<feeds><![CDATA[" . json_encode($feeds) . "]]></feeds>";
 
-			$headlines = api_get_headlines($link, $feed_id, 10, 0,
-				'', ($feed_id == -4), true, false, "all_articles", "updated DESC");
-
-			//function api_get_headlines($link, $feed_id, $limit, $offset,
-			//		$filter, $is_cat, $show_excerpt, $show_content, $view_mode) {
-
-			print "<headlines><![CDATA[" . json_encode($headlines) . "]]></headlines>";
 			print "</rpc-reply>";
 			return;
 		}
-- 
cgit v1.2.3-54-g00ecf


From 22933e5e381f241365d833a7e1da6185816688bf Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Thu, 9 Sep 2010 22:01:35 +0400
Subject: more digest page improvements

---
 digest.js | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index f27f15f86..d641733f0 100644
--- a/digest.js
+++ b/digest.js
@@ -3,6 +3,16 @@ var last_feeds = [];
 var _active_feed_id = false;
 var _active_feed_offset = false;
 
+function view(article_id) {
+	try {
+		new Effect.Fade('A-' + article_id, {duration : 0.3});
+
+		return true;
+	} catch (e) {
+		exception_error("view", e);
+	}
+}
+
 function viewfeed(feed_id, offset) {
 	try {
 
@@ -108,9 +118,11 @@ function add_headline_entry(article, feed) {
 		if (article.has_icon) 
 			icon_part = "<img src='icons/" + article.feed_id + ".ico'/>";
 
-		var tmp_html = "<li>" + 
+		var tmp_html = "<li id=\"A-"+article.id+"\">" + 
 			icon_part +
-			"<a class='title'>" + article.title + "</a>" +
+			"<a target=\"_blank\" href=\""+article.link+"\""+
+		  		"onclick=\"return view("+article.id+")\" class='title'>" + 
+				article.title + "</a>" +
 			"<div class='body'><div class='excerpt'>" + article.excerpt + "</div>" +
 			"<div class='info'><a>" + feed.title + "</a> " + " @ " + 
 				new Date(article.updated * 1000) + "</div>" +
@@ -153,9 +165,9 @@ function digest_update(transport) {
 				add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id));
 			}
 
-			$('headlines-content').innerHTML += "<li>" +
-				"<div class='body'><a href=\"#\" onclick=\"viewfeed(false, 10)\">" +
-			  	__("More articles...") + "</a></div></li>";
+//			$('headlines-content').innerHTML += "<li>" +
+//				"<div class='body'><a href=\"#\" onclick=\"viewfeed(false, 10)\">" +
+//			  	__("More articles...") + "</a></div></li>";
 
 			new Effect.Appear('headlines-content');
 
-- 
cgit v1.2.3-54-g00ecf


From 118e9399b7896472af1f3e3c349c35a9a94072b1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Fri, 10 Sep 2010 13:59:21 +0400
Subject: more digest page improvements

---
 digest.css                 |  17 ++++++
 digest.js                  | 129 ++++++++++++++++++++++++++++++++++++++++-----
 images/digest_checkbox.png | Bin 0 -> 244 bytes
 modules/backend-rpc.php    |   2 +-
 4 files changed, 134 insertions(+), 14 deletions(-)
 create mode 100755 images/digest_checkbox.png

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index 3c770b765..f82bd54cd 100644
--- a/digest.css
+++ b/digest.css
@@ -137,6 +137,13 @@ a:hover {
 #headlines {
 	padding : 5px;
 	font-size : 14px;
+	max-width : 65%;
+}
+
+#headlines ul#headlines-content img.digest-check {
+	float : right;
+	cursor : pointer;
+
 }
 
 #headlines ul#headlines-content img {
@@ -159,6 +166,10 @@ a:hover {
 	clear : left;
 }
 
+#headlines ul#headlines-content li:hover {
+	background : #fafafa;
+}
+
 #headlines ul#headlines-content a.title {
 	font-weight : bold;
 	font-size : 16px;
@@ -166,10 +177,16 @@ a:hover {
 
 #headlines ul#headlines-content div.excerpt {
 	color : #404040;
+	cursor : pointer;
+}
+
+#headlines ul#headlines-content div.content {
+	color : #404040;
 }
 
 #headlines ul#headlines-content div.body {
 	margin-left : 21px;
+	/*margin-left : 42px;*/
 }
 
 #headlines ul#headlines-content div.info {
diff --git a/digest.js b/digest.js
index d641733f0..01f96a54e 100644
--- a/digest.js
+++ b/digest.js
@@ -2,12 +2,81 @@ var last_feeds = [];
 
 var _active_feed_id = false;
 var _active_feed_offset = false;
+var _update_timeout = false;
 
-function view(article_id) {
+function zoom(article_id) {
 	try {
-		new Effect.Fade('A-' + article_id, {duration : 0.3});
+		var elem = $('A-' + article_id);
 
-		return true;
+		if (elem) {
+			var divs = elem.getElementsByTagName('DIV');
+			
+			for (var i = 0; i < divs.length; i++) {
+				if (divs[i].className == 'excerpt') 
+					Element.hide(divs[i]);
+
+				if (divs[i].className == 'content') 
+					Element.show(divs[i]);
+			}
+		}
+
+		var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id;
+
+		new Ajax.Request("backend.php",	{
+			parameters: query, 
+			onComplete: function(transport) {
+					window.clearTimeout(_update_timeout);
+					_update_timeout = window.setTimeout('update()', 1000);					
+				} });
+
+	} catch (e) {
+		exception_error("zoom", e);
+	}
+}
+
+function load_more() {
+	try {
+		var elem = $('MORE-PROMPT');
+
+		if (elem) {
+			elem.id = '';
+			Element.hide(elem);
+		}
+
+		viewfeed(_active_feed_id, _active_feed_offset + 10);
+	} catch (e) {
+		exception_error("load_more", e);
+	}
+}
+
+function update() {
+	try {
+		viewfeed(_active_feed_id, _active_feed_offset);
+	} catch (e) {
+		exception_error("update", e);
+	}
+}
+
+function view(article_id, dismiss_only) {
+	try {
+		var elem = $('A-' + article_id);
+
+		elem.id = '';
+
+		//new Effect.Fade(elem, {duration : 0.3});
+
+		Element.hide(elem);
+
+		var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id;
+
+		new Ajax.Request("backend.php",	{
+			parameters: query, 
+			onComplete: function(transport) {
+					window.clearTimeout(_update_timeout);
+					_update_timeout = window.setTimeout('update()', 1000);					
+				} });
+
+		return dismiss_only != true;
 	} catch (e) {
 		exception_error("view", e);
 	}
@@ -31,7 +100,7 @@ function viewfeed(feed_id, offset) {
 		new Ajax.Request("backend.php",	{
 			parameters: query, 
 			onComplete: function(transport) {
-				digest_update(transport);
+				digest_update(transport, feed_id);
 				_active_feed_id = feed_id;
 				_active_feed_offset = offset;
 				} });
@@ -41,6 +110,20 @@ function viewfeed(feed_id, offset) {
 	}
 }
 
+function find_article(articles, article_id) {
+	try {
+		for (var i = 0; i < articles.length; i++) {
+			if (articles[i].id == article_id)
+				return articles[i];
+		}
+
+		return false;
+
+	} catch (e) {
+		exception_error("find_article", e);
+	}
+}
+
 function find_feed(feeds, feed_id) {
 	try {
 		for (var i = 0; i < feeds.length; i++) {
@@ -120,10 +203,15 @@ function add_headline_entry(article, feed) {
 
 		var tmp_html = "<li id=\"A-"+article.id+"\">" + 
 			icon_part +
+			"<img title='Dismiss' onclick=\"view("+article.id+", true)\" class='digest-check' src='images/digest_checkbox.png'>" +
 			"<a target=\"_blank\" href=\""+article.link+"\""+
 		  		"onclick=\"return view("+article.id+")\" class='title'>" + 
 				article.title + "</a>" +
-			"<div class='body'><div class='excerpt'>" + article.excerpt + "</div>" +
+			"<div class='body'>" + 
+			"<div title=\"Click to expand article\" onclick=\"zoom("+article.id+")\" class='excerpt'>" + 
+				article.excerpt + "</div>" +
+			"<div style='display : none' class='content'>" + 
+				article.content + "</div>" +
 			"<div class='info'><a>" + feed.title + "</a> " + " @ " + 
 				new Date(article.updated * 1000) + "</div>" +
 			"</div></li>";
@@ -135,7 +223,7 @@ function add_headline_entry(article, feed) {
 	}
 }
 
-function digest_update(transport) {
+function digest_update(transport, feed_id) {
 	try {
 		var feeds = transport.responseXML.getElementsByTagName('feeds')[0];
 		var headlines = transport.responseXML.getElementsByTagName('headlines')[0];
@@ -157,17 +245,32 @@ function digest_update(transport) {
 		if (headlines) {
 			headlines = eval("(" + headlines.firstChild.nodeValue + ")");
 
-			$('headlines-content').innerHTML = "";
+			if (_active_feed_id != feed_id) 
+				$('headlines-content').innerHTML = "";
+
+			//Element.hide('headlines-content');
+			
+			var pr = $('MORE-PROMPT');
 
-			Element.hide('headlines-content');
+			if (pr) {
+				pr.id = '';
+				Element.hide(pr);
+			}
 
 			for (var i = 0; i < headlines.length; i++) {
-				add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id));
+				var elem = $('A-' + headlines[i].id);
+				
+				if (elem && Element.visible(elem)) {
+
+
+				} else {
+					add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id));
+				}
 			}
 
-//			$('headlines-content').innerHTML += "<li>" +
-//				"<div class='body'><a href=\"#\" onclick=\"viewfeed(false, 10)\">" +
-//			  	__("More articles...") + "</a></div></li>";
+			$('headlines-content').innerHTML += "<li id='MORE-PROMPT'>" +
+				"<div class='body'><a href=\"#\" onclick=\"load_more()\">" +
+			  	__("More articles...") + "</a></div></li>";
 
 			new Effect.Appear('headlines-content');
 
@@ -184,7 +287,7 @@ function digest_init() {
 		new Ajax.Request("backend.php",	{
 			parameters: "backend.php?op=rpc&subop=digest-init",
 			onComplete: function(transport) {
-				digest_update(transport);
+				digest_update(transport, -4);
 				window.setTimeout('viewfeed(-4)', 100);
 				} });
 
diff --git a/images/digest_checkbox.png b/images/digest_checkbox.png
new file mode 100755
index 000000000..c5e4b98ea
Binary files /dev/null and b/images/digest_checkbox.png differ
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 80eda7c3f..70b690111 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -989,7 +989,7 @@
 			print "<rpc-reply>";
 
 			$headlines = api_get_headlines($link, $feed_id, 10, $offset,
-				'', ($feed_id == -4), true, false, "unread", "updated DESC");
+				'', ($feed_id == -4), true, true, "unread", "updated DESC");
 
 			//function api_get_headlines($link, $feed_id, $limit, $offset,
 			//		$filter, $is_cat, $show_excerpt, $show_content, $view_mode) {
-- 
cgit v1.2.3-54-g00ecf


From c524d7e6825b9127630963ebb641af75387a34a3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Fri, 10 Sep 2010 15:47:15 +0400
Subject: more digest page improvements

---
 digest.css |  4 ++++
 digest.js  |  3 ++-
 digest.php | 10 +++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index f82bd54cd..30009a68a 100644
--- a/digest.css
+++ b/digest.css
@@ -196,5 +196,9 @@ a:hover {
 
 #headlines ul#headlines-content div.info a {
 	color : gray;
+	font-weight : bold;
 }
 
+#headlines ul#headlines-content div.info a:hover {
+	color : #659a4c;
+}
diff --git a/digest.js b/digest.js
index 01f96a54e..8b1a8f0ce 100644
--- a/digest.js
+++ b/digest.js
@@ -212,7 +212,8 @@ function add_headline_entry(article, feed) {
 				article.excerpt + "</div>" +
 			"<div style='display : none' class='content'>" + 
 				article.content + "</div>" +
-			"<div class='info'><a>" + feed.title + "</a> " + " @ " + 
+			"<div class='info'><a href=\#\" onclick=\"viewfeed("+feed.id+")\">" + 
+				feed.title + "</a> " + " @ " + 
 				new Date(article.updated * 1000) + "</div>" +
 			"</div></li>";
 
diff --git a/digest.php b/digest.php
index 94489eb0b..7b1bfd23d 100644
--- a/digest.php
+++ b/digest.php
@@ -64,11 +64,11 @@
 
 	</div>
 
-	Tiny Tiny Digest
+	<?php echo __('Tiny Tiny RSS') ?>
 
 	</div>
 	<div id="content">
-		<div id="title">
+		<!-- <div id="title">
 			<div id="search">
 				<input name="search" type="search"></input>
 				<button>Search</button>
@@ -82,16 +82,16 @@
 			<em>TODO</em>
 
 			<div id="latest-content"> </div>
-		</div>
+		</div> -->
 
 		<div id="feeds">
-			<h1>feeds</h1>
+			<h1><?php echo __('feeds') ?></h1>
 
 			<ul id="feeds-content"> </ul>
 		</div>
 
 		<div id="headlines">
-			<h1>headlines</h1>
+			<h1><?php echo __('headlines') ?></h1>
 
 			<ul id="headlines-content"> </ul>
 		</div>
-- 
cgit v1.2.3-54-g00ecf


From 6361fd20fd89ba4bbda585066550b16a058eed43 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Fri, 10 Sep 2010 17:45:59 +0400
Subject: rudimentary support for starring/publishing articles in digest

---
 digest.css |   4 ++-
 digest.js  | 118 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 121 insertions(+), 1 deletion(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index 30009a68a..b0d17b4fc 100644
--- a/digest.css
+++ b/digest.css
@@ -141,9 +141,11 @@ a:hover {
 }
 
 #headlines ul#headlines-content img.digest-check {
-	float : right;
 	cursor : pointer;
+}
 
+#headlines ul#headlines-content div.digest-check {
+	float : right;
 }
 
 #headlines ul#headlines-content img {
diff --git a/digest.js b/digest.js
index 8b1a8f0ce..2a886a89b 100644
--- a/digest.js
+++ b/digest.js
@@ -203,7 +203,11 @@ function add_headline_entry(article, feed) {
 
 		var tmp_html = "<li id=\"A-"+article.id+"\">" + 
 			icon_part +
+			"<div class='digest-check'>" +
+			"<img title='Set starred' onclick=\"toggleMark(this, "+article.id+")\" src='images/mark_unset.png'>" +
+			"<img title='Set published' onclick=\"togglePub(this, "+article.id+")\" src='images/pub_unset.png'>" +
 			"<img title='Dismiss' onclick=\"view("+article.id+", true)\" class='digest-check' src='images/digest_checkbox.png'>" +
+			"</div>" + 
 			"<a target=\"_blank\" href=\""+article.link+"\""+
 		  		"onclick=\"return view("+article.id+")\" class='title'>" + 
 				article.title + "</a>" +
@@ -296,3 +300,117 @@ function digest_init() {
 		exception_error("digest_init", e);
 	}
 }
+
+function tMark_afh_off(effect) {
+	try {
+		var elem = effect.effects[0].element;
+
+		console.log("tMark_afh_off : " + elem.id);
+
+		if (elem) {
+			elem.src = elem.src.replace("mark_set", "mark_unset");
+			elem.alt = __("Star article");
+			Element.show(elem);
+		}
+
+	} catch (e) {
+		exception_error("tMark_afh_off", e);
+	}
+}
+
+function tPub_afh_off(effect) {
+	try {
+		var elem = effect.effects[0].element;
+
+		console.log("tPub_afh_off : " + elem.id);
+
+		if (elem) {
+			elem.src = elem.src.replace("pub_set", "pub_unset");
+			elem.alt = __("Publish article");
+			Element.show(elem);
+		}
+
+	} catch (e) {
+		exception_error("tPub_afh_off", e);
+	}
+}
+
+function toggleMark(mark_img, id) {
+
+	try {
+
+		var query = "?op=rpc&id=" + id + "&subop=mark";
+	
+		query = query + "&afid=" + _active_feed_id;
+		query = query + "&omode=c";
+
+		if (!mark_img) return;
+
+		var vfeedu = $("FEEDU--1");
+		var crow = $("RROW-" + id);
+	
+		if (mark_img.src.match("mark_unset")) {
+			mark_img.src = mark_img.src.replace("mark_unset", "mark_set");
+			mark_img.alt = __("Unstar article");
+			query = query + "&mark=1";
+		} else {
+			mark_img.alt = __("Please wait...");
+			query = query + "&mark=0";
+	
+			mark_img.src = mark_img.src.replace("mark_set", "mark_unset");
+			mark_img.alt = __("Star article");
+		}
+
+		new Ajax.Request("backend.php", {
+			parameters: query,
+			onComplete: function(transport) { 
+				//
+			} });
+
+	} catch (e) {
+		exception_error("toggleMark", e);
+	}
+}
+
+function togglePub(mark_img, id, note) {
+
+	try {
+
+		var query = "?op=rpc&id=" + id + "&subop=publ";
+	
+		query = query + "&afid=" + _active_feed_id;
+
+		if (note != undefined) {
+			query = query + "&note=" + param_escape(note);
+		} else {
+			query = query + "&note=undefined";
+		}
+
+		query = query + "&omode=c";
+
+		if (!mark_img) return;
+
+		if (mark_img.src.match("pub_unset") || note != undefined) {
+			mark_img.src = mark_img.src.replace("pub_unset", "pub_set");
+			mark_img.alt = __("Unpublish article");
+			query = query + "&pub=1";
+
+		} else {
+			mark_img.alt = __("Please wait...");
+			query = query + "&pub=0";
+	
+			mark_img.src = mark_img.src.replace("pub_set", "pub_unset");
+			mark_img.alt = __("Publish article");
+		}
+
+		new Ajax.Request("backend.php", {
+			parameters: query,
+			onComplete: function(transport) { 
+				//
+			} });
+
+	} catch (e) {
+		exception_error("togglePub", e);
+	}
+}
+
-- 
cgit v1.2.3-54-g00ecf


From 11a7a966066942a263e11ecd546dc7c101f00cc7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sat, 11 Sep 2010 11:33:47 +0400
Subject: more digest page improvements

---
 digest.css | 19 ++++++++++++++++++-
 digest.js  | 23 ++++++++++++++++++++---
 2 files changed, 38 insertions(+), 4 deletions(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index b0d17b4fc..b94044f98 100644
--- a/digest.css
+++ b/digest.css
@@ -116,6 +116,19 @@ a:hover {
 
 #feeds ul#feeds-content li {
 	margin : 0px 0px 2px 0px;
+	padding : 2px;
+}
+
+#feeds ul#feeds-content li.selected {
+	background : #f0f0f0;
+}
+
+#feeds ul#feeds-content li.selected a {
+	color : #404040;
+}
+
+#feeds ul#feeds-content li.selected a:hover {
+	color : #659a4c;
 }
 
 #feeds ul#feeds-content {
@@ -148,7 +161,7 @@ a:hover {
 	float : right;
 }
 
-#headlines ul#headlines-content img {
+#headlines ul#headlines-content img.icon {
 	width : 16px;
 	height : 16px;
 	vertical-align : middle;
@@ -186,6 +199,10 @@ a:hover {
 	color : #404040;
 }
 
+#headlines ul#headlines-content div.content img {
+	max-width : 75%;
+}
+
 #headlines ul#headlines-content div.body {
 	margin-left : 21px;
 	/*margin-left : 42px;*/
diff --git a/digest.js b/digest.js
index 2a886a89b..0e567193f 100644
--- a/digest.js
+++ b/digest.js
@@ -4,6 +4,22 @@ var _active_feed_id = false;
 var _active_feed_offset = false;
 var _update_timeout = false;
 
+function mark_selected_feed(feed_id) {
+	try {
+		var feeds = $("feeds-content").getElementsByTagName("LI");
+
+		for (var i = 0; i < feeds.length; i++) {
+			if (feeds[i].id == "F-" + feed_id)
+				feeds[i].className = "selected";
+			else
+				feeds[i].className = "";
+		}
+
+	} catch (e) {
+		exception_error("mark_selected_feed", e);
+	}
+}
+
 function zoom(article_id) {
 	try {
 		var elem = $('A-' + article_id);
@@ -103,7 +119,8 @@ function viewfeed(feed_id, offset) {
 				digest_update(transport, feed_id);
 				_active_feed_id = feed_id;
 				_active_feed_offset = offset;
-				} });
+				mark_selected_feed(feed_id);
+			} });
 
 	} catch (e) {
 		exception_error("view", e);
@@ -169,7 +186,7 @@ function add_feed_entry(feed) {
 
 		icon_part = "<img src='" + get_feed_icon(feed) + "'/>";
 
-		var tmp_html = "<li>" + 
+		var tmp_html = "<li id=\"F-"+feed.id+"\">" + 
 			icon_part +
 			"<a href=\"#\" onclick=\"viewfeed("+feed.id+")\">" + feed.title +
 			"<div class='unread-ctr'>" + feed.unread + "</div>" +	
@@ -199,7 +216,7 @@ function add_headline_entry(article, feed) {
 		var icon_part = "";
 
 		if (article.has_icon) 
-			icon_part = "<img src='icons/" + article.feed_id + ".ico'/>";
+			icon_part = "<img class='icon' src='icons/" + article.feed_id + ".ico'/>";
 
 		var tmp_html = "<li id=\"A-"+article.id+"\">" + 
 			icon_part +
-- 
cgit v1.2.3-54-g00ecf


From d5d5632952914611c0ddf93959034aa1e7d87c21 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sat, 11 Sep 2010 15:25:47 +0400
Subject: code cleanup

---
 digest.css    |   5 +-
 digest.js     | 188 +++++++++++++++++++++++++++++++++++++++-------------------
 digest.php    |   2 +-
 functions.php |   1 -
 4 files changed, 130 insertions(+), 66 deletions(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index b94044f98..b500a47e7 100644
--- a/digest.css
+++ b/digest.css
@@ -117,6 +117,7 @@ a:hover {
 #feeds ul#feeds-content li {
 	margin : 0px 0px 2px 0px;
 	padding : 2px;
+	clear : both;
 }
 
 #feeds ul#feeds-content li.selected {
@@ -181,10 +182,6 @@ a:hover {
 	clear : left;
 }
 
-#headlines ul#headlines-content li:hover {
-	background : #fafafa;
-}
-
 #headlines ul#headlines-content a.title {
 	font-weight : bold;
 	font-size : 16px;
diff --git a/digest.js b/digest.js
index 0e567193f..38e2224bb 100644
--- a/digest.js
+++ b/digest.js
@@ -4,7 +4,23 @@ var _active_feed_id = false;
 var _active_feed_offset = false;
 var _update_timeout = false;
 
-function mark_selected_feed(feed_id) {
+function catchup_article(article_id, callback) {
+	try {
+		var query = "?op=rpc&subop=catchupSelected" +
+			"&cmode=0&ids=" + article_id;
+
+		new Ajax.Request("backend.php",	{
+			parameters: query, 
+			onComplete: function(transport) {
+				if (callback) callback(transport);
+			} });
+
+	} catch (e) {
+		exception_error("catchup_article", e);
+	}
+}
+
+function set_selected_feed(feed_id) {
 	try {
 		var feeds = $("feeds-content").getElementsByTagName("LI");
 
@@ -15,6 +31,8 @@ function mark_selected_feed(feed_id) {
 				feeds[i].className = "";
 		}
 
+		_active_feed_id = feed_id;
+
 	} catch (e) {
 		exception_error("mark_selected_feed", e);
 	}
@@ -36,14 +54,8 @@ function zoom(article_id) {
 			}
 		}
 
-		var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id;
-
-		new Ajax.Request("backend.php",	{
-			parameters: query, 
-			onComplete: function(transport) {
-					window.clearTimeout(_update_timeout);
-					_update_timeout = window.setTimeout('update()', 1000);					
-				} });
+		catchup_article(article_id, 
+			function() { update(); });
 
 	} catch (e) {
 		exception_error("zoom", e);
@@ -52,13 +64,6 @@ function zoom(article_id) {
 
 function load_more() {
 	try {
-		var elem = $('MORE-PROMPT');
-
-		if (elem) {
-			elem.id = '';
-			Element.hide(elem);
-		}
-
 		viewfeed(_active_feed_id, _active_feed_offset + 10);
 	} catch (e) {
 		exception_error("load_more", e);
@@ -67,30 +72,42 @@ function load_more() {
 
 function update() {
 	try {
-		viewfeed(_active_feed_id, _active_feed_offset);
+		console.log('updating feeds...');
+
+		window.clearTimeout(_update_timeout);
+
+		new Ajax.Request("backend.php",	{
+			parameters: "?op=rpc&subop=digest-init",
+			onComplete: function(transport) {
+				parse_feeds(transport);
+				set_selected_feed(_active_feed_id);
+				} });
+
+		_update_timeout = window.setTimeout('update()', 5*1000);
 	} catch (e) {
 		exception_error("update", e);
 	}
 }
 
-function view(article_id, dismiss_only) {
+function remove_headline_entry(article_id) {
 	try {
 		var elem = $('A-' + article_id);
 
-		elem.id = '';
-
-		//new Effect.Fade(elem, {duration : 0.3});
+		if (elem) {
+			elem.parentNode.removeChild(elem);
+		}
 
-		Element.hide(elem);
+	} catch (e) {
+		exception_error("remove_headline_entry", e);
+	}
+}
 
-		var query = "backend.php?op=rpc&subop=digest-mark&article_id=" + article_id;
+function view(article_id, dismiss_only) {
+	try {
+		remove_headline_entry(article_id);
 
-		new Ajax.Request("backend.php",	{
-			parameters: query, 
-			onComplete: function(transport) {
-					window.clearTimeout(_update_timeout);
-					_update_timeout = window.setTimeout('update()', 1000);					
-				} });
+		catchup_article(article_id, 
+			function() { update(); });
 
 		return dismiss_only != true;
 	} catch (e) {
@@ -103,23 +120,21 @@ function viewfeed(feed_id, offset) {
 
 		if (!feed_id) feed_id = _active_feed_id;
 
-		if (!offset) 
+		if (!offset) {
 			offset = 0;
-		else
+		} else {
 			offset = _active_feed_offset + offset;
+		}
 
 		var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id +
 				"&offset=" + offset;
 
-		console.log(query);
-
 		new Ajax.Request("backend.php",	{
 			parameters: query, 
 			onComplete: function(transport) {
-				digest_update(transport, feed_id);
-				_active_feed_id = feed_id;
+				parse_headlines(transport, offset == 0);
+				set_selected_feed(feed_id);
 				_active_feed_offset = offset;
-				mark_selected_feed(feed_id);
 			} });
 
 	} catch (e) {
@@ -175,6 +190,8 @@ function get_feed_icon(feed) {
 		if (feed.id < -10) 
 			return 'images/label.png';
 
+		return 'images/blank_icon.gif';
+
 	} catch (e) {
 		exception_error("get_feed_icon", e);
 	}
@@ -199,24 +216,12 @@ function add_feed_entry(feed) {
 	}
 }
 
-function add_latest_entry(article, feed) {
-	try {
-		
-
-		//$("latest-content").innerHTML += "bbb";
-
-	} catch (e) {
-		exception_error("add_latest_entry", e);
-	}
-}
-
 function add_headline_entry(article, feed) {
 	try {
 
 		var icon_part = "";
 
-		if (article.has_icon) 
-			icon_part = "<img class='icon' src='icons/" + article.feed_id + ".ico'/>";
+		icon_part = "<img class='icon' src='" + get_feed_icon(feed) + "'/>";
 
 		var tmp_html = "<li id=\"A-"+article.id+"\">" + 
 			icon_part +
@@ -245,7 +250,66 @@ function add_headline_entry(article, feed) {
 	}
 }
 
-function digest_update(transport, feed_id) {
+function parse_feeds(transport) {
+	try {
+
+		var feeds = transport.responseXML.getElementsByTagName('feeds')[0];
+
+		if (feeds) {
+			feeds = eval("(" + feeds.firstChild.nodeValue + ")");
+
+			last_feeds = feeds;
+
+			$('feeds-content').innerHTML = "";
+
+			for (var i = 0; i < feeds.length; i++) {
+				add_feed_entry(feeds[i]);
+			}
+		}
+
+	} catch (e) {
+		exception_error("parse_feeds", e);
+	}
+}
+
+function parse_headlines(transport, replace) {
+	try {
+		var headlines = transport.responseXML.getElementsByTagName('headlines')[0];
+
+		if (headlines) {
+			headlines = eval("(" + headlines.firstChild.nodeValue + ")");
+
+			if (replace) $('headlines-content').innerHTML = '';
+
+			var pr = $('MORE-PROMPT');
+
+			if (pr) pr.parentNode.removeChild(pr);
+
+			for (var i = 0; i < headlines.length; i++) {
+				
+				if (!$('A-' + headlines[i].id)) {
+					add_headline_entry(headlines[i], 
+							find_feed(last_feeds, headlines[i].feed_id));
+				}
+			}
+
+			if (pr) {
+				$('headlines-content').appendChild(pr);
+			} else {
+				$('headlines-content').innerHTML += "<li id='MORE-PROMPT'>" +
+					"<div class='body'><a href=\"javascript:load_more()\">" +
+				  	__("More articles...") + "</a></div></li>";
+			}
+
+			new Effect.Appear('headlines-content');
+		}
+
+	} catch (e) {
+		exception_error("parse_headlines", e);
+	}
+}
+
+/*function digest_update(transport, feed_id, offset) {
 	try {
 		var feeds = transport.responseXML.getElementsByTagName('feeds')[0];
 		var headlines = transport.responseXML.getElementsByTagName('headlines')[0];
@@ -267,11 +331,9 @@ function digest_update(transport, feed_id) {
 		if (headlines) {
 			headlines = eval("(" + headlines.firstChild.nodeValue + ")");
 
-			if (_active_feed_id != feed_id) 
+			if (_active_feed_id != feed_id || !offset) 
 				$('headlines-content').innerHTML = "";
 
-			//Element.hide('headlines-content');
-			
 			var pr = $('MORE-PROMPT');
 
 			if (pr) {
@@ -283,7 +345,8 @@ function digest_update(transport, feed_id) {
 				var elem = $('A-' + headlines[i].id);
 				
 				if (elem && Element.visible(elem)) {
-
+					if (!headlines[i].unread)
+						remove_headline_entry(headlines[i].id);
 
 				} else {
 					add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id));
@@ -295,22 +358,30 @@ function digest_update(transport, feed_id) {
 			  	__("More articles...") + "</a></div></li>";
 
 			new Effect.Appear('headlines-content');
+		}
 
+		if (feed_id != undefined) {
+			_active_feed_id = feed_id;
 		}
 
+		if (offset != undefined) _active_feed_offset = offset;
+
+		mark_selected_feed(_active_feed_id);
+
 	} catch (e) {
 		exception_error("digest_update", e);
 	}
-	}
+} */
 
-function digest_init() {
+function init() {
 	try {
 		
 		new Ajax.Request("backend.php",	{
 			parameters: "backend.php?op=rpc&subop=digest-init",
 			onComplete: function(transport) {
-				digest_update(transport, -4);
+				parse_feeds(transport);
 				window.setTimeout('viewfeed(-4)', 100);
+				_update_timeout = window.setTimeout('update()', 5*1000);
 				} });
 
 	} catch (e) {
@@ -363,9 +434,6 @@ function toggleMark(mark_img, id) {
 
 		if (!mark_img) return;
 
-		var vfeedu = $("FEEDU--1");
-		var crow = $("RROW-" + id);
-	
 		if (mark_img.src.match("mark_unset")) {
 			mark_img.src = mark_img.src.replace("mark_unset", "mark_set");
 			mark_img.alt = __("Unstar article");
diff --git a/digest.php b/digest.php
index 7b1bfd23d..467f6c286 100644
--- a/digest.php
+++ b/digest.php
@@ -45,7 +45,7 @@
 
 	<script type="text/javascript">
 		Event.observe(window, 'load', function() {
-			digest_init();
+			init();
 		});
 	</script>
 </head>
diff --git a/functions.php b/functions.php
index 735fd2c73..e53995335 100644
--- a/functions.php
+++ b/functions.php
@@ -6782,7 +6782,6 @@
 						"title" => $line["title"],
 						"link" => $line["link"],
 						"feed_id" => $line["feed_id"],
-						"has_icon" => feed_has_icon($line["feed_id"])
 					);
 
 				if ($show_excerpt) {
-- 
cgit v1.2.3-54-g00ecf


From e0cebf2a81f8ce20656c210c97b6751f3166b554 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 10:15:40 +0400
Subject: sort feeds list by unread; support fatal error messages and login
 redirects

---
 digest.js | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index 38e2224bb..fffdf16ea 100644
--- a/digest.js
+++ b/digest.js
@@ -79,6 +79,7 @@ function update() {
 		new Ajax.Request("backend.php",	{
 			parameters: "?op=rpc&subop=digest-init",
 			onComplete: function(transport) {
+				fatal_error_check(transport);
 				parse_feeds(transport);
 				set_selected_feed(_active_feed_id);
 				} });
@@ -132,6 +133,7 @@ function viewfeed(feed_id, offset) {
 		new Ajax.Request("backend.php",	{
 			parameters: query, 
 			onComplete: function(transport) {
+				fatal_error_check(transport);
 				parse_headlines(transport, offset == 0);
 				set_selected_feed(feed_id);
 				_active_feed_offset = offset;
@@ -258,6 +260,19 @@ function parse_feeds(transport) {
 		if (feeds) {
 			feeds = eval("(" + feeds.firstChild.nodeValue + ")");
 
+			feeds.sort( function (a,b) 
+				{ 
+					if (b.unread != a.unread)
+						return (b.unread - a.unread) 
+					else
+						if (a.title > b.title)
+							return 1;
+						else if (a.title < b.title)
+							return -1;
+						else
+							return 0;					
+				});
+
 			last_feeds = feeds;
 
 			$('feeds-content').innerHTML = "";
@@ -499,3 +514,45 @@ function togglePub(mark_img, id, note) {
 	}
 }
 
+function fatal_error(code, msg) {
+	try {	
+
+		if (code == 6) {
+			window.location.href = "digest.php";
+		} else if (code == 5) {
+			window.location.href = "update.php";
+		} else {
+	
+			if (msg == "") msg = "Unknown error";
+
+			console.error("Fatal error: " + code + "\n" + 
+				msg);
+			
+		}
+
+	} catch (e) {
+		exception_error("fatalError", e);
+	}
+}
+
+function fatal_error_check(transport) {
+	try {
+		if (transport.responseXML) {
+			var error = transport.responseXML.getElementsByTagName("error")[0];
+
+			if (error) {
+				var code = error.getAttribute("error-code");
+				var msg = error.getAttribute("error-msg");
+				if (code != 0) {
+					fatal_error(code, msg);
+					return false;
+				}
+			}
+		}
+	} catch (e) {
+		exception_error("fatal_error_check", e);
+	}
+	return true;
+}
+
+
-- 
cgit v1.2.3-54-g00ecf


From c1b5cd23e068d269a2736ac4759fbaa09243f4dd Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 11:05:03 +0400
Subject: digest: support feed catchup

---
 digest.css              |   5 ++
 digest.js               | 194 ++++++++++++++++++++++++++++++------------------
 modules/backend-rpc.php |  14 ++++
 3 files changed, 139 insertions(+), 74 deletions(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index b500a47e7..2c30b0eb8 100644
--- a/digest.css
+++ b/digest.css
@@ -109,6 +109,11 @@ a:hover {
 	margin-right : 5px;
 }
 
+#feeds ul#feeds-content div.unread-ctr img.dismiss {
+	margin-right : 0px;
+	cursor : pointer;
+}
+
 #feeds ul#feeds-content div.unread-ctr {
 	color : gray;
 	float : right;
diff --git a/digest.js b/digest.js
index fffdf16ea..a3cbb4879 100644
--- a/digest.js
+++ b/digest.js
@@ -3,6 +3,36 @@ var last_feeds = [];
 var _active_feed_id = false;
 var _active_feed_offset = false;
 var _update_timeout = false;
+var _feedlist_expanded = false;
+
+function catchup_feed(feed_id, callback) {
+	try {
+
+		var fn = find_feed(last_feeds, feed_id).title;
+
+		if (confirm(__("Mark all articles in %s as read?").replace("%s", fn))) {
+
+			var is_cat = "";
+
+			if (feed_id == -4) is_cat = "true";
+
+			var query = "?op=rpc&subop=catchupFeed&feed_id=" + 
+				feed_id + "&is_cat=" + is_cat;
+
+			new Ajax.Request("backend.php",	{
+				parameters: query, 
+				onComplete: function(transport) {
+					if (callback) callback(transport);
+	
+					update();
+				} });
+		}
+
+	} catch (e) {
+		exception_error("catchup_article", e);
+	}
+}
+
 
 function catchup_article(article_id, callback) {
 	try {
@@ -205,10 +235,14 @@ function add_feed_entry(feed) {
 
 		icon_part = "<img src='" + get_feed_icon(feed) + "'/>";
 
-		var tmp_html = "<li id=\"F-"+feed.id+"\">" + 
+		var tmp_html = "<li id=\"F-"+feed.id+"\" " +
+				"onmouseover=\"feed_mi(this)\" onmouseout=\"feed_mo(this)\">" + 
 			icon_part +
-			"<a href=\"#\" onclick=\"viewfeed("+feed.id+")\">" + feed.title +
-			"<div class='unread-ctr'>" + feed.unread + "</div>" +	
+			"<a href=\"#\" onclick=\"viewfeed("+feed.id+")\">" + feed.title + "</a>" +
+			"<div class='unread-ctr'>" + 
+				"<img onclick=\"catchup_feed("+feed.id+")\" title=\"Dismiss\" class=\"dismiss\" style='display : none' src=\"images/digest_checkbox.png\">" +
+				"<span class=\"unread\">" + feed.unread + "</span>" + 
+			"</div>" +	
 			"</li>";
 
 		$("feeds-content").innerHTML += tmp_html;
@@ -252,9 +286,48 @@ function add_headline_entry(article, feed) {
 	}
 }
 
+function expand_feeds() {
+	try {
+		_feedlist_expanded = true;
+
+		redraw_feedlist(last_feeds);
+
+	} catch (e) {
+		exception_error("expand_feeds", e);
+	}
+}
+
+function redraw_feedlist(feeds) {
+	try {
+
+		$('feeds-content').innerHTML = "";
+
+		var limit = 10;
+
+		if (_feedlist_expanded) limit = feeds.length;
+
+		for (var i = 0; i < Math.min(limit, feeds.length); i++) {
+			add_feed_entry(feeds[i]);
+		}
+
+		if (feeds.length > limit) {
+			$('feeds-content').innerHTML += "<li id='F-MORE-PROMPT'>" +
+				"<img src='images/blank_icon.gif'>" + 
+				"<a href=\"#\" onclick=\"expand_feeds()\">" +
+				__("%d more...").replace("%d", feeds.length-10) + 
+				"</a>" + "</li>";
+		}
+
+	} catch (e) {
+		exception_error("redraw_feedlist", e);
+	}
+}
+
 function parse_feeds(transport) {
 	try {
 
+		if (!transport.responseXML) return;
+
 		var feeds = transport.responseXML.getElementsByTagName('feeds')[0];
 
 		if (feeds) {
@@ -275,11 +348,7 @@ function parse_feeds(transport) {
 
 			last_feeds = feeds;
 
-			$('feeds-content').innerHTML = "";
-
-			for (var i = 0; i < feeds.length; i++) {
-				add_feed_entry(feeds[i]);
-			}
+			redraw_feedlist(feeds);
 		}
 
 	} catch (e) {
@@ -289,6 +358,8 @@ function parse_feeds(transport) {
 
 function parse_headlines(transport, replace) {
 	try {
+		if (!transport.responseXML) return;
+
 		var headlines = transport.responseXML.getElementsByTagName('headlines')[0];
 
 		if (headlines) {
@@ -296,7 +367,7 @@ function parse_headlines(transport, replace) {
 
 			if (replace) $('headlines-content').innerHTML = '';
 
-			var pr = $('MORE-PROMPT');
+			var pr = $('H-MORE-PROMPT');
 
 			if (pr) pr.parentNode.removeChild(pr);
 
@@ -311,7 +382,7 @@ function parse_headlines(transport, replace) {
 			if (pr) {
 				$('headlines-content').appendChild(pr);
 			} else {
-				$('headlines-content').innerHTML += "<li id='MORE-PROMPT'>" +
+				$('headlines-content').innerHTML += "<li id='H-MORE-PROMPT'>" +
 					"<div class='body'><a href=\"javascript:load_more()\">" +
 				  	__("More articles...") + "</a></div></li>";
 			}
@@ -324,70 +395,6 @@ function parse_headlines(transport, replace) {
 	}
 }
 
-/*function digest_update(transport, feed_id, offset) {
-	try {
-		var feeds = transport.responseXML.getElementsByTagName('feeds')[0];
-		var headlines = transport.responseXML.getElementsByTagName('headlines')[0];
-
-		if (feeds) {
-			feeds = eval("(" + feeds.firstChild.nodeValue + ")");
-
-			last_feeds = feeds;
-
-			$('feeds-content').innerHTML = "";
-
-			for (var i = 0; i < feeds.length; i++) {
-				add_feed_entry(feeds[i]);
-			}
-		} else {
-			feeds = last_feeds;
-		}
-
-		if (headlines) {
-			headlines = eval("(" + headlines.firstChild.nodeValue + ")");
-
-			if (_active_feed_id != feed_id || !offset) 
-				$('headlines-content').innerHTML = "";
-
-			var pr = $('MORE-PROMPT');
-
-			if (pr) {
-				pr.id = '';
-				Element.hide(pr);
-			}
-
-			for (var i = 0; i < headlines.length; i++) {
-				var elem = $('A-' + headlines[i].id);
-				
-				if (elem && Element.visible(elem)) {
-					if (!headlines[i].unread)
-						remove_headline_entry(headlines[i].id);
-
-				} else {
-					add_headline_entry(headlines[i], find_feed(feeds, headlines[i].feed_id));
-				}
-			}
-
-			$('headlines-content').innerHTML += "<li id='MORE-PROMPT'>" +
-				"<div class='body'><a href=\"#\" onclick=\"load_more()\">" +
-			  	__("More articles...") + "</a></div></li>";
-
-			new Effect.Appear('headlines-content');
-		}
-
-		if (feed_id != undefined) {
-			_active_feed_id = feed_id;
-		}
-
-		if (offset != undefined) _active_feed_offset = offset;
-
-		mark_selected_feed(_active_feed_id);
-
-	} catch (e) {
-		exception_error("digest_update", e);
-	}
-} */
-
 function init() {
 	try {
 		
@@ -555,4 +562,43 @@ function fatal_error_check(transport) {
 	return true;
 }
 
+function feed_mi(elem) {
+	try {
+		var imgs = elem.getElementsByTagName('IMG');
+		var spans = elem.getElementsByTagName('SPAN');
+
+		for (var i = 0; i < imgs.length; i++) {
+			if (imgs[i].className == "dismiss")
+				Element.show(imgs[i]);
+		}
+
+		for (var i = 0; i < spans.length; i++) {
+			if (spans[i].className == "unread")
+				Element.hide(spans[i]);
+		}
+
+
+	} catch (e) {
+		exception_error("feed_mi", e);
+	}
+}
+
+function feed_mo(elem) {
+	try {
+		var imgs = elem.getElementsByTagName('IMG');
+		var spans = elem.getElementsByTagName('SPAN');
+
+		for (var i = 0; i < imgs.length; i++) {
+			if (imgs[i].className == "dismiss")
+				Element.hide(imgs[i]);
+		}
+
+		for (var i = 0; i < spans.length; i++) {
+			if (spans[i].className == "unread")
+				Element.show(spans[i]);
+		}
 
+	} catch (e) {
+		exception_error("feed_mo", e);
+	}
+}
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 70b690111..976fac15c 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -1029,6 +1029,20 @@
 			return;
 		}
 
+		if ($subop == "catchupFeed") {
+
+			$feed_id = db_escape_string($_REQUEST['feed_id']);
+			$is_cat = db_escape_string($_REQUEST['is_cat']);
+
+			print "<rpc-reply>";
+
+			catchup_feed($link, $feed_id, $is_cat);
+
+			print "</rpc-reply>";
+
+			return;
+		}
+
 		print "<rpc-reply><error>Unknown method: $subop</error></rpc-reply>";
 	}
 ?>
-- 
cgit v1.2.3-54-g00ecf


From 4311cc7e177a4c066d87f39d8b654420617172c1 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 12:16:50 +0400
Subject: digest: show number of unread articles in the title

---
 digest.js  | 17 +++++++++++++++++
 digest.php |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index a3cbb4879..777473c61 100644
--- a/digest.js
+++ b/digest.js
@@ -346,6 +346,10 @@ function parse_feeds(transport) {
 							return 0;					
 				});
 
+			var all_articles = find_feed(feeds, -4);
+
+			update_title(all_articles.unread);
+
 			last_feeds = feeds;
 
 			redraw_feedlist(feeds);
@@ -602,3 +606,16 @@ function feed_mo(elem) {
 		exception_error("feed_mo", e);
 	}
 }
+
+function update_title(unread) {
+	try {
+		document.title = "Tiny Tiny RSS";
+
+		if (unread > 0)
+			document.title += " (" + unread + ")";
+
+	} catch (e) {
+		exception_error("update_title", e);
+	}
+}
+
diff --git a/digest.php b/digest.php
index 467f6c286..c217d2abf 100644
--- a/digest.php
+++ b/digest.php
@@ -24,7 +24,7 @@
 
 <html>
 <head>
-	<title>Tiny Tiny Digest</title>
+	<title>Tiny Tiny RSS</title>
 	<link rel="stylesheet" type="text/css" href="digest.css?<?php echo $dt_add ?>"/>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-- 
cgit v1.2.3-54-g00ecf


From 1a434472bae1d6093abc816a253b53c600fd08c6 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 12:20:19 +0400
Subject: load more headlines on view()

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

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index 777473c61..7a1e7d2ec 100644
--- a/digest.js
+++ b/digest.js
@@ -138,7 +138,10 @@ function view(article_id, dismiss_only) {
 		remove_headline_entry(article_id);
 
 		catchup_article(article_id, 
-			function() { update(); });
+			function() { 
+				viewfeed(_active_feed_id, _active_feed_offset);
+				update();				
+			});
 
 		return dismiss_only != true;
 	} catch (e) {
-- 
cgit v1.2.3-54-g00ecf


From 46360a961b5aded1cedc651b45636506c303e30b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 13:08:13 +0400
Subject: digest tweaks

---
 digest.js | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index 7a1e7d2ec..ce9c325b5 100644
--- a/digest.js
+++ b/digest.js
@@ -33,6 +33,32 @@ function catchup_feed(feed_id, callback) {
 	}
 }
 
+function catchup_visible_articles(callback) {
+	try {
+		var elems = $("headlines-content").getElementsByTagName("LI");
+		var ids = [];
+		
+		for (var i = 0; i < elems.length; i++) {
+			if (elems[i].id && elems[i].id.match("A-")) {
+				ids.push(elems[i].id.replace("A-", ""));
+			}
+		}
+
+		var query = "?op=rpc&subop=catchupSelected" +
+			"&cmode=0&ids=" + param_escape(ids);
+
+		new Ajax.Request("backend.php",	{
+			parameters: query, 
+			onComplete: function(transport) {
+				if (callback) callback(transport);
+
+				viewfeed(_active_feed_id, 0);
+			} });
+
+	} catch (e) {
+		exception_error("catchup_visible_articles", e);
+	}
+}
 
 function catchup_article(article_id, callback) {
 	try {
@@ -243,7 +269,9 @@ function add_feed_entry(feed) {
 			icon_part +
 			"<a href=\"#\" onclick=\"viewfeed("+feed.id+")\">" + feed.title + "</a>" +
 			"<div class='unread-ctr'>" + 
-				"<img onclick=\"catchup_feed("+feed.id+")\" title=\"Dismiss\" class=\"dismiss\" style='display : none' src=\"images/digest_checkbox.png\">" +
+				"<img onclick=\"catchup_feed("+feed.id+")\" title=\"" + 
+					__("Mark as read") + 
+					"\" class=\"dismiss\" style='display : none' src=\"images/digest_checkbox.png\">" +
 				"<span class=\"unread\">" + feed.unread + "</span>" + 
 			"</div>" +	
 			"</li>";
@@ -267,7 +295,7 @@ function add_headline_entry(article, feed) {
 			"<div class='digest-check'>" +
 			"<img title='Set starred' onclick=\"toggleMark(this, "+article.id+")\" src='images/mark_unset.png'>" +
 			"<img title='Set published' onclick=\"togglePub(this, "+article.id+")\" src='images/pub_unset.png'>" +
-			"<img title='Dismiss' onclick=\"view("+article.id+", true)\" class='digest-check' src='images/digest_checkbox.png'>" +
+			"<img title='" + __("Mark as read") + "' onclick=\"view("+article.id+", true)\" class='digest-check' src='images/digest_checkbox.png'>" +
 			"</div>" + 
 			"<a target=\"_blank\" href=\""+article.link+"\""+
 		  		"onclick=\"return view("+article.id+")\" class='title'>" + 
@@ -390,8 +418,12 @@ function parse_headlines(transport, replace) {
 				$('headlines-content').appendChild(pr);
 			} else {
 				$('headlines-content').innerHTML += "<li id='H-MORE-PROMPT'>" +
-					"<div class='body'><a href=\"javascript:load_more()\">" +
-				  	__("More articles...") + "</a></div></li>";
+					"<div class='body'>" +
+					"<a href=\"javascript:catchup_visible_articles()\">" +
+				  	__("Mark as read") + "</a> | " + 
+					"<a href=\"javascript:load_more()\">" +
+				  	__("Load more...") + "</a>" + 
+					"</div></li>";
 			}
 
 			new Effect.Appear('headlines-content');
-- 
cgit v1.2.3-54-g00ecf


From 9ed133e7a97e4ad591df2557646519a2f451adf3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 13:38:57 +0400
Subject: api: support published status in getHeadlines; digest: code cleanup

---
 digest.css    | 11 ++++++----
 digest.js     | 70 +++++++++++++++++++++--------------------------------------
 functions.php |  1 +
 3 files changed, 33 insertions(+), 49 deletions(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index 2c30b0eb8..f7ddff689 100644
--- a/digest.css
+++ b/digest.css
@@ -159,14 +159,17 @@ a:hover {
 	max-width : 65%;
 }
 
-#headlines ul#headlines-content img.digest-check {
-	cursor : pointer;
+#headlines ul#headlines-content div.digest-check {
+	float : right;	
 }
 
-#headlines ul#headlines-content div.digest-check {
-	float : right;
+#headlines ul#headlines-content div.digest-check img {
+	cursor : pointer;
+	margin-right : 0px;
+	margin-left : 3px;
 }
 
+
 #headlines ul#headlines-content img.icon {
 	width : 16px;
 	height : 16px;
diff --git a/digest.js b/digest.js
index ce9c325b5..ba066a15f 100644
--- a/digest.js
+++ b/digest.js
@@ -14,7 +14,7 @@ function catchup_feed(feed_id, callback) {
 
 			var is_cat = "";
 
-			if (feed_id == -4) is_cat = "true";
+			if (feed_id < 0) is_cat = "true"; // KLUDGE
 
 			var query = "?op=rpc&subop=catchupFeed&feed_id=" + 
 				feed_id + "&is_cat=" + is_cat;
@@ -290,18 +290,32 @@ function add_headline_entry(article, feed) {
 
 		icon_part = "<img class='icon' src='" + get_feed_icon(feed) + "'/>";
 
+		var mark_part = "";
+		var publ_part = "";
+
+		if (article.marked)
+			mark_part = "<img title='"+ __("Unstar article")+"' onclick=\"toggle_mark(this, "+article.id+")\" src='images/mark_set.png'>";
+		else
+			mark_part =	"<img title='"+__("Star article")+"' onclick=\"toggle_mark(this, "+article.id+")\" src='images/mark_unset.png'>";
+
+		if (article.published)
+			publ_part = "<img title='"+__("Unpublish article")+"' onclick=\"toggle_pub(this, "+article.id+")\" src='images/pub_set.png'>";
+		else
+			publ_part =	"<img title='"+__("Publish article")+"' onclick=\"toggle_pub(this, "+article.id+")\" src='images/pub_unset.png'>";
+
+
 		var tmp_html = "<li id=\"A-"+article.id+"\">" + 
 			icon_part +
 			"<div class='digest-check'>" +
-			"<img title='Set starred' onclick=\"toggleMark(this, "+article.id+")\" src='images/mark_unset.png'>" +
-			"<img title='Set published' onclick=\"togglePub(this, "+article.id+")\" src='images/pub_unset.png'>" +
-			"<img title='" + __("Mark as read") + "' onclick=\"view("+article.id+", true)\" class='digest-check' src='images/digest_checkbox.png'>" +
+			mark_part +
+			publ_part +
+			"<img title='" + __("Mark as read") + "' onclick=\"view("+article.id+", true)\" src='images/digest_checkbox.png'>" +
 			"</div>" + 
 			"<a target=\"_blank\" href=\""+article.link+"\""+
 		  		"onclick=\"return view("+article.id+")\" class='title'>" + 
 				article.title + "</a>" +
 			"<div class='body'>" + 
-			"<div title=\"Click to expand article\" onclick=\"zoom("+article.id+")\" class='excerpt'>" + 
+			"<div title=\""+__("Click to expand article")+"\" onclick=\"zoom("+article.id+")\" class='excerpt'>" + 
 				article.excerpt + "</div>" +
 			"<div style='display : none' class='content'>" + 
 				article.content + "</div>" +
@@ -450,41 +464,7 @@ function init() {
 	}
 }
 
-function tMark_afh_off(effect) {
-	try {
-		var elem = effect.effects[0].element;
-
-		console.log("tMark_afh_off : " + elem.id);
-
-		if (elem) {
-			elem.src = elem.src.replace("mark_set", "mark_unset");
-			elem.alt = __("Star article");
-			Element.show(elem);
-		}
-
-	} catch (e) {
-		exception_error("tMark_afh_off", e);
-	}
-}
-
-function tPub_afh_off(effect) {
-	try {
-		var elem = effect.effects[0].element;
-
-		console.log("tPub_afh_off : " + elem.id);
-
-		if (elem) {
-			elem.src = elem.src.replace("pub_set", "pub_unset");
-			elem.alt = __("Publish article");
-			Element.show(elem);
-		}
-
-	} catch (e) {
-		exception_error("tPub_afh_off", e);
-	}
-}
-
-function toggleMark(mark_img, id) {
+function toggle_mark(mark_img, id) {
 
 	try {
 
@@ -510,15 +490,15 @@ function toggleMark(mark_img, id) {
 		new Ajax.Request("backend.php", {
 			parameters: query,
 			onComplete: function(transport) { 
-				//
+				update();
 			} });
 
 	} catch (e) {
-		exception_error("toggleMark", e);
+		exception_error("toggle_mark", e);
 	}
 }
 
-function togglePub(mark_img, id, note) {
+function toggle_pub(mark_img, id, note) {
 
 	try {
 
@@ -552,11 +532,11 @@ function togglePub(mark_img, id, note) {
 		new Ajax.Request("backend.php", {
 			parameters: query,
 			onComplete: function(transport) { 
-				//
+				update();
 			} });
 
 	} catch (e) {
-		exception_error("togglePub", e);
+		exception_error("toggle_pub", e);
 	}
 }
 
diff --git a/functions.php b/functions.php
index e53995335..2174460b4 100644
--- a/functions.php
+++ b/functions.php
@@ -6777,6 +6777,7 @@
 						"id" => (int)$line["id"],
 						"unread" => sql_bool_to_bool($line["unread"]),
 						"marked" => sql_bool_to_bool($line["marked"]),
+						"published" => sql_bool_to_bool($line["published"]),
 						"updated" => strtotime($line["updated"]),
 						"is_updated" => $is_updated,
 						"title" => $line["title"],
-- 
cgit v1.2.3-54-g00ecf


From ef1ef3bc29b3324830c26efa9678568c4c530e2f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 14:05:12 +0400
Subject: digest: do not catchup on zoom

---
 digest.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index ba066a15f..82abe6676 100644
--- a/digest.js
+++ b/digest.js
@@ -110,8 +110,8 @@ function zoom(article_id) {
 			}
 		}
 
-		catchup_article(article_id, 
-			function() { update(); });
+		//catchup_article(article_id, 
+		//	function() { update(); });
 
 	} catch (e) {
 		exception_error("zoom", e);
-- 
cgit v1.2.3-54-g00ecf


From 78ac6caf001402142951ec90e8d0a1dac02e433b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 14:37:47 +0400
Subject: digest: support tags

---
 digest.css              | 30 +++++++++++++++++++++++++++---
 digest.js               | 31 +++++++++++++++++++++++++++----
 digest.php              | 12 ++++++++++--
 functions.php           |  1 +
 modules/backend-rpc.php |  5 +++--
 5 files changed, 68 insertions(+), 11 deletions(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index f7ddff689..cfee28bcf 100644
--- a/digest.css
+++ b/digest.css
@@ -18,6 +18,10 @@ a:hover {
 	color : gray;
 }
 
+#header a:hover, #footer a:hover {
+	color : #0069D8;
+}
+
 #header {
 	font-weight : bold;
 	font-size : 14px;
@@ -159,6 +163,18 @@ a:hover {
 	max-width : 65%;
 }
 
+#headlines h1 a {
+	color : #684C99;
+}
+
+#headlines h1 a:hover {
+	color : gray;
+}
+
+#headlines h1 #headlines-title {
+	color : gray;
+}
+
 #headlines ul#headlines-content div.digest-check {
 	float : right;	
 }
@@ -214,15 +230,23 @@ a:hover {
 }
 
 #headlines ul#headlines-content div.info {
-	margin-top : 2px;
 	font-size : 11px;
 }
 
 #headlines ul#headlines-content div.info a {
 	color : gray;
-	font-weight : bold;
 }
 
-#headlines ul#headlines-content div.info a:hover {
+#headlines ul#headlines-content span.tags {
+	font-size : 11px;
+	margin-bottom : 2px;
+}
+
+#headlines ul#headlines-content span.tags a {
+	color : #684C99;
+}
+
+#headlines ul#headlines-content div.info a:hover, 
+#headlines ul#headlines-content span.tags a:hover {
 	color : #659a4c;
 }
diff --git a/digest.js b/digest.js
index 82abe6676..51c824ee4 100644
--- a/digest.js
+++ b/digest.js
@@ -186,8 +186,10 @@ function viewfeed(feed_id, offset) {
 			offset = _active_feed_offset + offset;
 		}
 
-		var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + feed_id +
-				"&offset=" + offset;
+		var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + 
+				param_escape(feed_id) +	"&offset=" + offset;
+
+		console.log(query);
 
 		new Ajax.Request("backend.php",	{
 			parameters: query, 
@@ -293,6 +295,22 @@ function add_headline_entry(article, feed) {
 		var mark_part = "";
 		var publ_part = "";
 
+		var tags_part = "";
+
+		if (article.tags.length > 0) {
+
+			tags_part = " " + __("in") + " ";
+
+			for (var i = 0; i < Math.min(5, article.tags.length); i++) {
+				tags_part += "<a href=\"#\" onclick=\"viewfeed('" + 
+						article.tags[i] + "')\">" + 
+					article.tags[i] + "</a>, ";
+			}
+
+			tags_part = tags_part.replace(/, $/, "");
+			tags_part = "<span class=\"tags\">" + tags_part + "</span>";
+		}
+
 		if (article.marked)
 			mark_part = "<img title='"+ __("Unstar article")+"' onclick=\"toggle_mark(this, "+article.id+")\" src='images/mark_set.png'>";
 		else
@@ -320,7 +338,7 @@ function add_headline_entry(article, feed) {
 			"<div style='display : none' class='content'>" + 
 				article.content + "</div>" +
 			"<div class='info'><a href=\#\" onclick=\"viewfeed("+feed.id+")\">" + 
-				feed.title + "</a> " + " @ " + 
+				feed.title + "</a> " + tags_part + " @ " + 
 				new Date(article.updated * 1000) + "</div>" +
 			"</div></li>";
 
@@ -410,10 +428,15 @@ function parse_headlines(transport, replace) {
 		if (!transport.responseXML) return;
 
 		var headlines = transport.responseXML.getElementsByTagName('headlines')[0];
+		var headlines_title = transport.responseXML.getElementsByTagName('headlines-title')[0];
 
-		if (headlines) {
+		if (headlines && headlines_title) {
 			headlines = eval("(" + headlines.firstChild.nodeValue + ")");
 
+			var title = headlines_title.firstChild.nodeValue;
+
+			$("headlines-title").innerHTML = title;
+
 			if (replace) $('headlines-content').innerHTML = '';
 
 			var pr = $('H-MORE-PROMPT');
diff --git a/digest.php b/digest.php
index c217d2abf..2b7f91807 100644
--- a/digest.php
+++ b/digest.php
@@ -91,7 +91,8 @@
 		</div>
 
 		<div id="headlines">
-			<h1><?php echo __('headlines') ?></h1>
+			<h1><a href="#" onclick="viewfeed(-4)"><?php echo __('headlines') ?></a>: 
+				<span id="headlines-title"></span></h1>
 
 			<ul id="headlines-content"> </ul>
 		</div>
@@ -107,6 +108,13 @@
 		 v<?php echo VERSION ?> 
 	<?php } ?>
 	&copy; 2005&ndash;<?php echo date('Y') ?> 
-	<a href="http://fakecake.org/">Andrew Dolgov</a></div>
+	<a href="http://fakecake.org/">Andrew Dolgov</a>
+	
+	<br/>
+
+	<a href="tt-rss.php">
+		<?php echo __("You are viewing the digest page. Click to open full version.") ?></a>
+
+</div>
 
 </body>
diff --git a/functions.php b/functions.php
index 2174460b4..232ee7c1f 100644
--- a/functions.php
+++ b/functions.php
@@ -6783,6 +6783,7 @@
 						"title" => $line["title"],
 						"link" => $line["link"],
 						"feed_id" => $line["feed_id"],
+						"tags" => get_article_tags($link, $line["id"]),
 					);
 
 				if ($show_excerpt) {
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 976fac15c..a0e4e77df 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -984,8 +984,6 @@
 		
 			if (!$feed_id) $feed_id = -4;
 			if (!$offset) $offset = 0;
-
-
 			print "<rpc-reply>";
 
 			$headlines = api_get_headlines($link, $feed_id, 10, $offset,
@@ -994,6 +992,9 @@
 			//function api_get_headlines($link, $feed_id, $limit, $offset,
 			//		$filter, $is_cat, $show_excerpt, $show_content, $view_mode) {
 
+			print "<headlines-title><![CDATA[" . getFeedTitle($link, $feed_id) . 
+				"]]></headlines-title>";
+
 			print "<headlines><![CDATA[" . json_encode($headlines) . "]]></headlines>";
 
 			print "</rpc-reply>";
-- 
cgit v1.2.3-54-g00ecf


From 6eed9e8071c5a4cff23ab956d616c0ab85313303 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 14:50:45 +0400
Subject: add some scriptaculous stuff

---
 digest.js | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index 51c824ee4..886fbce89 100644
--- a/digest.js
+++ b/digest.js
@@ -437,22 +437,30 @@ function parse_headlines(transport, replace) {
 
 			$("headlines-title").innerHTML = title;
 
-			if (replace) $('headlines-content').innerHTML = '';
+			if (replace) {
+				$('headlines-content').innerHTML = '';
+				Element.hide('headlines-content');
+			}
 
 			var pr = $('H-MORE-PROMPT');
 
 			if (pr) pr.parentNode.removeChild(pr);
 
+			var inserted = false;
+
 			for (var i = 0; i < headlines.length; i++) {
 				
 				if (!$('A-' + headlines[i].id)) {
 					add_headline_entry(headlines[i], 
 							find_feed(last_feeds, headlines[i].feed_id));
+
+					inserted = $("A-" + headlines[i].id);
 				}
 			}
 
 			if (pr) {
 				$('headlines-content').appendChild(pr);
+				new Effect.ScrollTo(inserted);
 			} else {
 				$('headlines-content').innerHTML += "<li id='H-MORE-PROMPT'>" +
 					"<div class='body'>" +
@@ -463,7 +471,9 @@ function parse_headlines(transport, replace) {
 					"</div></li>";
 			}
 
-			new Effect.Appear('headlines-content');
+			if (replace) new Effect.Appear('headlines-content', {duration : 0.3});
+
+			//new Effect.Appear('headlines-content');
 		}
 
 	} catch (e) {
-- 
cgit v1.2.3-54-g00ecf


From 41de9581216a904bd6a99cba5186e6b33bca06c9 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 19:36:59 +0400
Subject: digest: article display tweaks

---
 digest.js | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index 886fbce89..4faee1f6c 100644
--- a/digest.js
+++ b/digest.js
@@ -5,6 +5,14 @@ var _active_feed_offset = false;
 var _update_timeout = false;
 var _feedlist_expanded = false;
 
+function article_appear(article_id) {
+	try {
+		new Effect.Appear('A-' + article_id);
+	} catch (e) {
+		exception_error("article_appear", e);
+	}
+}
+
 function catchup_feed(feed_id, callback) {
 	try {
 
@@ -165,8 +173,8 @@ function view(article_id, dismiss_only) {
 
 		catchup_article(article_id, 
 			function() { 
-				viewfeed(_active_feed_id, _active_feed_offset);
-				update();				
+				viewfeed(_active_feed_id, _active_feed_offset, false, true);
+				update();	
 			});
 
 		return dismiss_only != true;
@@ -175,7 +183,7 @@ function view(article_id, dismiss_only) {
 	}
 }
 
-function viewfeed(feed_id, offset) {
+function viewfeed(feed_id, offset, replace, no_effects) {
 	try {
 
 		if (!feed_id) feed_id = _active_feed_id;
@@ -186,6 +194,8 @@ function viewfeed(feed_id, offset) {
 			offset = _active_feed_offset + offset;
 		}
 
+		if (replace == undefined) replace = (offset == 0);
+
 		var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + 
 				param_escape(feed_id) +	"&offset=" + offset;
 
@@ -195,7 +205,7 @@ function viewfeed(feed_id, offset) {
 			parameters: query, 
 			onComplete: function(transport) {
 				fatal_error_check(transport);
-				parse_headlines(transport, offset == 0);
+				parse_headlines(transport, replace, no_effects);
 				set_selected_feed(feed_id);
 				_active_feed_offset = offset;
 			} });
@@ -285,7 +295,7 @@ function add_feed_entry(feed) {
 	}
 }
 
-function add_headline_entry(article, feed) {
+function add_headline_entry(article, feed, no_effects) {
 	try {
 
 		var icon_part = "";
@@ -321,8 +331,11 @@ function add_headline_entry(article, feed) {
 		else
 			publ_part =	"<img title='"+__("Publish article")+"' onclick=\"toggle_pub(this, "+article.id+")\" src='images/pub_unset.png'>";
 
+		var style = "";
 
-		var tmp_html = "<li id=\"A-"+article.id+"\">" + 
+		if (!no_effects) style = "style=\"display : none\"";
+
+		var tmp_html = "<li id=\"A-"+article.id+"\" "+style+">" + 
 			icon_part +
 			"<div class='digest-check'>" +
 			mark_part +
@@ -344,6 +357,9 @@ function add_headline_entry(article, feed) {
 
 		$("headlines-content").innerHTML += tmp_html;
 
+		if (!no_effects)
+			window.setTimeout('article_appear(' + article.id + ')', 100);
+
 	} catch (e) {
 		exception_error("add_headline_entry", e);
 	}
@@ -423,7 +439,7 @@ function parse_feeds(transport) {
 	}
 }
 
-function parse_headlines(transport, replace) {
+function parse_headlines(transport, replace, no_effects) {
 	try {
 		if (!transport.responseXML) return;
 
@@ -452,7 +468,7 @@ function parse_headlines(transport, replace) {
 				
 				if (!$('A-' + headlines[i].id)) {
 					add_headline_entry(headlines[i], 
-							find_feed(last_feeds, headlines[i].feed_id));
+							find_feed(last_feeds, headlines[i].feed_id), !no_effects);
 
 					inserted = $("A-" + headlines[i].id);
 				}
@@ -460,7 +476,7 @@ function parse_headlines(transport, replace) {
 
 			if (pr) {
 				$('headlines-content').appendChild(pr);
-				new Effect.ScrollTo(inserted);
+				if (!no_effects) new Effect.ScrollTo(inserted);
 			} else {
 				$('headlines-content').innerHTML += "<li id='H-MORE-PROMPT'>" +
 					"<div class='body'>" +
@@ -471,7 +487,8 @@ function parse_headlines(transport, replace) {
 					"</div></li>";
 			}
 
-			if (replace) new Effect.Appear('headlines-content', {duration : 0.3});
+			if (replace && !no_effects) 
+				new Effect.Appear('headlines-content', {duration : 0.3});
 
 			//new Effect.Appear('headlines-content');
 		}
-- 
cgit v1.2.3-54-g00ecf


From d8ea9902b6d9a8fce00bd826c9b654397a97bd0f Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 19:52:15 +0400
Subject: digest: ajax loading for zoom()

---
 digest.js               | 36 +++++++++++++++++++-----------------
 modules/backend-rpc.php | 37 +++++++++++++++++++++++--------------
 2 files changed, 42 insertions(+), 31 deletions(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index 4faee1f6c..4183d70c5 100644
--- a/digest.js
+++ b/digest.js
@@ -102,24 +102,28 @@ function set_selected_feed(feed_id) {
 	}
 }
 
-function zoom(article_id) {
+function zoom(elem, article_id) {
 	try {
-		var elem = $('A-' + article_id);
+		//alert(elem + "/" + article_id);
 
-		if (elem) {
-			var divs = elem.getElementsByTagName('DIV');
-			
-			for (var i = 0; i < divs.length; i++) {
-				if (divs[i].className == 'excerpt') 
-					Element.hide(divs[i]);
+		elem.innerHTML = "<img src='images/indicator_tiny.gif'> " +
+			__("Loading, please wait...");
 
-				if (divs[i].className == 'content') 
-					Element.show(divs[i]);
-			}
-		}
+		new Ajax.Request("backend.php",	{
+			parameters: "?op=rpc&subop=digest-get-contents&article_id=" +
+				article_id,
+			onComplete: function(transport) {
+				fatal_error_check(transport);
+
+				if (transport.responseXML) {
+					var article = transport.responseXML.getElementsByTagName('article')[0];
+					elem.innerHTML = article.firstChild.nodeValue;
+				} else {
+					elem.innerHTML = __("Error: unable to load article.");
+				}
+				
+				} });
 
-		//catchup_article(article_id, 
-		//	function() { update(); });
 
 	} catch (e) {
 		exception_error("zoom", e);
@@ -346,10 +350,8 @@ function add_headline_entry(article, feed, no_effects) {
 		  		"onclick=\"return view("+article.id+")\" class='title'>" + 
 				article.title + "</a>" +
 			"<div class='body'>" + 
-			"<div title=\""+__("Click to expand article")+"\" onclick=\"zoom("+article.id+")\" class='excerpt'>" + 
+			"<div title=\""+__("Click to expand article")+"\" onclick=\"zoom(this, "+article.id+")\" class='excerpt'>" + 
 				article.excerpt + "</div>" +
-			"<div style='display : none' class='content'>" + 
-				article.content + "</div>" +
 			"<div class='info'><a href=\#\" onclick=\"viewfeed("+feed.id+")\">" + 
 				feed.title + "</a> " + tags_part + " @ " + 
 				new Date(article.updated * 1000) + "</div>" +
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index a0e4e77df..592c8ab28 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -978,6 +978,28 @@
 			return;
 		}
 
+		if ($subop == "digest-get-contents") {
+			$article_id = db_escape_string($_REQUEST['article_id']);
+
+			$result = db_query($link, "SELECT content 
+				FROM ttrss_entries, ttrss_user_entries
+				WHERE id = '$article_id' AND ref_id = id AND owner_uid = ".$_SESSION['uid']);
+
+			print "<rpc-reply>";
+
+			print "<article id=\"$article_id\"><![CDATA[";
+
+			$content = sanitize_rss($link, db_fetch_result($result, 0, "content"));
+
+			print $content;
+
+			print "]]></article>";
+
+			print "</rpc-reply>";
+
+			return;
+		}
+
 		if ($subop == "digest-update") {
 			$feed_id = db_escape_string($_REQUEST['feed_id']);
 			$offset = db_escape_string($_REQUEST['offset']);
@@ -987,7 +1009,7 @@
 			print "<rpc-reply>";
 
 			$headlines = api_get_headlines($link, $feed_id, 10, $offset,
-				'', ($feed_id == -4), true, true, "unread", "updated DESC");
+				'', ($feed_id == -4), true, false, "unread", "updated DESC");
 
 			//function api_get_headlines($link, $feed_id, $limit, $offset,
 			//		$filter, $is_cat, $show_excerpt, $show_content, $view_mode) {
@@ -1011,19 +1033,6 @@
 				if ($f['id'] > 0 || $f['id'] == -4) array_push($feeds, $f);
 			}
 
-			function feeds_sort_by_unread_rev($a, $b) {
-				$a = $a['unread'];
-				$b = $b['unread'];
-
-				if ($a == $b) {
-					return 0;
-				}
-				return ($a < $b) ? 1 : -1;
-			}
-
-			//uasort($feeds, 'feeds_sort_by_unread_rev');
-			//$feeds = array_slice($feeds, 0, 10);
-
 			print "<feeds><![CDATA[" . json_encode($feeds) . "]]></feeds>";
 
 			print "</rpc-reply>";
-- 
cgit v1.2.3-54-g00ecf


From 85629f6cf5bdf93d0155d1f893ad1cbbe8f30202 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 20:13:20 +0400
Subject: digest: layout tweaks

---
 digest.css |  3 +++
 digest.js  | 12 +++++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index cfee28bcf..4d50b4c45 100644
--- a/digest.css
+++ b/digest.css
@@ -191,6 +191,7 @@ a:hover {
 	height : 16px;
 	vertical-align : middle;
 	margin-right : 5px;
+	float : left;
 }
 
 #headlines ul#headlines-content {
@@ -209,6 +210,8 @@ a:hover {
 #headlines ul#headlines-content a.title {
 	font-weight : bold;
 	font-size : 16px;
+	display : block;
+	padding-left : 21px;
 }
 
 #headlines ul#headlines-content div.excerpt {
diff --git a/digest.js b/digest.js
index 4183d70c5..2bf7779c8 100644
--- a/digest.js
+++ b/digest.js
@@ -118,6 +118,11 @@ function zoom(elem, article_id) {
 				if (transport.responseXML) {
 					var article = transport.responseXML.getElementsByTagName('article')[0];
 					elem.innerHTML = article.firstChild.nodeValue;
+
+					new Effect.BlindDown(elem, {duration : 0.5});
+
+					elem.onclick = false;
+					elem.style.cursor = "auto";
 				} else {
 					elem.innerHTML = __("Error: unable to load article.");
 				}
@@ -341,10 +346,11 @@ function add_headline_entry(article, feed, no_effects) {
 
 		var tmp_html = "<li id=\"A-"+article.id+"\" "+style+">" + 
 			icon_part +
+
 			"<div class='digest-check'>" +
-			mark_part +
-			publ_part +
-			"<img title='" + __("Mark as read") + "' onclick=\"view("+article.id+", true)\" src='images/digest_checkbox.png'>" +
+				mark_part +
+				publ_part +
+				"<img title='" + __("Mark as read") + "' onclick=\"view("+article.id+", true)\" src='images/digest_checkbox.png'>" +
 			"</div>" + 
 			"<a target=\"_blank\" href=\""+article.link+"\""+
 		  		"onclick=\"return view("+article.id+")\" class='title'>" + 
-- 
cgit v1.2.3-54-g00ecf


From d3f1300032fd6b0faabddbe58655401582a0dd54 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 20:21:41 +0400
Subject: digest: show loading indicator in feedlist

---
 digest.js | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index 2bf7779c8..7a034f80e 100644
--- a/digest.js
+++ b/digest.js
@@ -210,6 +210,11 @@ function viewfeed(feed_id, offset, replace, no_effects) {
 
 		console.log(query);
 
+		var img = $("F-" + feed_id).getElementsByTagName("IMG")[0];
+
+		img.setAttribute("orig_src", img.src);
+		img.src = 'images/indicator_tiny.gif';
+
 		new Ajax.Request("backend.php",	{
 			parameters: query, 
 			onComplete: function(transport) {
@@ -217,6 +222,7 @@ function viewfeed(feed_id, offset, replace, no_effects) {
 				parse_headlines(transport, replace, no_effects);
 				set_selected_feed(feed_id);
 				_active_feed_offset = offset;
+				img.src = img.getAttribute("orig_src");
 			} });
 
 	} catch (e) {
-- 
cgit v1.2.3-54-g00ecf


From eb4f33ec0270d2d97ff75818c2654140cc285872 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 20:29:10 +0400
Subject: digest: more loading prompts

---
 digest.css |  4 ++++
 digest.js  | 44 +++++++++++++++++++++++++++-----------------
 2 files changed, 31 insertions(+), 17 deletions(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index 4d50b4c45..9041f7416 100644
--- a/digest.css
+++ b/digest.css
@@ -214,6 +214,10 @@ a:hover {
 	padding-left : 21px;
 }
 
+#headlines ul#headlines-content img#H-LOADING-IMG {
+	margin-left : 5px;
+}
+
 #headlines ul#headlines-content div.excerpt {
 	color : #404040;
 	cursor : pointer;
diff --git a/digest.js b/digest.js
index 7a034f80e..5cf8d4ec9 100644
--- a/digest.js
+++ b/digest.js
@@ -43,25 +43,30 @@ function catchup_feed(feed_id, callback) {
 
 function catchup_visible_articles(callback) {
 	try {
-		var elems = $("headlines-content").getElementsByTagName("LI");
-		var ids = [];
-		
-		for (var i = 0; i < elems.length; i++) {
-			if (elems[i].id && elems[i].id.match("A-")) {
-				ids.push(elems[i].id.replace("A-", ""));
-			}
-		}
 
-		var query = "?op=rpc&subop=catchupSelected" +
-			"&cmode=0&ids=" + param_escape(ids);
-
-		new Ajax.Request("backend.php",	{
-			parameters: query, 
-			onComplete: function(transport) {
-				if (callback) callback(transport);
+		if (confirm(__("Mark all displayed articles as read?"))) {
 
-				viewfeed(_active_feed_id, 0);
-			} });
+			var elems = $("headlines-content").getElementsByTagName("LI");
+			var ids = [];
+			
+			for (var i = 0; i < elems.length; i++) {
+				if (elems[i].id && elems[i].id.match("A-")) {
+					ids.push(elems[i].id.replace("A-", ""));
+				}
+			}
+	
+			var query = "?op=rpc&subop=catchupSelected" +
+				"&cmode=0&ids=" + param_escape(ids);
+	
+			new Ajax.Request("backend.php",	{
+				parameters: query, 
+				onComplete: function(transport) {
+					if (callback) callback(transport);
+	
+					viewfeed(_active_feed_id, 0);
+				} });
+	
+			}
 
 	} catch (e) {
 		exception_error("catchup_visible_articles", e);
@@ -215,6 +220,8 @@ function viewfeed(feed_id, offset, replace, no_effects) {
 		img.setAttribute("orig_src", img.src);
 		img.src = 'images/indicator_tiny.gif';
 
+		if ($('H-LOADING-IMG')) Element.show("H-LOADING-IMG");
+
 		new Ajax.Request("backend.php",	{
 			parameters: query, 
 			onComplete: function(transport) {
@@ -223,6 +230,7 @@ function viewfeed(feed_id, offset, replace, no_effects) {
 				set_selected_feed(feed_id);
 				_active_feed_offset = offset;
 				img.src = img.getAttribute("orig_src");
+				if ($('H-LOADING-IMG')) Element.hide("H-LOADING-IMG");
 			} });
 
 	} catch (e) {
@@ -498,6 +506,8 @@ function parse_headlines(transport, replace, no_effects) {
 				  	__("Mark as read") + "</a> | " + 
 					"<a href=\"javascript:load_more()\">" +
 				  	__("Load more...") + "</a>" + 
+					"<img style=\"display : none\" "+
+						"id=\"H-LOADING-IMG\" src='images/indicator_tiny.gif'>" +
 					"</div></li>";
 			}
 
-- 
cgit v1.2.3-54-g00ecf


From e4c530dcc3e06e0890ea12f9454f343655fdfff3 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Sun, 12 Sep 2010 22:36:18 +0400
Subject: digest: add rate limit for headline requests when catching up;
 control OOE responses with seq numbers

---
 digest.js               | 33 ++++++++++++++++++++++++++++++---
 modules/backend-rpc.php |  3 +++
 2 files changed, 33 insertions(+), 3 deletions(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index 5cf8d4ec9..cf816cf95 100644
--- a/digest.js
+++ b/digest.js
@@ -3,7 +3,9 @@ var last_feeds = [];
 var _active_feed_id = false;
 var _active_feed_offset = false;
 var _update_timeout = false;
+var _view_update_timeout = false;
 var _feedlist_expanded = false;
+var _update_seq = 1;
 
 function article_appear(article_id) {
 	try {
@@ -181,14 +183,23 @@ function remove_headline_entry(article_id) {
 	}
 }
 
+function view_update() {
+	try {
+		viewfeed(_active_feed_id, _active_feed_offset, false, true);
+		update();
+	} catch (e) {
+		exception_error("view_update", e);
+	}
+}
+
 function view(article_id, dismiss_only) {
 	try {
 		remove_headline_entry(article_id);
 
 		catchup_article(article_id, 
 			function() { 
-				viewfeed(_active_feed_id, _active_feed_offset, false, true);
-				update();	
+				window.clearTimeout(_view_update_timeout);
+				_view_update_timeout = window.setTimeout("view_update()", 1000);
 			});
 
 		return dismiss_only != true;
@@ -210,8 +221,11 @@ function viewfeed(feed_id, offset, replace, no_effects) {
 
 		if (replace == undefined) replace = (offset == 0);
 
+		_update_seq = _update_seq + 1;
+
 		var query = "backend.php?op=rpc&subop=digest-update&feed_id=" + 
-				param_escape(feed_id) +	"&offset=" + offset;
+				param_escape(feed_id) +	"&offset=" + offset +
+				"&seq=" + _update_seq;
 
 		console.log(query);
 
@@ -222,6 +236,7 @@ function viewfeed(feed_id, offset, replace, no_effects) {
 
 		if ($('H-LOADING-IMG')) Element.show("H-LOADING-IMG");
 
+
 		new Ajax.Request("backend.php",	{
 			parameters: query, 
 			onComplete: function(transport) {
@@ -465,6 +480,18 @@ function parse_headlines(transport, replace, no_effects) {
 	try {
 		if (!transport.responseXML) return;
 
+		var seq = transport.responseXML.getElementsByTagName('seq')[0];
+
+		if (seq) {
+			seq = seq.firstChild.nodeValue;
+			if (seq != _update_seq) {
+				console.log("parse_headlines: wrong sequence received.");
+				return;
+			}
+		} else {
+			return;
+		}
+
 		var headlines = transport.responseXML.getElementsByTagName('headlines')[0];
 		var headlines_title = transport.responseXML.getElementsByTagName('headlines-title')[0];
 
diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 592c8ab28..aa05e8e8e 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -1003,11 +1003,14 @@
 		if ($subop == "digest-update") {
 			$feed_id = db_escape_string($_REQUEST['feed_id']);
 			$offset = db_escape_string($_REQUEST['offset']);
+			$seq = db_escape_string($_REQUEST['seq']);
 		
 			if (!$feed_id) $feed_id = -4;
 			if (!$offset) $offset = 0;
 			print "<rpc-reply>";
 
+			print "<seq>$seq</seq>";
+
 			$headlines = api_get_headlines($link, $feed_id, 10, $offset,
 				'', ($feed_id == -4), true, false, "unread", "updated DESC");
 
-- 
cgit v1.2.3-54-g00ecf


From 01ee171a9c622d22e45c11314ea37ed9897af040 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Mon, 13 Sep 2010 08:31:37 +0400
Subject: disable H-LOADING-IMG

---
 digest.js | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index cf816cf95..8f0142ab6 100644
--- a/digest.js
+++ b/digest.js
@@ -234,9 +234,6 @@ function viewfeed(feed_id, offset, replace, no_effects) {
 		img.setAttribute("orig_src", img.src);
 		img.src = 'images/indicator_tiny.gif';
 
-		if ($('H-LOADING-IMG')) Element.show("H-LOADING-IMG");
-
-
 		new Ajax.Request("backend.php",	{
 			parameters: query, 
 			onComplete: function(transport) {
@@ -245,7 +242,6 @@ function viewfeed(feed_id, offset, replace, no_effects) {
 				set_selected_feed(feed_id);
 				_active_feed_offset = offset;
 				img.src = img.getAttribute("orig_src");
-				if ($('H-LOADING-IMG')) Element.hide("H-LOADING-IMG");
 			} });
 
 	} catch (e) {
-- 
cgit v1.2.3-54-g00ecf


From ed6c208dda7a1ff2825a34786d795419f1536dac Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Mon, 13 Sep 2010 08:40:37 +0400
Subject: support zoom for blank excerpts

---
 digest.js | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index 8f0142ab6..9828dc7c2 100644
--- a/digest.js
+++ b/digest.js
@@ -369,6 +369,9 @@ function add_headline_entry(article, feed, no_effects) {
 
 		if (!no_effects) style = "style=\"display : none\"";
 
+		if (article.excerpt.trim() == "")
+			article.excerpt = __("Click to expand article.");
+
 		var tmp_html = "<li id=\"A-"+article.id+"\" "+style+">" + 
 			icon_part +
 
-- 
cgit v1.2.3-54-g00ecf


From 2f57dff5e4ba3060c560a77b7634c663d4e19d01 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Mon, 13 Sep 2010 08:56:50 +0400
Subject: digest: mark read article on zoom

---
 digest.css | 14 +++++++++++++-
 digest.js  | 13 +++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index 9041f7416..45d502e3b 100644
--- a/digest.css
+++ b/digest.css
@@ -207,13 +207,25 @@ a:hover {
 	clear : left;
 }
 
-#headlines ul#headlines-content a.title {
+#headlines ul#headlines-content li.unread a.title {
 	font-weight : bold;
 	font-size : 16px;
 	display : block;
 	padding-left : 21px;
 }
 
+#headlines ul#headlines-content li.read a.title {
+	font-size : 16px;
+	font-weight : bold;
+	display : block;
+	padding-left : 21px;
+	color : #8DB1D6;
+}
+
+#headlines ul#headlines-content li.read a.title:hover {
+	color : gray;
+}
+
 #headlines ul#headlines-content img#H-LOADING-IMG {
 	margin-left : 5px;
 }
diff --git a/digest.js b/digest.js
index 9828dc7c2..a529db7fd 100644
--- a/digest.js
+++ b/digest.js
@@ -130,6 +130,15 @@ function zoom(elem, article_id) {
 
 					elem.onclick = false;
 					elem.style.cursor = "auto";
+
+					catchup_article(article_id, 
+						function() { 							
+							window.clearTimeout(_view_update_timeout);
+							_view_update_timeout = window.setTimeout("view_update()", 500);
+							$("A-" + article_id).className = "read";
+					});
+
+
 				} else {
 					elem.innerHTML = __("Error: unable to load article.");
 				}
@@ -199,7 +208,7 @@ function view(article_id, dismiss_only) {
 		catchup_article(article_id, 
 			function() { 
 				window.clearTimeout(_view_update_timeout);
-				_view_update_timeout = window.setTimeout("view_update()", 1000);
+				_view_update_timeout = window.setTimeout("view_update()", 500);
 			});
 
 		return dismiss_only != true;
@@ -372,7 +381,7 @@ function add_headline_entry(article, feed, no_effects) {
 		if (article.excerpt.trim() == "")
 			article.excerpt = __("Click to expand article.");
 
-		var tmp_html = "<li id=\"A-"+article.id+"\" "+style+">" + 
+		var tmp_html = "<li id=\"A-"+article.id+"\" "+style+" class=\"unread\">" + 
 			icon_part +
 
 			"<div class='digest-check'>" +
-- 
cgit v1.2.3-54-g00ecf


From 5e9a79e13426ae29c4829d58ee3964cf8accee4a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Mon, 13 Sep 2010 12:24:30 +0400
Subject: misc digest tweaks

---
 digest.js | 52 +++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 35 insertions(+), 17 deletions(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index a529db7fd..ae7e870a2 100644
--- a/digest.js
+++ b/digest.js
@@ -46,17 +46,17 @@ function catchup_feed(feed_id, callback) {
 function catchup_visible_articles(callback) {
 	try {
 
-		if (confirm(__("Mark all displayed articles as read?"))) {
-
-			var elems = $("headlines-content").getElementsByTagName("LI");
-			var ids = [];
+		var elems = $("headlines-content").getElementsByTagName("LI");
+		var ids = [];
 			
-			for (var i = 0; i < elems.length; i++) {
-				if (elems[i].id && elems[i].id.match("A-")) {
-					ids.push(elems[i].id.replace("A-", ""));
-				}
+		for (var i = 0; i < elems.length; i++) {
+			if (elems[i].id && elems[i].id.match("A-")) {
+			ids.push(elems[i].id.replace("A-", ""));
 			}
-	
+		}
+
+		if (confirm(__("Mark %d displayed articles as read?").replace("%d", ids.length))) {
+
 			var query = "?op=rpc&subop=catchupSelected" +
 				"&cmode=0&ids=" + param_escape(ids);
 	
@@ -153,13 +153,22 @@ function zoom(elem, article_id) {
 
 function load_more() {
 	try {
-		viewfeed(_active_feed_id, _active_feed_offset + 10);
+		var pr = $("H-LOADING-IMG");
+
+		if (pr) Element.show(pr);
+
+		viewfeed(_active_feed_id, _active_feed_offset + 10, false, false, true,
+			function() { 
+				var pr = $("H-LOADING-IMG");
+
+				if (pr) Element.hide(pr);	
+			});
 	} catch (e) {
 		exception_error("load_more", e);
 	}
 }
 
-function update() {
+function update(callback) {
 	try {
 		console.log('updating feeds...');
 
@@ -171,6 +180,8 @@ function update() {
 				fatal_error_check(transport);
 				parse_feeds(transport);
 				set_selected_feed(_active_feed_id);
+
+				if (callback) callback(transport);
 				} });
 
 		_update_timeout = window.setTimeout('update()', 5*1000);
@@ -194,7 +205,7 @@ function remove_headline_entry(article_id) {
 
 function view_update() {
 	try {
-		viewfeed(_active_feed_id, _active_feed_offset, false, true);
+		viewfeed(_active_feed_id, _active_feed_offset, false, true, true);
 		update();
 	} catch (e) {
 		exception_error("view_update", e);
@@ -217,7 +228,7 @@ function view(article_id, dismiss_only) {
 	}
 }
 
-function viewfeed(feed_id, offset, replace, no_effects) {
+function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback) {
 	try {
 
 		if (!feed_id) feed_id = _active_feed_id;
@@ -240,17 +251,24 @@ function viewfeed(feed_id, offset, replace, no_effects) {
 
 		var img = $("F-" + feed_id).getElementsByTagName("IMG")[0];
 
-		img.setAttribute("orig_src", img.src);
-		img.src = 'images/indicator_tiny.gif';
+		if (img && !no_indicator) {
+			img.setAttribute("orig_src", img.src);
+			img.src = 'images/indicator_tiny.gif';
+		}
 
 		new Ajax.Request("backend.php",	{
 			parameters: query, 
 			onComplete: function(transport) {
 				fatal_error_check(transport);
 				parse_headlines(transport, replace, no_effects);
-				set_selected_feed(feed_id);
+				set_selected_feed(feed_id);				
 				_active_feed_offset = offset;
-				img.src = img.getAttribute("orig_src");
+
+				if (img && !no_indicator)
+					img.src = img.getAttribute("orig_src");
+
+				if (callback) callback(transport);
+
 			} });
 
 	} catch (e) {
-- 
cgit v1.2.3-54-g00ecf


From c7a5c8a5a2703f78bf36dc3f2c5cc2f8fc8ec713 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Mon, 13 Sep 2010 14:39:16 +0400
Subject: add loading overlay

---
 digest.css | 19 +++++++++++++++++++
 digest.js  |  2 ++
 digest.php | 14 ++++++++++++++
 3 files changed, 35 insertions(+)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index 45d502e3b..d96cc4968 100644
--- a/digest.css
+++ b/digest.css
@@ -269,3 +269,22 @@ a:hover {
 #headlines ul#headlines-content span.tags a:hover {
 	color : #659a4c;
 }
+
+#overlay {
+	background : white;
+	left : 0;
+	top : 0;
+	height : 100%;
+	width : 100%;
+	z-index : 100;
+	position : absolute;
+	text-align : center;
+}
+
+#overlay_inner {
+	margin : 1em;
+}
+
+#overlay img {
+	vertical-align : middle;
+}
diff --git a/digest.js b/digest.js
index ae7e870a2..b788535fc 100644
--- a/digest.js
+++ b/digest.js
@@ -259,6 +259,8 @@ function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback)
 		new Ajax.Request("backend.php",	{
 			parameters: query, 
 			onComplete: function(transport) {
+				Element.hide("overlay");
+
 				fatal_error_check(transport);
 				parse_headlines(transport, replace, no_effects);
 				set_selected_feed(feed_id);				
diff --git a/digest.php b/digest.php
index 2b7f91807..43eb04121 100644
--- a/digest.php
+++ b/digest.php
@@ -50,6 +50,20 @@
 	</script>
 </head>
 <body id="ttrssDigest">
+	<div id="overlay" style="display : block">
+		<div id="overlay_inner">
+		<noscript>
+			<p>
+			<?php print_error(__("Your browser doesn't support Javascript, which is required
+			for this application to function properly. Please check your
+			browser settings.")) ?></p>
+		</noscript>
+
+		<img src="images/indicator_white.gif"/>
+			<?php echo __("Loading, please wait...") ?>
+		</div>
+	</div> 
+
 	<div id="header">
 
 	<div class="links">
-- 
cgit v1.2.3-54-g00ecf


From c5325e0925a80dd02e45f2f5107f0a31c83f9027 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Mon, 13 Sep 2010 15:02:50 +0400
Subject: digest: support exception error box

---
 digest.css |  4 +++-
 digest.js  |  1 -
 digest.php | 12 ++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index d96cc4968..70728c70e 100644
--- a/digest.css
+++ b/digest.css
@@ -1,6 +1,6 @@
 body {
 	background : #f0f0f0;
-	color : gray;
+	color : black;
 	font-family : sans-serif;
 	font-size : 12px;
 }
@@ -28,6 +28,7 @@ a:hover {
 	font-family : "Lucida Grande", "Segoe UI", Tahoma, Arial, sans-serif;
 	margin-left : 1em;
 	margin-right : 1em;
+	color : gray;
 }
 
 #header div.links {
@@ -50,6 +51,7 @@ a:hover {
 #footer {
 	font-size : 12px;
 	text-align : center;
+	color : gray;
 }
 
 /*#content h1 {
diff --git a/digest.js b/digest.js
index b788535fc..0b5a3f66a 100644
--- a/digest.js
+++ b/digest.js
@@ -579,7 +579,6 @@ function parse_headlines(transport, replace, no_effects) {
 
 function init() {
 	try {
-		
 		new Ajax.Request("backend.php",	{
 			parameters: "backend.php?op=rpc&subop=digest-init",
 			onComplete: function(transport) {
diff --git a/digest.php b/digest.php
index 43eb04121..c2ff2a330 100644
--- a/digest.php
+++ b/digest.php
@@ -26,6 +26,7 @@
 <head>
 	<title>Tiny Tiny RSS</title>
 	<link rel="stylesheet" type="text/css" href="digest.css?<?php echo $dt_add ?>"/>
+	<link rel="stylesheet" type="text/css" href="infobox.css?<?php echo $dt_add ?>"/>
 
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
 
@@ -64,6 +65,17 @@
 		</div>
 	</div> 
 
+	<div id="dialog_overlay" style="display : none"> </div>
+
+	<div id="errorBoxShadow" style="display : none">
+		<div id="errorBox">
+		<div id="xebTitle"><?php echo __('Fatal Exception') ?></div><div id="xebContent">&nbsp;</div>
+			<div id="xebBtn" align='center'>
+				<button onclick="closeErrorBox()"><?php echo __('Close this window') ?></button>
+			</div>
+		</div>
+	</div>
+
 	<div id="header">
 
 	<div class="links">
-- 
cgit v1.2.3-54-g00ecf


From 5328c7d7f173722af5a9d476d9448667b360f67b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Mon, 13 Sep 2010 15:08:34 +0400
Subject: digest: placeholder sanity check on init

---
 digest.js | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index 0b5a3f66a..d6dc41e8a 100644
--- a/digest.js
+++ b/digest.js
@@ -577,7 +577,7 @@ function parse_headlines(transport, replace, no_effects) {
 	}
 }
 
-function init() {
+function init_second_stage() {
 	try {
 		new Ajax.Request("backend.php",	{
 			parameters: "backend.php?op=rpc&subop=digest-init",
@@ -587,6 +587,29 @@ function init() {
 				_update_timeout = window.setTimeout('update()', 5*1000);
 				} });
 
+	} catch (e) {
+		exception_error("init_second_stage", e);
+	}
+}
+
+function sanity_check(transport) {
+	try {
+
+
+	} catch (e) {
+		exception_error("sanity_check", e);
+	}
+}
+
+function init() {
+	try {
+
+		new Ajax.Request("backend.php", {
+			parameters: "?op=rpc&subop=sanityCheck",
+			onComplete: function(transport) { 
+				sanity_check(transport);
+			} });
+
 	} catch (e) {
 		exception_error("digest_init", e);
 	}
-- 
cgit v1.2.3-54-g00ecf


From 285de6d8a3221fc2dbc4954eb867b82d2e42d310 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Mon, 13 Sep 2010 15:17:26 +0400
Subject: digest: utilize sanity checking on init

---
 digest.js | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index d6dc41e8a..8659c8fb3 100644
--- a/digest.js
+++ b/digest.js
@@ -1,4 +1,8 @@
 var last_feeds = [];
+var init_params = {};
+
+var db = false;
+var store = false;
 
 var _active_feed_id = false;
 var _active_feed_offset = false;
@@ -309,7 +313,7 @@ function find_feed(feeds, feed_id) {
 function get_feed_icon(feed) {
 	try {
 		if (feed.has_icon)
-			return 'icons/' + feed.id + '.ico';
+			return getInitParam('icons_location') + "/" + feed.id + '.ico';
 
 		if (feed.id == -1)
 			return 'images/mark_set.png';
@@ -592,22 +596,13 @@ function init_second_stage() {
 	}
 }
 
-function sanity_check(transport) {
-	try {
-
-
-	} catch (e) {
-		exception_error("sanity_check", e);
-	}
-}
-
 function init() {
 	try {
 
 		new Ajax.Request("backend.php", {
 			parameters: "?op=rpc&subop=sanityCheck",
 			onComplete: function(transport) { 
-				sanity_check(transport);
+				backend_sanity_check_callback(transport);
 			} });
 
 	} catch (e) {
-- 
cgit v1.2.3-54-g00ecf


From e638cd0201f1de0ec3c5fb42b63ca64f39ed67ed Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Mon, 13 Sep 2010 18:32:34 +0400
Subject: digest: properly mark fresh articles

---
 digest.css |  8 ++++++++
 digest.js  | 10 +++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

(limited to 'digest.js')

diff --git a/digest.css b/digest.css
index 70728c70e..2ed6aae93 100644
--- a/digest.css
+++ b/digest.css
@@ -209,6 +209,14 @@ a:hover {
 	clear : left;
 }
 
+#headlines ul#headlines-content li.fresh a.title {
+	font-weight : bold;
+	font-size : 16px;
+	display : block;
+	padding-left : 21px;
+	color : #007FFF;
+}
+
 #headlines ul#headlines-content li.unread a.title {
 	font-weight : bold;
 	font-size : 16px;
diff --git a/digest.js b/digest.js
index 8659c8fb3..cb42633b6 100644
--- a/digest.js
+++ b/digest.js
@@ -405,7 +405,15 @@ function add_headline_entry(article, feed, no_effects) {
 		if (article.excerpt.trim() == "")
 			article.excerpt = __("Click to expand article.");
 
-		var tmp_html = "<li id=\"A-"+article.id+"\" "+style+" class=\"unread\">" + 
+		var li_class = "unread";
+
+		var fresh_max = getInitParam("fresh_article_max_age") * 60 * 60;
+		var d = new Date();
+
+		if (d.getTime() / 1000 - article.updated < fresh_max)
+			li_class = "fresh";
+
+		var tmp_html = "<li id=\"A-"+article.id+"\" "+style+" class=\""+li_class+"\">" + 
 			icon_part +
 
 			"<div class='digest-check'>" +
-- 
cgit v1.2.3-54-g00ecf


From b8a1b2ae945d4295971c72aad53fcf5841eb76c7 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Wed, 22 Sep 2010 14:10:39 +0400
Subject: digest: only try to show feed loading indicator when feed is actually
 present on screen

---
 digest.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index cb42633b6..3fe85f68e 100644
--- a/digest.js
+++ b/digest.js
@@ -253,11 +253,13 @@ function viewfeed(feed_id, offset, replace, no_effects, no_indicator, callback)
 
 		console.log(query);
 
-		var img = $("F-" + feed_id).getElementsByTagName("IMG")[0];
+		if ($("F-" + feed_id)) {
+			var img = $("F-" + feed_id).getElementsByTagName("IMG")[0];
 
-		if (img && !no_indicator) {
-			img.setAttribute("orig_src", img.src);
-			img.src = 'images/indicator_tiny.gif';
+			if (img && !no_indicator) {
+				img.setAttribute("orig_src", img.src);
+				img.src = 'images/indicator_tiny.gif';
+			}
 		}
 
 		new Ajax.Request("backend.php",	{
-- 
cgit v1.2.3-54-g00ecf


From 58226f869cfc0f35bb22c4f5afc5c3d892dc3c54 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Wed, 22 Sep 2010 14:17:26 +0400
Subject: digest: do not show catchup/loadmore prompt when there's nothing to
 load

---
 digest.js | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

(limited to 'digest.js')

diff --git a/digest.js b/digest.js
index 3fe85f68e..98ae14d8c 100644
--- a/digest.js
+++ b/digest.js
@@ -47,9 +47,8 @@ function catchup_feed(feed_id, callback) {
 	}
 }
 
-function catchup_visible_articles(callback) {
+function get_visible_article_ids() {
 	try {
-
 		var elems = $("headlines-content").getElementsByTagName("LI");
 		var ids = [];
 			
@@ -59,6 +58,18 @@ function catchup_visible_articles(callback) {
 			}
 		}
 
+		return ids;
+
+	} catch (e) {
+		exception_error("get_visible_article_ids", e);
+	}
+}
+
+function catchup_visible_articles(callback) {
+	try {
+
+		var ids = get_visible_article_ids();
+
 		if (confirm(__("Mark %d displayed articles as read?").replace("%d", ids.length))) {
 
 			var query = "?op=rpc&subop=catchupSelected" +
@@ -565,19 +576,25 @@ function parse_headlines(transport, replace, no_effects) {
 				}
 			}
 
-			if (pr) {
-				$('headlines-content').appendChild(pr);
-				if (!no_effects) new Effect.ScrollTo(inserted);
-			} else {
-				$('headlines-content').innerHTML += "<li id='H-MORE-PROMPT'>" +
-					"<div class='body'>" +
-					"<a href=\"javascript:catchup_visible_articles()\">" +
-				  	__("Mark as read") + "</a> | " + 
-					"<a href=\"javascript:load_more()\">" +
-				  	__("Load more...") + "</a>" + 
-					"<img style=\"display : none\" "+
+			var ids = get_visible_article_ids();
+
+			if (ids.length > 0) {
+				if (pr) {
+					$('headlines-content').appendChild(pr);
+					if (!no_effects) new Effect.ScrollTo(inserted);
+				} else {
+					$('headlines-content').innerHTML += "<li id='H-MORE-PROMPT'>" +
+						"<div class='body'>" +
+						"<a href=\"javascript:catchup_visible_articles()\">" +
+					  	__("Mark as read") + "</a> | " + 
+						"<a href=\"javascript:load_more()\">" +
+					  	__("Load more...") + "</a>" + 
+						"<img style=\"display : none\" "+
 						"id=\"H-LOADING-IMG\" src='images/indicator_tiny.gif'>" +
-					"</div></li>";
+						"</div></li>";
+				}
+			} else {
+				// FIXME : display some kind of "nothing to see here" prompt here
 			}
 
 			if (replace && !no_effects) 
-- 
cgit v1.2.3-54-g00ecf