From 2f20dd58d277d0ec5e4898feed0f530479a0c831 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@fakecake.org>
Date: Wed, 10 Jul 2013 13:09:12 +0400
Subject: integrate silk icons by Mark James

---
 js/PrefFilterTree.js | 8 ++++++++
 js/PrefLabelTree.js  | 4 ++--
 js/functions.js      | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'js')

diff --git a/js/PrefFilterTree.js b/js/PrefFilterTree.js
index 4e49075bd..d9391c135 100644
--- a/js/PrefFilterTree.js
+++ b/js/PrefFilterTree.js
@@ -32,6 +32,14 @@ dojo.declare("fox.PrefFilterTree", lib.CheckBoxTree, {
 			dojo.place(param, tnode.rowNode, 'first');
 		}
 
+		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;
 	},
 
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index 05a0c15b6..2f7dc0f53 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -22,7 +22,7 @@ dojo.declare("fox.PrefLabelTree", lib.CheckBoxTree, {
 		if (type == 'label') {
 			var span = dojo.doc.createElement('span');
 			span.innerHTML = '&alpha;';
-			span.className = 'labelColorIndicator2';
+			span.className = 'labelColorIndicator';
 			span.id = 'LICID-' + bare_id;
 
 			span.setStyle({
@@ -38,6 +38,6 @@ dojo.declare("fox.PrefLabelTree", lib.CheckBoxTree, {
 	},
 	getIconClass: function (item, opened) {
 		return (!item || this.model.mayHaveChildren(item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "invisible";
-	}, 
+	},
 });
 
diff --git a/js/functions.js b/js/functions.js
index 8691c1ee5..b9b3aa44e 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -232,7 +232,7 @@ function notify_real(msg, no_hide, n_type) {
 		msg = "<span><img src='images/sign_info.svg'></span>" + msg;
 	}
 
-	msg += " <span><img src=\"images/close_notify.svg\" class=\"close\" title=\"" +
+	msg += " <span><img src=\"images/cross.png\" class=\"close\" title=\"" +
 		__("Click to close") + "\" onclick=\"notify('')\"></span>";
 
 //	msg = "<img src='images/live_com_loading.gif'> " + msg;
-- 
cgit v1.2.3