add special indication for categories having unread items in child categories

2 files changed, 41 insertions, 2 deletions

diff --git a/js/FeedTree.js b/js/FeedTree.js
index 30e625015..b39e72862 100644
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -120,6 +120,14 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 			dojo.place(span, tnode.iconNode, 'replace');
 		}
 
+		if (id.match("CAT:") && bare_id > 0) {
+			param = dojo.doc.createElement('span');
+			param.className = 'feedParam';
+			param.innerHTML = "";
+			dojo.place(param, tnode.labelNode, 'after');
+			tnode._paramNode = param;
+		}
+
 		if (id.match("FEED:") && bare_id > 0) {
 			var menu = new dijit.Menu();
 			menu.row_id = bare_id;
@@ -183,11 +191,15 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 		name = name.replace(/&lt;/g, "<");
 		name = name.replace(/&gt;/g, ">");
 
+		var label;
+
 		if (item.unread > 0) {
-			return name + " (" + item.unread + ")";
+			label = name + " (" + item.unread + ")";
 		} else {
-			return name;
+			label = name;
 		}
+
+		return label;
 	},
 	selectFeed: function(feed, is_cat) {
 		if (is_cat)
@@ -443,4 +455,15 @@ dojo.declare("fox.FeedTree", dijit.Tree, {
 			return false;
 		}
 	},
+	setCatParam: function(cat, value) {
+		var treeNode = this._itemNodesMap['CAT:' + cat];
+
+		if (treeNode && treeNode[0] && treeNode[0]._paramNode) {
+			if (value > 0)
+				treeNode[0]._paramNode.innerHTML = '+' + value;
+			else
+				treeNode[0]._paramNode.innerHTML = "";
+		}
+		this.model.setFeedValue(cat, true, 'child_unread', value);
+	},
 });
diff --git a/js/feedlist.js b/js/feedlist.js
index 13cdc2694..18d4a9770 100644
--- a/js/feedlist.js
+++ b/js/feedlist.js
@@ -286,6 +286,7 @@ function parse_counters(elems, scheduled_call) {
 			var error = elems[l].error;
 			var has_img = elems[l].has_img;
 			var updated = elems[l].updated;
+			var child_unread = parseInt(elems[l].child_counter);
 
 			if (id == "global-unread") {
 				global_unread = ctr;
@@ -322,6 +323,8 @@ function parse_counters(elems, scheduled_call) {
 						setFeedIcon(id, false, 'images/blank_icon.gif');
 					}
 				}
+			} else {
+				setCatParam(id, child_unread);
 			}
 		}
 
@@ -411,6 +414,19 @@ function setFeedValue(feed, is_cat, key, value) {
 	}
 }
 
+function setCatParam(cat, value) {
+	try {
+		var tree = dijit.byId("feedTree");
+
+		if (tree && tree.model)
+			return tree.setCatParam(cat, value);
+
+	} catch (e) {
+		//
+	}
+}
+
+
 function selectFeed(feed, is_cat) {
 	try {
 		var tree = dijit.byId("feedTree");