Merge branch 'master' into css-feedtree-counter

Conflicts:
	tt-rss.css

diff --combined js/FeedTree.js
index f874db702c17bb8d4d0ac913a15ed3c3b8220040,fbddb708f34cae5b606f6affa5093cd306f4ea49..07c3002f2eb4870ffcbb2fe0ca549b8a6eea5762
--- 1/js/FeedTree.js
--- 2/js/FeedTree.js
+++ b/js/FeedTree.js
@@@ -100,7 -100,7 +100,7 @@@ dojo.declare("fox.FeedTree", dijit.Tree
        _createTreeNode: function(args) {
                var tnode = new dijit._TreeNode(args);
  
-               if (args.item.icon)
+               if (args.item.icon && args.item.icon[0])
                        tnode.iconNode.src = args.item.icon[0];
  
                var id = args.item.id[0];
@@@ -184,11 -184,6 +184,11 @@@
                        tnode._menu = menu;
                }
  
 +              ctr = dojo.doc.createElement('span');
 +              ctr.className = 'counterNode';
 +              ctr.innerHTML = '0';
 +              dojo.place(ctr, tnode.labelNode, 'after');
 +              tnode.counterNode = ctr;
  
                //tnode.labelNode.innerHTML = args.label;
                return tnode;
@@@ -200,12 -195,8 +200,12 @@@
                return (item.unread == 0) ? "dijitTreeLabel" : "dijitTreeLabel Unread";
        },
        getRowClass: function (item, opened) {
 -              return (!item.error || item.error == '') ? "dijitTreeRow" :
 +              var rc = (!item.error || item.error == '') ? "dijitTreeRow" :
                        "dijitTreeRow Error";
 +
 +              if (item.unread > 0) rc += " Unread";
 +
 +              return rc;
        },
        getLabel: function(item) {
                var name = String(item.name);
@@@ -217,15 -208,15 +217,15 @@@
                name = name.replace(/&lt;/g, "<");
                name = name.replace(/&gt;/g, ">");
  
 -              var label;
 +              /* var label;
  
                if (item.unread > 0) {
                        label = name + " (" + item.unread + ")";
                } else {
                        label = name;
 -              }
 +              } */
  
 -              return label;
 +              return name;
        },
        expandParentNodes: function(feed, is_cat, list) {
                try {