add a q shortcut; remove close_article button

diff --git a/classes/feeds.php b/classes/feeds.php
index b533bf0437cad0493153ea613bd6a914d089a631..15856313c7f05d46c79bb31d928888d809c516be 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -697,11 +697,6 @@ class Feeds extends Handler_Protected {
                                                $reply['content'] .= $p->hook_article_button($line);\r
                                        }\r
 \r
-                                       $reply['content'] .= "<img src=\"images/close_article.png\"\r
-                                               style=\"cursor : pointer\" style=\"cursor : pointer\"\r
-                                               onclick=\"dismissArticle($id)\"\r
-                                               title='".__('Close article')."'>";\r
-\r
                                        $reply['content'] .= "</div>";\r
                                        $reply['content'] .= "</div>";\r
 \r

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

diff --git a/include/functions.php b/include/functions.php
index 2b4feb8e8a08de20d40f259b0f8302e64c156e8c..029b3248fa3c29c81d1abb8c6969a0b986c25fac 100644 (file)
--- 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 d59ba495caa1de4d4b5d318d188a02c349c00659..a5d01f6a50a88064cca8742925f352f1d7841057 100644 (file)
--- 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();