From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 13 Mar 2013 08:33:59 +0000 (+0400)
Subject: enable feed titles in vfeeds in combined mode, align to date
X-Git-Tag: 1.7.3~12
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=ef69681b93e48ceaa909b0941780f9a80887747f;p=tt-rss.git

enable feed titles in vfeeds in combined mode, align to date
---

diff --git a/cdm.css b/cdm.css
index 148b0e97..83de011f 100644
--- a/cdm.css
+++ b/cdm.css
@@ -100,3 +100,7 @@ div.articleNote {
 	border-style : dashed none dashed none;
 }
 
+div.cdmHeader span.hlFeed {
+	float : right;
+	font-weight : normal;
+}
diff --git a/classes/feeds.php b/classes/feeds.php
index b57f66a6..8549f8a7 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -544,12 +544,11 @@ 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 (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) {
 						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>
 							</span>";
 						}
 					}