From 2eb9c95c970644f8408da9d22b60a66caadd36fb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.spb.su>
Date: Mon, 26 Jan 2009 11:07:53 +0100
Subject: support colored labels

---
 modules/backend-rpc.php | 10 ++--------
 modules/pref-labels.php | 14 +++++++++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'modules')

diff --git a/modules/backend-rpc.php b/modules/backend-rpc.php
index 855d54aa7..04e2858ca 100644
--- a/modules/backend-rpc.php
+++ b/modules/backend-rpc.php
@@ -444,10 +444,7 @@
 					print "<entry id=\"$id\"><![CDATA[";
 
 					$labels = get_article_labels($link, $id, $_SESSION["uid"]);
-
-					foreach ($labels as $l) {
-						print  "<span class='hlLabelRef'>".$l[1]."</span>";
-					}
+					print format_article_labels($labels, $id);
 
 					print "]]></entry>";
 
@@ -483,10 +480,7 @@
 					print "<entry id=\"$id\"><![CDATA[";
 
 					$labels = get_article_labels($link, $id, $_SESSION["uid"]);
-
-					foreach ($labels as $l) {
-						print  "<span class='hlLabelRef'>".$l[1]."</span>";
-					}
+					print format_article_labels($labels, $id);
 
 					print "]]></entry>";
 
diff --git a/modules/pref-labels.php b/modules/pref-labels.php
index b09a16cf5..059079a71 100644
--- a/modules/pref-labels.php
+++ b/modules/pref-labels.php
@@ -110,7 +110,7 @@
 		}
 
 		$result = db_query($link, "SELECT 
-				id,caption
+				*
 			FROM 
 				ttrss_labels2
 			WHERE 
@@ -149,12 +149,20 @@
 				print "<tr class=\"$class\" $this_row_id>";
 	
 				$line["caption"] = htmlspecialchars($line["caption"]);
-	
+
+				$fg_color = $line["fg_color"];
+				$bg_color = $line["bg_color"];
+
+				if (!$fg_color) $fg_color = "black";
+				if (!$bg_color) $bg_color = "transparent";
+
 				print "<td width='5%' align='center'><input 
 					onclick='toggleSelectPrefRow(this, \"label\");' 
 					type=\"checkbox\" id=\"LICHK-".$line["id"]."\"></td>";
 	
-				print "<td><span id=\"LILT-".$line["id"]."\">" . $line["caption"] . 
+				print "<td><span class='prefsLabelEntry' 
+					style='color : $fg_color; background-color : $bg_color'
+					id=\"LILT-".$line["id"]."\">" . $line["caption"] . 
 					"</span></td>";
 
 				print "</tr>";
-- 
cgit v1.2.3