add quick unsubscribe button to prefs/feedlist

diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 8041b8cc1a84b4c9539aef356a5923edcebef3ce..f1c9bfd6f00f6b1f8fa98531e124a5f859c32f74 100644 (file)
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -968,6 +968,7 @@
                                $cat_id = $line["cat_id"];
 
                                $edit_title = htmlspecialchars($line["title"]);
+                               $feed_title = $edit_title;
                                $edit_cat = htmlspecialchars($line["category"]);
 
                                $hidden = sql_bool_to_bool($line["hidden"]);
@@ -1063,6 +1064,11 @@
                                                $parent_title)</span>";
                                }
 
+                               $ops = "<span class=\"feedOps\">
+                                       (<a title=\"".__('Unsubscribe')."\"
+                                       href='javascript:removeFeed($feed_id, \"$feed_title\")'>x</a>)
+                                       </span>";
+
                                print "<td $onclick>" . "$edit_title $parent_title" . "</td>";
 
                                if ($show_last_article_info) {
@@ -1070,7 +1076,7 @@
                                                "$last_article</td>";
                                }
 
-                               print "<td $onclick align='right'>$last_updated</td>";
+                               print "<td align='right'>$ops $last_updated</td>";
 
                                print "</tr>";
        

diff --git a/prefs.js b/prefs.js
index c405a4f196a0a0d65854db837eee0429d2e2cef0..dd80aee4d6a5a1b8a2e77d023e91827c0049d204 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -508,6 +508,7 @@ function editFeed(feed) {
        xmlhttp.onreadystatechange=infobox_callback;
        xmlhttp.send(null);
 
+       return false;
 }
 
 function editFeedCat(cat) {
@@ -691,6 +692,33 @@ function removeSelectedFeeds() {
        return false;
 }
 
+function removeFeed(id, title) {
+
+       if (!xmlhttp_ready(xmlhttp)) {
+               printLockingError();
+               return
+       }
+
+       if (id) {
+
+               var msg = __("Unsubscribe from %s?").replace("%s", title);
+
+               var ok = confirm(msg);
+
+               if (ok) {
+
+                       notify_progress("Unsubscribing...");
+       
+                       xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=remove&ids="+
+                               param_escape(id), true);
+                       xmlhttp.onreadystatechange=feedlist_callback;
+                       xmlhttp.send(null);
+               }
+       }
+       
+       return false;
+}
+
 function clearSelectedFeeds() {
 
        if (!xmlhttp_ready(xmlhttp)) {

diff --git a/tt-rss.css b/tt-rss.css
index 43a76229b85ac572271ca5e4c24c33f3b0f7419b..a7e8ff849a55e00b17c5aaddfde6554f295614a3 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -442,6 +442,15 @@ div.feedEditSearch {
        float : right;
 }
 
+table.prefFeedList span.feedOps {
+       display : none;
+       margin-right : 1em;     
+}
+
+table.prefFeedList tr:hover span.feedOps {
+       display : inline;
+}
+
 table.prefFeedList td.feedEditCat {
        font-weight : bold;
        border-width : 0px 0px 1px 0px;