remove fupdpic and related images

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

diff --git a/images/fresh_sign.png b/images/fresh_sign.png
deleted file mode 100644 (file)
index b25dda8..0000000
Binary files a/images/fresh_sign.png and /dev/null differ

diff --git a/images/updated.png b/images/updated.png
deleted file mode 100644 (file)
index 0d39f98..0000000
Binary files a/images/updated.png and /dev/null differ

diff --git a/images/www.png b/images/www.png
deleted file mode 100644 (file)
index bd5e44a..0000000
Binary files a/images/www.png and /dev/null differ

diff --git a/js/viewfeed.js b/js/viewfeed.js
index 3519949fb299f9d91de970a1ca18a23cdadc6d3d..02dde365fdf2538f236f48bb765b80f5d4162493 100644 (file)
--- a/js/viewfeed.js
+++ b/js/viewfeed.js
@@ -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) {

diff --git a/tt-rss.css b/tt-rss.css
index 0757df478b3f5f902e8c2c6f902b4facb62a6f53..fb2603119a87e092ec74fec8446e316272f0c168 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -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;
 }