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

remove fupdpic and related images

This commit is contained in:
Andrew Dolgov 2012-12-25 14:42:20 +04:00
parent a675da08de
commit f947467aa8
6 changed files with 16 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
classes/feeds.php
View File

@ -320,23 +320,6 @@ class Feeds extends Handler_Protected {
array_push($topmost_article_ids, $id);
}
if ($line["last_read"] == "" && !sql_bool_to_bool($line["unread"])) {
$update_pic = "<img id='FUPDPIC-$id' src=\"".
theme_image($this->link, 'images/updated.png')."\"
alt=\"Updated\">";
} else {
$update_pic = "<img id='FUPDPIC-$id' src=\"images/blank_icon.gif\"
alt=\"Updated\">";
}
if (sql_bool_to_bool($line["unread"]) &&
time() - strtotime($line["updated_noms"]) < $fresh_intl) {
$update_pic = "<img id='FUPDPIC-$id' src=\"".
theme_image($this->link, 'images/fresh_sign.png')."\" alt=\"Fresh\">";
}
if ($line["unread"] == "t" || $line["unread"] == "1") {
$class .= " Unread";
++$num_unread;
@ -446,8 +429,6 @@ class Feeds extends Handler_Protected {
$reply['content'] .= "<div class='$class' id='RROW-$id' $label_row_style $mouseover_attrs>";
$reply['content'] .= "<div class='hlUpdPic'>$update_pic</div>";
$reply['content'] .= "<div class='hlLeft'>";
$reply['content'] .= "<input dojoType=\"dijit.form.CheckBox\"
@ -595,7 +576,6 @@ class Feeds extends Handler_Protected {
title=\"".htmlspecialchars($line["feed_title"])."\"
onclick=\"viewfeed($feed_id)\">$feed_icon_img</span>";
}
$reply['content'] .= "<div class=\"updPic\">$update_pic</div>";
$reply['content'] .= "</div>";
$reply['content'] .= "</div>";

BIN
images/fresh_sign.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 131 B

BIN
images/updated.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 117 B

BIN
images/www.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 112 B

61
js/viewfeed.js
View File

@ -254,8 +254,6 @@ function showArticleInHeadlines(id) {
selectArticles('none');
var upd_img_pic = $("FUPDPIC-" + id);
var view_mode = false;
try {
@ -265,14 +263,7 @@ function showArticleInHeadlines(id) {
//
}
if (upd_img_pic && (upd_img_pic.src.match("updated.png") ||
upd_img_pic.src.match("fresh_sign.png"))) {
upd_img_pic.src = "images/blank_icon.gif";
cache_headlines(getActiveFeedId(), activeFeedIsCat(), null, $("headlines-frame").innerHTML);
} else if (article_is_unread && view_mode == "all_articles") {
if (article_is_unread && view_mode == "all_articles") {
cache_headlines(getActiveFeedId(), activeFeedIsCat(), null, $("headlines-frame").innerHTML);
}
@ -302,10 +293,6 @@ function article_callback2(transport, id) {
if (reply) {
var upic = $('FUPDPIC-' + id);
if (upic) upic.src = 'images/blank_icon.gif';
reply.each(function(article) {
if (active_post_id == article['id']) {
render_article(article['content']);
@ -385,15 +372,7 @@ function view(id) {
precache_headlines();
if (!cached_article) {
var upic = $('FUPDPIC-' + id);
if (upic) {
upic.src = getInitParam("sign_progress");
}
} else if (cached_article && article_is_unread) {
if (cached_article && article_is_unread) {
query = query + "&mode=prefetch";
@ -887,48 +866,48 @@ function selectArticles(mode) {
if (mode == "all") {
child.addClassName("Selected");
cb.attr("checked", true);
if (cb) cb.attr("checked", true);
} else if (mode == "unread") {
if (child.hasClassName("Unread")) {
child.addClassName("Selected");
cb.attr("checked", true);
if (cb) cb.attr("checked", true);
} else {
child.removeClassName("Selected");
cb.attr("checked", false);
if (cb) cb.attr("checked", false);
}
} else if (mode == "marked") {
var img = $("FMPIC-" + child.id.replace("RROW-", ""));
if (img && img.src.match("mark_set")) {
child.addClassName("Selected");
cb.attr("checked", true);
if (cb) cb.attr("checked", true);
} else {
child.removeClassName("Selected");
cb.attr("checked", false);
if (cb) cb.attr("checked", false);
}
} else if (mode == "published") {
var img = $("FPPIC-" + child.id.replace("RROW-", ""));
if (img && img.src.match("pub_set")) {
child.addClassName("Selected");
cb.attr("checked", true);
if (cb) cb.attr("checked", true);
} else {
child.removeClassName("Selected");
cb.attr("checked", false);
if (cb) cb.attr("checked", false);
}
} else if (mode == "invert") {
if (child.hasClassName("Selected")) {
child.removeClassName("Selected");
cb.attr("checked", false);
if (cb) cb.attr("checked", false);
} else {
child.addClassName("Selected");
cb.attr("checked", true);
if (cb) cb.attr("checked", true);
}
} else {
child.removeClassName("Selected");
cb.attr("checked", false);
if (cb) cb.attr("checked", false);
}
});
@ -1316,14 +1295,6 @@ function cdmExpandArticle(id) {
var elem = $("CICD-" + active_post_id);
var upd_img_pic = $("FUPDPIC-" + id);
if (upd_img_pic && (upd_img_pic.src.match("updated.png") ||
upd_img_pic.src.match("fresh_sign.png"))) {
upd_img_pic.src = "images/blank_icon.gif";
}
if (id == active_post_id && Element.visible(elem))
return true;
@ -1636,14 +1607,6 @@ function cdmClicked(event, id) {
if (elem)
elem.removeClassName("Unread");
var upd_img_pic = $("FUPDPIC-" + id);
if (upd_img_pic && (upd_img_pic.src.match("updated.png") ||
upd_img_pic.src.match("fresh_sign.png"))) {
upd_img_pic.src = "images/blank_icon.gif";
}
active_post_id = id;
if (article_is_unread) {

16
tt-rss.css
View File

@ -1136,6 +1136,10 @@ span.hlUpdated {
text-align : right;
}
div.hlLeft {
padding-left : 8px;
}
div.hlLeft input {
margin-left : 4px;
margin-right : 4px;
@ -1146,18 +1150,6 @@ div.hlLeft img, div.hlRight img {
}
div.hlUpdPic {
display : table-cell;
padding-right : 4px;
padding-left : 4px;
text-align : center;
vertical-align : middle;
}
div.hlUpdPic img {
max-width : 16px;
}
div.fatalError {
margin-bottom : 10px;
}