diff options
author | Andrew Dolgov <[email protected]> | 2009-01-26 11:07:53 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2009-01-26 11:07:53 +0100 |
commit | 2eb9c95c970644f8408da9d22b60a66caadd36fb (patch) | |
tree | 28898aa275858840119816938380f1ef4562a5f6 | |
parent | c218ceb82c23fc37179c792a6c67af5114f0d079 (diff) |
support colored labels
-rw-r--r-- | functions.php | 53 | ||||
-rw-r--r-- | modules/backend-rpc.php | 10 | ||||
-rw-r--r-- | modules/pref-labels.php | 14 | ||||
-rw-r--r-- | tt-rss.css | 11 |
4 files changed, 63 insertions, 25 deletions
diff --git a/functions.php b/functions.php index 51be96f7a..a79b2345a 100644 --- a/functions.php +++ b/functions.php @@ -1572,7 +1572,8 @@ } function printFeedEntry($feed_id, $class, $feed_title, $unread, $icon_file, $link, - $rtl_content = false, $last_updated = false, $last_error = false) { + $rtl_content = false, $last_updated = false, $last_error = false, + $fg_content = false, $bg_content = false) { if (file_exists($icon_file) && filesize($icon_file) > 0) { $feed_icon = "<img id=\"FIMG-$feed_id\" src=\"$icon_file\">"; @@ -1598,6 +1599,18 @@ $feed = "<a title=\"$link_title\" id=\"FEEDL-$feed_id\" href=\"javascript:viewfeed('$feed_id', '', false, '', false, 0);\">$feed_title</a>"; +/* if ($feed_id < -10) { + $bg_color = "#00ccff"; + $fg_color = "white"; + } + + if ($fg_color || $bg_color) { + $color_str = "<div class='labelColorIndicator' + style='color : $fg_color; background-color : $bg_color'>l</div>"; + } + + print $color_str; */ + print "<li id=\"FEEDR-$feed_id\" class=\"$class\">"; if (get_pref($link, 'ENABLE_FEED_ICONS')) { print "$feed_icon"; @@ -1619,7 +1632,7 @@ print "<div class=\"feedExtInfo\"> <span id=\"FLUPD-$feed_id\">$last_updated ($total total) $error_notify_msg</span></div>"; } - + print "</li>"; } @@ -4086,7 +4099,7 @@ if (!$tags) { - $result = db_query($link, "SELECT id,caption FROM + $result = db_query($link, "SELECT * FROM ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption"); if (db_num_rows($result) > 0) { @@ -4118,7 +4131,9 @@ printFeedEntry($label_id, $class, $line["caption"], - $count, "images/label.png", $link); + $count, "images/label.png", $link, + false, false, false, + $line['fg_color'], $line['bg_color']); } @@ -4815,16 +4830,11 @@ $feed_id = $line["feed_id"]; $labels = get_article_labels($link, $id); - $labels_str = "<span id=\"HLLCTR-$id\">"; - - foreach ($labels as $l) { - $labels_str .= "<span - class='hlLabelRef'>". - $l[1]."</span>"; - } + $labels_str = "<span id=\"HLLCTR-$id\">"; + $labels_str .= format_article_labels($labels, $id); $labels_str .= "</span>"; - + if (count($topmost_article_ids) < 5) { array_push($topmost_article_ids, $id); } @@ -5815,7 +5825,7 @@ function get_article_labels($link, $id) { $result = db_query($link, - "SELECT DISTINCT label_id,caption + "SELECT DISTINCT label_id,caption,fg_color,bg_color FROM ttrss_labels2, ttrss_user_labels2 WHERE id = label_id AND article_id = '$id' @@ -5825,7 +5835,8 @@ $rv = array(); while ($line = db_fetch_assoc($result)) { - $rk = array($line["label_id"], $line["caption"]); + $rk = array($line["label_id"], $line["caption"], $line["fg_color"], + $line["bg_color"]); array_push($rv, $rk); } @@ -5991,4 +6002,18 @@ return $tags_str; } + + function format_article_labels($labels, $id) { + + $labels_str = ""; + + foreach ($labels as $l) { + $labels_str .= sprintf("<span class='hlLabelRef' + style='color : %s; background-color : %s'>%s</span>", + $l[2], $l[3], $l[1]); + } + + return $labels_str; + + } ?> 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>"; diff --git a/tt-rss.css b/tt-rss.css index cc98fbd24..fcc4c7b59 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -2087,4 +2087,15 @@ div#errorBox input { margin-bottom : 10px; } +span.prefsLabelEntry { + padding : 2px; +} +div.labelColorIndicator { + float : right; + height : 14px; + width : 14px; + line-height : 14px; + font-height : 9px; + text-align : center; +} |