From e17e99fbcf62f2e347ce771a795be3237521f6b5 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 16 Mar 2013 17:17:55 +0400
Subject: add back vfeed title display, optimize layout; do some layout tweaks
 on combined mode

---
 classes/feeds.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'classes/feeds.php')

diff --git a/classes/feeds.php b/classes/feeds.php
index a3ed951dc..e96aaba30 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -441,19 +441,18 @@ class Feeds extends Handler_Protected {
 
 					$reply['content'] .= $labels_str;
 
-					if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED') &&
-						defined('_SHOW_FEED_TITLE_IN_VFEEDS')) {
-						if (@$line["feed_title"]) {
+					$reply['content'] .= "</div>";
+
+					$reply['content'] .= "<span class=\"hlUpdated\">";
+
+					if (@$line["feed_title"]) {
 							$reply['content'] .= "<span class=\"hlFeed\">
-								(<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
-								$line["feed_title"]."</a>)
+								<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
+								$line["feed_title"]."</a><br/>
 							</span>";
 						}
-					}
 
-					$reply['content'] .= "</div>";
-
-					$reply['content'] .= "<span class=\"hlUpdated\">$updated_fmt</span>";
+					$reply['content'] .= "$updated_fmt</span>";
 					$reply['content'] .= "<div class=\"hlRight\">";
 
 					$reply['content'] .= $score_pic;
@@ -561,8 +560,9 @@ class Feeds extends Handler_Protected {
 						}
 					}
 
-					$reply['content'] .= "<div style=\"vertical-align : middle\">";
 					$reply['content'] .= "<span class='updated'>$updated_fmt</span>";
+
+					$reply['content'] .= "<div style=\"vertical-align : middle\">";
 					$reply['content'] .= "$score_pic";
 
 					if (!get_pref($this->link, "VFEED_GROUP_BY_FEED") && $line["feed_title"]) {
-- 
cgit v1.2.3-54-g00ecf