summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/pref-feeds.php12
-rw-r--r--prefs.js40
2 files changed, 47 insertions, 5 deletions
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index b8671c4ee..6abf5d43f 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -982,14 +982,14 @@
print "</table>";
- print "<p><span id=\"feedOpToolbar\">";
+ print "<p>";
print "<select id=\"feedActionChooser\" onchange=\"feedActionChange()\">
<option value=\"facDefault\" selected>".__('Actions...')."</option>
<option disabled>--------</option>
<option style=\"color : #5050aa\" disabled>".__('Selection:')."</option>
<option value=\"facEdit\">&nbsp;&nbsp;".__('Edit')."</option>
- <option value=\"facPurge\">&nbsp;&nbsp;".__('Purge')."</option>
+ <option value=\"facPurge\">&nbsp;&nbsp;".__('Manual purge')."</option>
<option value=\"facClear\">&nbsp;&nbsp;".__('Clear feed data')."</option>
<option value=\"facUnsubscribe\">&nbsp;&nbsp;".__('Unsubscribe')."</option>";
@@ -1003,6 +1003,8 @@
print "</select>";
+ print "<span id=\"feedOpToolbar\">";
+
/* print "<input type=\"submit\" class=\"button\" disabled=\"true\"
onclick=\"javascript:editSelectedFeed()\" value=\"".__('Edit')."\">
<input type=\"submit\" class=\"button\" disabled=\"true\"
@@ -1011,7 +1013,7 @@
if (get_pref($link, 'ENABLE_FEED_CATS')) {
- print "&nbsp;|&nbsp;" . __('Selection:');
+ print "&nbsp;|&nbsp;" . __('Selection:') . " ";
print_feed_cat_select($link, "sfeed_set_fcat", "", "disabled");
@@ -1022,7 +1024,7 @@
print "</span>";
- if (get_pref($link, 'ENABLE_FEED_CATS')) {
+// if (get_pref($link, 'ENABLE_FEED_CATS')) {
/* print " <input type=\"submit\" class=\"button\"
onclick=\"javascript:editFeedCats()\" value=\"".
@@ -1030,7 +1032,7 @@
# print "&nbsp;|&nbsp;";
- }
+// }
} else {
// print "<p>No feeds defined.</p>";
diff --git a/prefs.js b/prefs.js
index 3d95f01c3..ab85bcad6 100644
--- a/prefs.js
+++ b/prefs.js
@@ -700,6 +700,42 @@ function clearSelectedFeeds() {
return false;
}
+function purgeSelectedFeeds() {
+
+ if (!xmlhttp_ready(xmlhttp)) {
+ printLockingError();
+ return
+ }
+
+ var sel_rows = getSelectedFeeds();
+
+ if (sel_rows.length > 0) {
+
+ var pr = prompt(__("How many days of articles to keep (0 - use default)?"), "0");
+
+ if (pr != undefined) {
+ notify_progress("Purging selected feed...");
+
+ var query = "backend.php?op=rpc&subop=purge&ids="+
+ param_escape(sel_rows.toString()) + "&days=" + pr;
+
+ debug(query);
+
+ new Ajax.Request(query, {
+ onComplete: function(transport) {
+ notify('');
+ } });
+ }
+
+ } else {
+
+ alert(__("No feeds are selected."));
+
+ }
+
+ return false;
+}
+
function removeSelectedFeedCats() {
if (!xmlhttp_ready(xmlhttp)) {
@@ -1840,6 +1876,10 @@ function feedActionGo(op) {
purgeSelectedFeeds();
}
+ if (op == "facEditCats") {
+ editFeedCats();
+ }
+
if (op == "facUnsubscribe") {
removeSelectedFeeds();
}