update label rendering (and editor)

2 files changed, 19 insertions, 17 deletions

diff --git a/js/FeedTree.js b/js/FeedTree.js
index 812b9dd08..9344d70eb 100755
--- a/js/FeedTree.js
+++ b/js/FeedTree.js
@@ -34,17 +34,17 @@ define(["dojo/_base/declare", "dojo/dom-construct", "dijit/Tree", "dijit/Menu"],
 			const bare_id = parseInt(id.substr(id.indexOf(':')+1));
 
 			if (bare_id < _label_base_index) {
-				const span = dojo.doc.createElement('span');
-				const fg_color = args.item.fg_color[0];
+				const label = dojo.doc.createElement('i');
+				//const fg_color = args.item.fg_color[0];
 				const bg_color = args.item.bg_color[0];
 
-				span.innerHTML = "&alpha;";
-				span.className = 'labelColorIndicator';
-				span.setStyle({
-					color: fg_color,
-					backgroundColor: bg_color});
+				label.className = "material-icons icon icon-label";
+				label.innerHTML = "label";
+				label.setStyle({
+					color: bg_color,
+					});
 
-				domConstruct.place(span, tnode.iconNode, 'only');
+				domConstruct.place(label, tnode.iconNode, 'only');
 			}
 
 			if (id.match("FEED:")) {
diff --git a/js/PrefLabelTree.js b/js/PrefLabelTree.js
index 45c96af16..220fd9fe8 100644
--- a/js/PrefLabelTree.js
+++ b/js/PrefLabelTree.js
@@ -18,18 +18,20 @@ define(["dojo/_base/declare", "dojo/dom-construct", "lib/CheckBoxTree", "dijit/f
 			const bare_id = this.model.store.getValue(args.item, 'bare_id');
 
 			if (type == 'label') {
-				const span = dojo.doc.createElement('span');
-				span.innerHTML = '&alpha;';
-				span.className = 'labelColorIndicator';
-				span.id = 'LICID-' + bare_id;
+				const label = dojo.doc.createElement('i');
+				//const fg_color = args.item.fg_color[0];
+				const bg_color = args.item.bg_color[0];
 
-				span.setStyle({
-					color: fg_color,
-					backgroundColor: bg_color});
+				label.className = "material-icons icon-label";
+				label.innerHTML = "label";
+				label.setStyle({
+					color: bg_color,
+				});
 
-				tnode._labelIconNode = span;
+				domConstruct.place(label, tnode.iconNode, 'before');
 
-				domConstruct.place(tnode._labelIconNode, tnode.labelNode, 'before');
+				//tnode._labelIconNode = span;
+				//domConstruct.place(tnode._labelIconNode, tnode.labelNode, 'before');
 			}
 
 			return tnode;