valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

normalize archived articles output in headlines

This commit is contained in:
Andrew Dolgov 2018-12-06 19:00:11 +03:00
parent 544b5049b4
commit e9cf8e8e35
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
classes/feeds.php
View File

@ -259,6 +259,12 @@ class Feeds extends Handler_Protected {
$label_cache = $line["label_cache"]; $label_cache = $line["label_cache"];
$labels = false; $labels = false;
// normalize archived feed
if ($feed_id === null) {
$feed_id = 0;
$line["feed_title"] = __("Archived articles");
}
$mouseover_attrs = "onmouseover='Article.mouseIn($id)' onmouseout='Article.mouseOut($id)'"; $mouseover_attrs = "onmouseover='Article.mouseIn($id)' onmouseout='Article.mouseOut($id)'";
if ($label_cache) { if ($label_cache) {
@ -315,7 +321,7 @@ class Feeds extends Handler_Protected {
if (feeds::feedHasIcon($feed_id)) { if (feeds::feedHasIcon($feed_id)) {
$feed_icon_img = "<img class=\"icon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">"; $feed_icon_img = "<img class=\"icon\" src=\"".ICONS_URL."/$feed_id.ico\" alt=\"\">";
} else { } else {
$feed_icon_img = "<i class='icon-syndicate material-icons'>rss_feed</i>"; $feed_icon_img = "<i class='icon-no-feed material-icons'>rss_feed</i>";
} }
$entry_site_url = $line["site_url"]; $entry_site_url = $line["site_url"];
@ -334,7 +340,7 @@ class Feeds extends Handler_Protected {
if (!get_pref('COMBINED_DISPLAY_MODE')) { if (!get_pref('COMBINED_DISPLAY_MODE')) {
if ($vfeed_group_enabled) { if ($vfeed_group_enabled) {
if ($feed_id != $vgroup_last_feed && $line["feed_title"]) { if ($feed_id != $vgroup_last_feed) {
$vgroup_last_feed = $feed_id; $vgroup_last_feed = $feed_id;
@ -345,8 +351,6 @@ class Feeds extends Handler_Protected {
"<a class='title' href=\"#\" onclick=\"Feeds.open({feed:$feed_id})\">". "<a class='title' href=\"#\" onclick=\"Feeds.open({feed:$feed_id})\">".
$line["feed_title"]."</a> $line["feed_title"]."</a>
$vf_catchup_link</div>"; $vf_catchup_link</div>";
} }
} }
@ -399,8 +403,7 @@ class Feeds extends Handler_Protected {
$reply['content'] .= $score_pic; $reply['content'] .= $score_pic;
if ($line["feed_title"] && !$vfeed_group_enabled) { if (!$vfeed_group_enabled) {
$reply['content'] .= "<span onclick=\"Feeds.open({feed:$feed_id})\" $reply['content'] .= "<span onclick=\"Feeds.open({feed:$feed_id})\"
style=\"cursor : pointer\" style=\"cursor : pointer\"
title=\"".htmlspecialchars($line['feed_title'])."\"> title=\"".htmlspecialchars($line['feed_title'])."\">
@ -475,8 +478,8 @@ class Feeds extends Handler_Protected {
$tmp_content .= "<span $tmp_content .= "<span
onclick=\"return Headlines.click(event, $id);\" onclick=\"return Headlines.click(event, $id);\"
data-article-id=\"$id\" data-article-id=\"$id\"
class=\"titleWrap hlMenuAttach $hlc_suffix\"> class=\"titleWrap hlMenuAttach\">
<a class=\"title $hlc_suffix\" <a class=\"title\"
title=\"".htmlspecialchars($line["title"])."\" title=\"".htmlspecialchars($line["title"])."\"
target=\"_blank\" rel=\"noopener noreferrer\" href=\"". target=\"_blank\" rel=\"noopener noreferrer\" href=\"".
htmlspecialchars($line["link"])."\">". htmlspecialchars($line["link"])."\">".
@ -514,7 +517,7 @@ class Feeds extends Handler_Protected {
$tmp_content .= "<div class='right'>"; $tmp_content .= "<div class='right'>";
$tmp_content .= "$score_pic"; $tmp_content .= "$score_pic";
if (!get_pref("VFEED_GROUP_BY_FEED") && $line["feed_title"]) { if (!get_pref("VFEED_GROUP_BY_FEED")) {
$tmp_content .= "<span style=\"cursor : pointer\" $tmp_content .= "<span style=\"cursor : pointer\"
title=\"".htmlspecialchars($line["feed_title"])."\" title=\"".htmlspecialchars($line["feed_title"])."\"
onclick=\"Feeds.open({feed:$feed_id})\">$feed_icon_img</span>"; onclick=\"Feeds.open({feed:$feed_id})\">$feed_icon_img</span>";

3
css/default.css
View File

@ -998,6 +998,9 @@ body.ttrss_main i.icon-syndicate {
border: 1px solid #ff7c4b; border: 1px solid #ff7c4b;
border-radius: 4px; border-radius: 4px;
} }
body.ttrss_main i.icon-no-feed {
opacity: 0.2;
}
body.ttrss_main .cdm.marked .left i.marked-pic, body.ttrss_main .cdm.marked .left i.marked-pic,
body.ttrss_main .hl.marked .left i.marked-pic { body.ttrss_main .hl.marked .left i.marked-pic {
color: #ffc069; color: #ffc069;

2
css/default.css.map
View File

File diff suppressed because one or more lines are too long

4
css/tt-rss.less
View File

@ -1180,6 +1180,10 @@ body.ttrss_main {
border-radius : 4px; border-radius : 4px;
} }
i.icon-no-feed {
opacity : 0.2;
}
.cdm.marked .left i.marked-pic, .cdm.marked .left i.marked-pic,
.hl.marked .left i.marked-pic { .hl.marked .left i.marked-pic {
color : @color-marked; color : @color-marked;