diff options
| author | Andrew Dolgov <[email protected]> | 2013-03-21 12:48:33 -0700 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-03-21 12:48:33 -0700 |
| commit | 043dacd3b1d39fe1eedecc2ab40f6bc153df3684 (patch) | |
| tree | f5f72b772f9f05b856de971d6261b6f18a09f3f9 | |
| parent | 8ef7b02e4d45cd8494fd769140cfa091171e96d9 (diff) | |
| parent | 051174c39e42d9cf24e0bc796338b351d552e197 (diff) | |
Merge pull request #67 from Joschasa/master
Fix feed title display in "normal" (not combined) mode
| -rw-r--r-- | classes/feeds.php | 4 | ||||
| -rw-r--r-- | tt-rss.css | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/classes/feeds.php b/classes/feeds.php index b8ef1f544..779614dce 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -450,12 +450,14 @@ class Feeds extends Handler_Protected { $reply['content'] .= "<span class=\"hlUpdated\">"; - if (@$line["feed_title"]) { + if (!get_pref($this->link, 'VFEED_GROUP_BY_FEED')) { + if (@$line["feed_title"]) { $reply['content'] .= "<div class=\"hlFeed\"> <a href=\"#\" onclick=\"viewfeed($feed_id)\">". $line["feed_title"]."</a> </div>"; } + } $reply['content'] .= "$updated_fmt</span>"; $reply['content'] .= "<div class=\"hlRight\">"; diff --git a/tt-rss.css b/tt-rss.css index a6c511967..9fc52b209 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -485,6 +485,7 @@ div.hlFeed, div.hlFeed a { color : gray; font-style : italic; font-weight : normal; + white-space: nowrap; } div.hlFeed a:hover { |