From: Andrew Dolgov <fox@bah.spb.su>
Date: Mon, 26 Jan 2009 11:05:06 +0000 (+0100)
Subject: tmp disable colored labels (2)
X-Git-Tag: git2svn-syncpoint-master~9
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=76b2bc6559f1bf9e3d4b60e61bc059780efc2f09;p=tt-rss.git

tmp disable colored labels (2)
---

diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index 8e0efdbc..9e487e0c 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -186,9 +186,9 @@
 					onclick='toggleSelectPrefRow(this, \"label\");' 
 					type=\"checkbox\" id=\"LICHK-".$line["id"]."\"></td>";
 	
-/*				$id = $line['id'];
+				$id = $line['id'];
 
-				print "<td width='30' align='center'>
+/*				print "<td width='30' align='center'>
 					<div class='labelColorIndicator' 
 					style='color : $fg_color; background-color : $bg_color'
 					onclick=\"colorPicker(this, '$id', '$fg_color', '$bg_color')\">z</div>";
@@ -196,9 +196,11 @@
 				print "</td>"; */
 
 				print "<td><span class='prefsLabelEntry' 
+					style='color : $fg_color; background-color : $bg_color'
 					id=\"LILT-".$line["id"]."\">" . $line["caption"] . 
 					"</span>";
 
+				print "</td>";
 
 				print "</tr>";
 	
diff --git a/prefs.js b/prefs.js
index a3d38c9d..334bed37 100644
--- a/prefs.js
+++ b/prefs.js
@@ -1968,6 +1968,7 @@ function batchFeedsToggleField(cb, elem, label) {
 	}
 }
 
+/*
 function colorPicker(caller, id, fg, bg) {
 	try {
 		var picker = document.getElementById("colorPicker");
@@ -1979,4 +1980,4 @@ function colorPicker(caller, id, fg, bg) {
 	} catch (e) {
 		exception_error("colorPicker", e);
 	}
-}
+}*/
diff --git a/tt-rss.css b/tt-rss.css
index ba69820f..e6c5a957 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -2121,3 +2121,5 @@ div#colorPicker {
 	top : 50px;
 	z-index : 3;
 }
+
+