Merge pull request #406 from HeikoAdams/master

[tt-rss.git] / js / PrefFilterTree.js

diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 3546e30fb2db12ab3f7bacd3c8ad4cb31b95ea21..7a561c55ba4e1b915f5eefef6e96eba13edf62fc 100644 (file)
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -24,12 +24,28 @@ dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, {
 
                var enabled = this.model.store.getValue(args.item, 'enabled');
                var param = this.model.store.getValue(args.item, 'param');
+               var rules = this.model.store.getValue(args.item, 'rules');
 
                if (param) {
                        param = dojo.doc.createElement('span');
                        param.className = (enabled != false) ? 'labelParam' : 'labelParam Disabled';
                        param.innerHTML = args.item.param[0];
-                       dojo.place(param, tnode.labelNode, 'after');
+                       dojo.place(param, tnode.rowNode, 'first');
+               }
+
+               if (rules) {
+                       param = dojo.doc.createElement('span');
+                       param.className = 'filterRules';
+                       param.innerHTML = rules;
+                       dojo.place(param, tnode.rowNode, 'next');
+               }
+
+               if (this.model.store.getValue(args.item, 'id') != 'root') {
+                       var img = dojo.doc.createElement('img');
+                       img.src ='images/filter.png';
+                       img.className = 'markedPic';
+                       tnode._filterIconNode = img;
+                       dojo.place(tnode._filterIconNode, tnode.labelNode, 'before');
                }
 
                return tnode;