From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 25 Dec 2012 10:42:20 +0000 (+0400)
Subject: remove fupdpic and related images
X-Git-Tag: 1.7.0~120
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=f947467aa8551e37110895b8a07e4124f1854a47;p=tt-rss.git

remove fupdpic and related images
---

diff --git a/classes/feeds.php b/classes/feeds.php
index d168bc1c..eba286db 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -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>";
diff --git a/images/fresh_sign.png b/images/fresh_sign.png
deleted file mode 100644
index b25dda81..00000000
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
index 0d39f98d..00000000
Binary files a/images/updated.png and /dev/null differ
diff --git a/images/www.png b/images/www.png
deleted file mode 100644
index bd5e44a5..00000000
Binary files a/images/www.png and /dev/null differ
diff --git a/js/viewfeed.js b/js/viewfeed.js
index 3519949f..02dde365 100644
--- 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 0757df47..fb260311 100644
--- 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;
 }