summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/feeds.php5
-rw-r--r--images/close_article.pngbin3645 -> 0 bytes
-rw-r--r--include/functions.php6
-rw-r--r--js/tt-rss.js3
4 files changed, 5 insertions, 9 deletions
diff --git a/classes/feeds.php b/classes/feeds.php
index b533bf043..15856313c 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 f86b58779..000000000
--- a/images/close_article.png
+++ /dev/null
Binary files differ
diff --git a/include/functions.php b/include/functions.php
index 2b4feb8e8..029b3248f 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 d59ba495c..a5d01f6a5 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();