From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 23 Jan 2013 09:39:36 +0000 (+0400)
Subject: add a q shortcut; remove close_article button
X-Git-Tag: 1.7.0~29
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=2cda4314009a34e4d8c58c825d87788c50db8dff;p=tt-rss.git

add a q shortcut; remove close_article button
---

diff --git a/classes/feeds.php b/classes/feeds.php
index b533bf04..15856313 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -697,11 +697,6 @@ class Feeds extends Handler_Protected {
 						$reply['content'] .= $p->hook_article_button($line);
 					}
 
-					$reply['content'] .= "<img src=\"images/close_article.png\"
-						style=\"cursor : pointer\" style=\"cursor : pointer\"
-						onclick=\"dismissArticle($id)\"
-						title='".__('Close article')."'>";
-
 					$reply['content'] .= "</div>";
 					$reply['content'] .= "</div>";
 
diff --git a/images/close_article.png b/images/close_article.png
deleted file mode 100644
index f86b5877..00000000
Binary files a/images/close_article.png and /dev/null differ
diff --git a/include/functions.php b/include/functions.php
index 2b4feb8e..029b3248 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -1998,6 +1998,7 @@
 				"article_scroll_up" => __("Scroll up"),
 				"select_article_cursor" => __("Select article under cursor"),
 				"email_article" => __("Email article"),
+				"close_article" => __("Close article"),
 				"toggle_widescreen" => __("Toggle widescreen mode")),
 			__("Article selection") => array(
 				"select_all" => __("Select all articles"),
@@ -2057,6 +2058,7 @@
 				"P" => "article_scroll_up",
 				"a W" => "toggle_widescreen",
 				"e" => "email_article",
+				"a q" => "close_article",
 //			"article_selection" => array(
 				"a a" => "select_all",
 				"a u" => "select_unread",
@@ -3113,10 +3115,6 @@
 					$rv['content'] .= $p->hook_article_button($line);
 				}
 
-				$rv['content'] .= "<img src=\"".theme_image($link, 'images/close_article.png')."\"
-						class='tagsPic' style=\"cursor : pointer\"
-						onclick=\"closeArticlePanel($id)\"
-						title='".__('Close article')."'>";
 
 			} else {
 				$tags_str = strip_tags($tags_str);
diff --git a/js/tt-rss.js b/js/tt-rss.js
index d59ba495..a5d01f6a 100644
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -764,6 +764,9 @@ function hotkey_handler(e) {
 		case "article_scroll_up":
 			scrollArticle(-50);
 			return false;
+		case "close_article":
+			closeArticlePanel();
+			return false;
 		case "email_article":
 			if (typeof emailArticle != "undefined") {
 				emailArticle();