display feed icons in ungrouped vfeeds

2 files changed, 20 insertions, 15 deletions

diff --git a/functions.php b/functions.php
index 1e1aff0e3..b6212cd15 100644
--- a/functions.php
+++ b/functions.php
@@ -4989,6 +4989,14 @@
 					$entry_author = " - $entry_author";
 				}
 
+				$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=\"\">";
+				}
+
 				if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
 
 					if (get_pref($link, 'VFEED_GROUP_BY_FEED')) {
@@ -5001,17 +5009,6 @@
 
 							$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)\">".
@@ -5067,16 +5064,18 @@
 							</span>";
 						}
 					}
-
-
 					print "</td>";
-					
+
 #					}
 					
 					print "<td class=\"hlUpdated\" onclick='javascript:view($id,$feed_id)'><nobr>$updated_fmt&nbsp;</nobr></td>";
 
 					print "<td class='hlMarkedPic'>$score_pic</td>";
-	
+
+					if ($line["feed_title"] && !get_pref($link, 'VFEED_GROUP_BY_FEED')) {
+						print "<td class=\"hlFeedIcon\">$feed_icon_img</td>";
+					}
+
 					print "</tr>";
 
 				} else {
diff --git a/tt-rss.css b/tt-rss.css
index 1dced04f9..ae8240e88 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -872,6 +872,12 @@ table.headlinesList {
 	width : 100%;
 }
 
+table.headlinesList td.hlFeedIcon {
+	width : 25px;
+	text-align : center;
+}
+
+
 table.headlinesList td.hlMarkedPic {
 	width : 25px;
 	text-align : center;