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

diff --git a/cdm.css b/cdm.css
index 148b0e97fb8de06fe145ff3d13afda096bbfbaca..83de011f7a63e3bdbec24ff555d5e00eda8cde21 100644 (file)
--- 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 b57f66a6fdb0c340f567c0dc5e4770237aefffd2..8549f8a76dd519da9c4bf399f206e619b470a226 100644 (file)
--- 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>";
                                                }
                                        }