From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Fri, 28 Oct 2005 06:21:16 +0000 (+0100)
Subject: add dialogue to remove current feed, overall quick meny improvements (shamelessly... 
X-Git-Tag: 1.0.7~20
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6de5d05666e628f2ef8f3844fd7e2f96f3e1a7df;p=tt-rss.git

add dialogue to remove current feed, overall quick meny improvements (shamelessly stolen from GMail)
---

diff --git a/backend.php b/backend.php
index 6937a9af..07f6028e 100644
--- a/backend.php
+++ b/backend.php
@@ -1317,6 +1317,7 @@
 
 	if ($op == "dlg") {
 		$id = $_GET["id"];
+		$param = $_GET["param"];
 
 		if ($id == "quickAddFeed") {
 			print "Feed URL: <input id=\"qafInput\">
@@ -1326,6 +1327,31 @@
 				type=\"submit\" onclick=\"javascript:closeDlg()\" 
 				value=\"Cancel\">";
 		}
+
+		if ($id == "quickDelFeed") {
+
+			$param = db_escape_string($param);
+
+			$result = db_query($link, "SELECT title FROM ttrss_feeds WHERE id = '$param'");
+
+			if ($result) {
+
+				$f_title = db_fetch_result($result, 0, "title");
+		
+				print "Remove current feed ($f_title)?&nbsp;
+				<input class=\"button\"
+					type=\"submit\" onclick=\"javascript:qfdDelete($param)\" value=\"Remove\">
+				<input class=\"button\"
+					type=\"submit\" onclick=\"javascript:closeDlg()\" 
+					value=\"Cancel\">";
+			} else {
+				print "Error: Feed $param not found.&nbsp;
+				<input class=\"button\"
+					type=\"submit\" onclick=\"javascript:closeDlg()\" 
+					value=\"Cancel\">";		
+			}
+		}
+
 	}
 
 	db_close($link);
diff --git a/tt-rss.js b/tt-rss.js
index c49a52c1..80ca75e0 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -48,7 +48,7 @@ function toggleTags() {
 	updateFeedList();
 }
 
-function qaf_add_callback() {
+function dlg_frefresh_callback() {
 	if (xmlhttp.readyState == 4) {
 		updateFeedList(false, false);
 		closeDlg();
@@ -428,13 +428,27 @@ function quickMenuGo() {
 
 	var opname = chooser[chooser.selectedIndex].text;
 
-	if (opname == "Preferences") {
+	if (opname.match("Preferences")) {
 		gotoPreferences();
 	}
 
-	if (opname == "Add new feed") {
+	if (opname.match("Add new feed")) {
 		displayDlg("quickAddFeed");
+		return;
+	}
+
+	if (opname.match("Remove this feed")) {
+		var actid = getActiveFeedId();
+
+		if (!actid) {
+			notify("Please select some feed first.");
+			return;
+		}
+	
+		displayDlg("quickDelFeed", actid);
+		return;
 	}
+
 }
 
 function qafAdd() {
@@ -457,7 +471,7 @@ function qafAdd() {
 
 		xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=add&link=" +
 			param_escape(link.value), true);
-		xmlhttp.onreadystatechange=qaf_add_callback;
+		xmlhttp.onreadystatechange=dlg_frefresh_callback;
 		xmlhttp.send(null);
 
 		link.value = "";
@@ -465,10 +479,10 @@ function qafAdd() {
 	}
 }
 
-function displayDlg(id) {
+function displayDlg(id, param) {
 
 	xmlhttp.open("GET", "backend.php?op=dlg&id=" +
-		param_escape(id), true);
+		param_escape(id) + "&param=" + param_escape(param), true);
 	xmlhttp.onreadystatechange=dialog_refresh_callback;
 	xmlhttp.send(null);
 
@@ -479,3 +493,15 @@ function closeDlg() {
 	dlg.style.display = "none";
 }
 
+function qfdDelete(feed_id) {
+
+	notify("Removing feed...");
+
+	var feeds_doc = window.frames["feeds-frame"].document;
+	feeds_doc.location.href = "backend.php?op=error&msg=Loading,%20please wait...";
+
+	xmlhttp.open("GET", "backend.php?op=pref-feeds&subop=remove&ids=" + feed_id);
+	xmlhttp.onreadystatechange=dlg_frefresh_callback;
+	xmlhttp.send(null);
+
+}
diff --git a/tt-rss.php b/tt-rss.php
index 6fc00c55..52863c14 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -138,9 +138,12 @@
 
 		</td>
 		<td align="right">
-			<select id="quickMenuChooser">
+			Actions: <select id="quickMenuChooser">
 				<option selected>Preferences</option>
-				<option>Add new feed</option>
+				<option disabled>-----</option>
+				<option disabled>Feed actions:</option>
+				<option>&nbsp;&nbsp;Add new feed</option>
+				<option>&nbsp;&nbsp;Remove this feed</option>
 				<!-- <option>Edit this feed</option> -->
 			</select>
 			<input type="submit" class="button" onclick="quickMenuGo()" value="Go">