Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS

This commit is contained in:
Andrew Dolgov 2013-03-21 23:48:44 +04:00
commit 9d9432dab8
2 changed files with 4 additions and 1 deletions

View File

@ -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\">";

View File

@ -485,6 +485,7 @@ div.hlFeed, div.hlFeed a {
color : gray;
font-style : italic;
font-weight : normal;
white-space: nowrap;
}
div.hlFeed a:hover {