From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Fri, 8 Aug 2008 03:46:02 +0000 (+0100)
Subject: display feed icons in grouped vfeed mode
X-Git-Tag: 1.2.26~23
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=dc80334727fbcfd6ad4fc268687982c4617779f5;p=tt-rss.git

display feed icons in grouped vfeed mode
---

diff --git a/functions.php b/functions.php
index eb67f520..1e1aff0e 100644
--- a/functions.php
+++ b/functions.php
@@ -5001,7 +5001,19 @@
 
 							$vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id, \"$cur_feed_title\");' href='#'>mark as read</a>)";
 
+							$has_feed_icon = is_file(ICONS_DIR . "/$feed_id.ico");
+
+							if ($has_feed_icon) {
+								$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
+							} else {
+								//$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">";
+							}
+
+//							$class = "odd";
+//							$lnum = 0;
+
 							print "<tr class='feedTitle'><td colspan='7'>".
+								"<div style=\"float : right\">$feed_icon_img</div>".
 								"<a href=\"javascript:viewfeed($feed_id, '', false)\">".
 								$line["feed_title"]."</a> $vf_catchup_link:</td></tr>";
 						}
@@ -5079,7 +5091,16 @@
 
 							$vf_catchup_link = "(<a onclick='javascript:catchupFeedInGroup($feed_id, \"$cur_feed_title\");' href='#'>mark as read</a>)";
 
+							$has_feed_icon = is_file(ICONS_DIR . "/$feed_id.ico");
+
+							if ($has_feed_icon) {
+								$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
+							} else {
+								//$feed_icon_img = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\" alt=\"\">";
+							}
+
 							print "<div class='cdmFeedTitle'>".
+								"<div style=\"float : right\">$feed_icon_img</div>".
 								"<a href=\"javascript:viewfeed($feed_id, '', false)\">".
 								$line["feed_title"]."</a> $vf_catchup_link</div>";
 						}
diff --git a/tt-rss.css b/tt-rss.css
index 6b5cc390..5e02e32f 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -364,9 +364,9 @@ a.button {
 	.evenSelectedUnread td {
 	background-color : #fff7d5;
 	font-weight : bold;
-		  border-width : 1px 0px 1px 0px;
-		  border-style : solid;
-		  border-color : #e7d796;
+	border-width : 1px 0px 1px 0px;
+	border-style : solid;
+	border-color : #e7d796;
 }
 
 .oddUnreadSelected, .oddSelectedUnread, .oddUnreadSelected td,
@@ -377,9 +377,10 @@ a.button {
 
 .evenSelected, .evenSelected td {
 	background-color : #fff7d5;
-		  border-width : 1px 0px 1px 0px;
-		  border-style : solid;
-		  border-color : #e7d796;
+	border-width : 1px 0px 1px 0px;
+	border-style : solid;
+	border-color : #e7d796;
+	border-collapse : collapse;
 }
 
 .oddSelected, .evenSelected td {
@@ -389,9 +390,10 @@ a.button {
 .evenGrayed, .evenGrayed td {
 	background-color : #f0f0f0;
 	color : #909090;
-		  border-width : 1px 0px 1px 0px;
-		  border-style : solid;
-		  border-color : #c0c0c0;
+	border-width : 1px 0px 1px 0px;
+	border-style : solid;
+	border-color : #c0c0c0;
+	border-collapse : collapse;
 }
 
 .oddGrayed {
@@ -399,18 +401,20 @@ a.button {
 }
 
 .even, .even td {
-		  border-width : 1px 0px 1px 0px;
-		  border-style : solid;
-		  border-color : #c0c0c0;
+	border-width : 1px 0px 1px 0px;
+	border-style : solid;
+	border-color : #c0c0c0;
 	background-color : #f0f0f0;
+	border-collapse : collapse;
 }
 
 .evenUnread, .evenUnread td {
 	background-color : #f0f0f0;
 	font-weight : bold;
-		  border-width : 1px 0px 1px 0px;
-		  border-style : solid;
-		  border-color : #c0c0c0;
+	border-width : 1px 0px 1px 0px;
+	border-style : solid;
+	border-color : #c0c0c0;
+	border-collapse : collapse;
 }
 
 .oddUnread, .oddUnread td {
@@ -1860,12 +1864,28 @@ div.cdmFeedTitle {
 	border-width : 0px 0px 1px 0px;
 	border-style : solid;
 	padding : 5px;
+	background : url("images/toolbar.png") bottom left;
+	background-repeat : repeat-x;
+}
+
+table.headlinesList tr, table.headlinesList td {
+	border-collapse : collapse;
+	margin : 0px;
 }
 
 table.headlinesList tr.feedTitle td {
 /*	text-align : right;
 	margin-top : 10px; */
-	padding-left : 5px;
+	/*padding-left : 5px;*/
+
+	background : url("images/toolbar.png") bottom left;
+	background-repeat : repeat-x;
+
+	border-color : #c0c0c0;
+	border-width : 0px 0px 1px 0px;
+	border-style : solid;
+	padding : 5px;
+
 }
 
 td.hlContent, td.hlContentL, td.hlContentH {