add rrow background color setting by first assigned label

diff --git a/classes/feeds.php b/classes/feeds.php
index df206c2efadbbe20118cf0fc51932cb69536ec10..463fadfb0c2dbfd48ea2559df77571691f4263f8 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -1,4 +1,6 @@
 <?php\r
+require_once "colors.php";\r
+\r
 class Feeds extends Handler_Protected {\r
 \r
        function csrf_ignore($method) {\r
@@ -261,6 +263,7 @@ class Feeds extends Handler_Protected {
                                $feed_id = $line["feed_id"];\r
                                $label_cache = $line["label_cache"];\r
                                $labels = false;\r
+                               $label_row_style = "";\r
 \r
                                if ($label_cache) {\r
                                        $label_cache = json_decode($label_cache, true);\r
@@ -268,8 +271,24 @@ class Feeds extends Handler_Protected {
                                        if ($label_cache) {\r
                                                if ($label_cache["no-labels"] == 1)\r
                                                        $labels = array();\r
-                                               else\r
+                                               else {\r
                                                        $labels = $label_cache;\r
+                                                       if (count($labels) > 0) {\r
+                                                               $bg = rgb2hsl(_color_unpack($labels[0][3]));\r
+                                                               if ($bg && $bg[1] > 0) {\r
+\r
+                                                                       $bg[1] = 0.04;\r
+\r
+                                                                       if ($class == "even")\r
+                                                                               $bg[2] = 0.9;\r
+                                                                       else\r
+                                                                               $bg[2] = 1;\r
+\r
+                                                                       $bg = _color_pack(hsl2rgb($bg));\r
+                                                                       $label_row_style = "style='background-color : $bg;'";\r
+                                                               }\r
+                                                       }\r
+                                               }\r
                                        }\r
                                }\r
 \r
@@ -407,7 +426,7 @@ class Feeds extends Handler_Protected {
                                        $mouseover_attrs = "onmouseover='postMouseIn($id)'\r
                                                onmouseout='postMouseOut($id)'";\r
 \r
-                                       $reply['content'] .= "<div class='$class' id='RROW-$id' $mouseover_attrs>";\r
+                                       $reply['content'] .= "<div class='$class' id='RROW-$id' $label_row_style $mouseover_attrs>";\r
 \r
                                        $reply['content'] .= "<div class='hlUpdPic'>$update_pic</div>";\r
 \r
@@ -498,7 +517,7 @@ class Feeds extends Handler_Protected {
                                        $mouseover_attrs = "onmouseover='postMouseIn($id)'\r
                                                onmouseout='postMouseOut($id)'";\r
 \r
-                                       $reply['content'] .= "<div class=\"$class\"\r
+                                       $reply['content'] .= "<div class=\"$class\" $label_row_style\r
                                                id=\"RROW-$id\" $mouseover_attrs'>";\r
 \r
                                        $reply['content'] .= "<div class=\"cdmHeader\">";\r

diff --git a/include/colors.php b/include/colors.php
new file mode 100644 (file)
index 0000000..dcd79a9
--- /dev/null
+++ b/include/colors.php
@@ -0,0 +1,119 @@
+<?php
+### RGB >> HSL
+function _color_rgb2hsl($rgb) {
+  $r = $rgb[0]; $g = $rgb[1]; $b = $rgb[2];
+  $min = min($r, min($g, $b)); $max = max($r, max($g, $b));
+  $delta = $max - $min; $l = ($min + $max) / 2; $s = 0;
+  if ($l > 0 && $l < 1) {
+    $s = $delta / ($l < 0.5 ? (2 * $l) : (2 - 2 * $l));
+  }
+  $h = 0;
+  if ($delta > 0) {
+    if ($max == $r && $max != $g) $h += ($g - $b) / $delta;
+    if ($max == $g && $max != $b) $h += (2 + ($b - $r) / $delta);
+    if ($max == $b && $max != $r) $h += (4 + ($r - $g) / $delta);
+    $h /= 6;
+  } return array($h, $s, $l);
+}
+
+### HSL >> RGB
+function _color_hsl2rgb($hsl) {
+  $h = $hsl[0]; $s = $hsl[1]; $l = $hsl[2];
+  $m2 = ($l <= 0.5) ? $l * ($s + 1) : $l + $s - $l*$s;
+  $m1 = $l * 2 - $m2;
+  return array(_color_hue2rgb($m1, $m2, $h + 0.33333),
+               _color_hue2rgb($m1, $m2, $h),
+               _color_hue2rgb($m1, $m2, $h - 0.33333));
+}
+
+### Helper function for _color_hsl2rgb().
+function _color_hue2rgb($m1, $m2, $h) {
+  $h = ($h < 0) ? $h + 1 : (($h > 1) ? $h - 1 : $h);
+  if ($h * 6 < 1) return $m1 + ($m2 - $m1) * $h * 6;
+  if ($h * 2 < 1) return $m2;
+  if ($h * 3 < 2) return $m1 + ($m2 - $m1) * (0.66666 - $h) * 6;
+  return $m1;
+}
+
+### Convert a hex color into an RGB triplet.
+function _color_unpack($hex, $normalize = false) {
+  if (strlen($hex) == 4) {
+    $hex = $hex[1] . $hex[1] . $hex[2] . $hex[2] . $hex[3] . $hex[3];
+  } $c = hexdec($hex);
+  for ($i = 16; $i >= 0; $i -= 8) {
+    $out[] = (($c >> $i) & 0xFF) / ($normalize ? 255 : 1);
+  } return $out;
+}
+
+### Convert an RGB triplet to a hex color.
+function _color_pack($rgb, $normalize = false) {
+  foreach ($rgb as $k => $v) {
+    $out |= (($v * ($normalize ? 255 : 1)) << (16 - $k * 8));
+  }return '#'. str_pad(dechex($out), 6, 0, STR_PAD_LEFT);
+}
+
+function rgb2hsl($arr) {
+       $r = $arr[0];
+       $g = $arr[1];
+       $b = $arr[2];
+
+   $var_R = ($r / 255);
+   $var_G = ($g / 255);
+   $var_B = ($b / 255);
+
+   $var_Min = min($var_R, $var_G, $var_B);
+   $var_Max = max($var_R, $var_G, $var_B);
+   $del_Max = $var_Max - $var_Min;
+
+   $v = $var_Max;
+
+   if ($del_Max == 0) {
+      $h = 0;
+      $s = 0;
+   } else {
+      $s = $del_Max / $var_Max;
+
+      $del_R = ( ( ( $max - $var_R ) / 6 ) + ( $del_Max / 2 ) ) / $del_Max;
+      $del_G = ( ( ( $max - $var_G ) / 6 ) + ( $del_Max / 2 ) ) / $del_Max;
+      $del_B = ( ( ( $max - $var_B ) / 6 ) + ( $del_Max / 2 ) ) / $del_Max;
+
+      if      ($var_R == $var_Max) $h = $del_B - $del_G;
+      else if ($var_G == $var_Max) $h = ( 1 / 3 ) + $del_R - $del_B;
+      else if ($var_B == $var_Max) $h = ( 2 / 3 ) + $del_G - $del_R;
+
+      if ($H < 0) $h++;
+      if ($H > 1) $h--;
+   }
+
+   return array($h, $s, $v);
+}
+
+function hsl2rgb($arr) {
+       $h = $arr[0];
+       $s = $arr[1];
+       $v = $arr[2];
+
+    if($s == 0) {
+        $r = $g = $B = $v * 255;
+    } else {
+        $var_H = $h * 6;
+        $var_i = floor( $var_H );
+        $var_1 = $v * ( 1 - $s );
+        $var_2 = $v * ( 1 - $s * ( $var_H - $var_i ) );
+        $var_3 = $v * ( 1 - $s * (1 - ( $var_H - $var_i ) ) );
+
+        if       ($var_i == 0) { $var_R = $v     ; $var_G = $var_3  ; $var_B = $var_1 ; }
+        else if  ($var_i == 1) { $var_R = $var_2 ; $var_G = $v      ; $var_B = $var_1 ; }
+        else if  ($var_i == 2) { $var_R = $var_1 ; $var_G = $v      ; $var_B = $var_3 ; }
+        else if  ($var_i == 3) { $var_R = $var_1 ; $var_G = $var_2  ; $var_B = $v     ; }
+        else if  ($var_i == 4) { $var_R = $var_3 ; $var_G = $var_1  ; $var_B = $v     ; }
+        else                   { $var_R = $v     ; $var_G = $var_1  ; $var_B = $var_2 ; }
+
+        $r = $var_R * 255;
+        $g = $var_G * 255;
+        $B = $var_B * 255;
+    }
+    return array($r, $g, $B);
+}
+
+?>

diff --git a/tt-rss.css b/tt-rss.css
index 619a03f98df1639790e5070b2e0838e6cea4416a..ef84b75801988535050c48fa35b8a8cf44b5792c 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -190,11 +190,11 @@ a:hover {
 }
 
 .Selected, .Selected td {
-       background-color : #fff7d5;
+       background-color : #fff7d5 ! important;
 }
 
 .even.Unread.Selected, .even.Unread.Selected td {
-       background-color : #fff7d5;
+       background-color : #fff7d5 ! important;
        font-weight : bold;
        border-width : 0px 0px 1px 0px;
        border-style : solid;
@@ -202,7 +202,7 @@ a:hover {
 }
 
 .odd.Unread.Selected, .odd.Unread.Selected td {
-       background-color : #fff7d5;
+       background-color : #fff7d5 ! important;
        font-weight : bold;
        border-width : 0px 0px 1px 0px;
        border-style : solid;