From fe5bfa004243bda049f10792fb232c6f3a60b84a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Fri, 25 Jul 2008 08:48:15 +0100 Subject: [PATCH] UNDO: add quick unsubscribe button to prefs/feedlist --- modules/pref-feeds.php | 8 +------- prefs.js | 28 ---------------------------- tt-rss.css | 9 --------- 3 files changed, 1 insertion(+), 44 deletions(-) diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php index f1c9bfd6f..8041b8cc1 100644 --- a/modules/pref-feeds.php +++ b/modules/pref-feeds.php @@ -968,7 +968,6 @@ $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"]); @@ -1064,11 +1063,6 @@ $parent_title)"; } - $ops = " - (x) - "; - print "" . "$edit_title $parent_title" . ""; if ($show_last_article_info) { @@ -1076,7 +1070,7 @@ "$last_article"; } - print "$ops $last_updated"; + print "$last_updated"; print ""; diff --git a/prefs.js b/prefs.js index dd80aee4d..c405a4f19 100644 --- a/prefs.js +++ b/prefs.js @@ -508,7 +508,6 @@ function editFeed(feed) { xmlhttp.onreadystatechange=infobox_callback; xmlhttp.send(null); - return false; } function editFeedCat(cat) { @@ -692,33 +691,6 @@ 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 a7e8ff849..43a76229b 100644 --- a/tt-rss.css +++ b/tt-rss.css @@ -442,15 +442,6 @@ 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;