Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
This commit is contained in:
commit
9d9432dab8
|
@ -450,12 +450,14 @@ class Feeds extends Handler_Protected {
|
||||||
|
|
||||||
$reply['content'] .= "<span class=\"hlUpdated\">";
|
$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\">
|
$reply['content'] .= "<div class=\"hlFeed\">
|
||||||
<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
|
<a href=\"#\" onclick=\"viewfeed($feed_id)\">".
|
||||||
$line["feed_title"]."</a>
|
$line["feed_title"]."</a>
|
||||||
</div>";
|
</div>";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$reply['content'] .= "$updated_fmt</span>";
|
$reply['content'] .= "$updated_fmt</span>";
|
||||||
$reply['content'] .= "<div class=\"hlRight\">";
|
$reply['content'] .= "<div class=\"hlRight\">";
|
||||||
|
|
|
@ -485,6 +485,7 @@ div.hlFeed, div.hlFeed a {
|
||||||
color : gray;
|
color : gray;
|
||||||
font-style : italic;
|
font-style : italic;
|
||||||
font-weight : normal;
|
font-weight : normal;
|
||||||
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.hlFeed a:hover {
|
div.hlFeed a:hover {
|
||||||
|
|
Loading…
Reference in New Issue