use popup feedbrowser for main UI (3)

This commit is contained in:
Andrew Dolgov 2009-01-24 06:14:06 +01:00
parent c2913898f1
commit 2bab8824eb
4 changed files with 59 additions and 53 deletions

View File

@ -2039,3 +2039,51 @@ function getSelectedFeedsFromBrowser() {
return selected;
}
function updateFeedBrowser() {
try {
var query = "backend.php?op=rpc&subop=feedBrowser";
var search = document.getElementById("feed_browser_search");
var limit = document.getElementById("feed_browser_limit");
if (limit) {
query = query + "&limit=" + limit[limit.selectedIndex].value;
}
if (search) {
query = query + "&search=" + param_escape(search.value);
}
notify_progress("Loading, please wait...", true);
new Ajax.Request(query, {
onComplete: function(transport) {
notify('');
var c = document.getElementById("browseFeedList");
var r = transport.responseXML.getElementsByTagName("content")[0];
var nr = transport.responseXML.getElementsByTagName("num-results")[0];
var sb = document.getElementById("feed_browser_subscribe");
if (c && r) {
c.innerHTML = r.firstChild.nodeValue;
}
if (nr && sb) {
if (nr.getAttribute("value") > 0) {
sb.disabled = false;
} else {
sb.disabled = true;
}
}
} });
} catch (e) {
exception_error("updateFeedBrowser", e);
}
}

View File

@ -1131,7 +1131,7 @@
if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
print " <input type=\"submit\" class=\"button\"
id=\"top25_feeds_btn\"
onclick=\"javascript:browseFeeds()\" value=\"".__('Top 25')."\">";
onclick=\"javascript:browseFeeds()\" value=\"".__('Other Feeds')."\">";
}
$feeds_sort = db_escape_string($_GET["sort"]);
@ -1481,9 +1481,18 @@
$class = ($feedctr % 2) ? "even" : "odd";
if ($details["site_url"]) {
$site_url = "<a target=\"_blank\" href=\"".$details["site_url"]."\">
<img style='border-width : 0px' src='images/www.png' alt='www'></a>";
} else {
$site_url = "";
}
print "<li class='$class' id=\"FBROW-".$details["id"]."\">$check_box".
"$feed_icon " . $details["title"] .
"&nbsp;<span class='subscribers'>($subscribers)</span></li>";
"&nbsp;<span class='subscribers'>($subscribers)</span>
$site_url
</li>";
++$feedctr;
}

View File

@ -2234,8 +2234,4 @@ function batchFeedsToggleField(cb, elem, label) {
}
}
function updateFeedBrowser() {
alert("FIXME");
}

View File

@ -1442,53 +1442,6 @@ function browseFeeds(limit) {
}
}
function updateFeedBrowser() {
try {
var query = "backend.php?op=rpc&subop=feedBrowser";
var search = document.getElementById("feed_browser_search");
var limit = document.getElementById("feed_browser_limit");
if (limit) {
query = query + "&limit=" + limit[limit.selectedIndex].value;
}
if (search) {
query = query + "&search=" + param_escape(search.value);
}
notify_progress("Loading, please wait...", true);
new Ajax.Request(query, {
onComplete: function(transport) {
notify('');
var c = document.getElementById("browseFeedList");
var r = transport.responseXML.getElementsByTagName("content")[0];
var nr = transport.responseXML.getElementsByTagName("num-results")[0];
var sb = document.getElementById("feed_browser_subscribe");
if (c && r) {
c.innerHTML = r.firstChild.nodeValue;
}
if (nr && sb) {
if (nr.getAttribute("value") > 0) {
sb.disabled = false;
} else {
sb.disabled = true;
}
}
} });
} catch (e) {
exception_error("updateFeedBrowser", e);
}
}
function feedBrowserSubscribe() {
try {