summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2003-10-02 18:41:12 +0000
committerDries Buytaert <dries@buytaert.net>2003-10-02 18:41:12 +0000
commit9942b6a2c565409377d98fe21432d30ddca73501 (patch)
tree0590e93372469fec37eda66d1d9b8b34ae986bfb
parenta4c84bbe3df42b51d8da86519109262c51a57915 (diff)
downloadbrdo-9942b6a2c565409377d98fe21432d30ddca73501.tar.gz
brdo-9942b6a2c565409377d98fe21432d30ddca73501.tar.bz2
- There were 2 "content syndication" menu's: grouped them together.
-rw-r--r--modules/aggregator.module2
-rw-r--r--modules/aggregator/aggregator.module2
-rw-r--r--modules/cloud.module13
-rw-r--r--modules/import.module2
4 files changed, 9 insertions, 10 deletions
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 0bf4a2abe..7a2b2ec3d 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -109,7 +109,7 @@ function import_link($type) {
if (user_access("administer news feeds")) {
menu("admin/node/syndication", t("syndication"), NULL, NULL, 5);
- menu("admin/node/syndication/news", t("feeds"), "import_admin", import_help("admin/node/syndication/news") );
+ menu("admin/node/syndication/news", t("RSS/RDF"), "import_admin", import_help("admin/node/syndication/news") );
menu("admin/node/syndication/news/add/feed", t("new feed"), "import_admin", import_help("admin/node/syndication/news/add/feed"), 2);
menu("admin/node/syndication/news/add/bundle", t("new bundle"), "import_admin", import_help("admin/node/syndication/news/add/bundle"), 3);
menu("admin/node/syndication/news/tag", t("tag items"), "import_admin", import_help("admin/node/syndication/news/tag"), 4);
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 0bf4a2abe..7a2b2ec3d 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -109,7 +109,7 @@ function import_link($type) {
if (user_access("administer news feeds")) {
menu("admin/node/syndication", t("syndication"), NULL, NULL, 5);
- menu("admin/node/syndication/news", t("feeds"), "import_admin", import_help("admin/node/syndication/news") );
+ menu("admin/node/syndication/news", t("RSS/RDF"), "import_admin", import_help("admin/node/syndication/news") );
menu("admin/node/syndication/news/add/feed", t("new feed"), "import_admin", import_help("admin/node/syndication/news/add/feed"), 2);
menu("admin/node/syndication/news/add/bundle", t("new bundle"), "import_admin", import_help("admin/node/syndication/news/add/bundle"), 3);
menu("admin/node/syndication/news/tag", t("tag items"), "import_admin", import_help("admin/node/syndication/news/tag"), 4);
diff --git a/modules/cloud.module b/modules/cloud.module
index a8b1f3705..b5d0f45be 100644
--- a/modules/cloud.module
+++ b/modules/cloud.module
@@ -60,10 +60,9 @@ function cloud_link($type) {
if ($type == "system") {
if (user_access("administer site cloud")) {
- menu("admin/syndication", t("content syndication"), NULL, NULL, 5);
- menu("admin/syndication/cloud", t("site cloud"), "cloud_admin", cloud_help("admin/syndication/cloud"));
- menu("admin/syndication/cloud/add", t("add new site"), "cloud_admin", cloud_help("admin/syndication/cloud/add"));
- menu("admin/syndication/cloud/help", t("help"), "cloud_help", NULL, 9);
+ menu("admin/node/syndication/cloud", t("site cloud"), "cloud_admin", cloud_help("admin/syndication/cloud"));
+ menu("admin/node/syndication/cloud/add", t("add new site"), "cloud_admin", cloud_help("admin/syndication/cloud/add"));
+ menu("admin/node/syndication/cloud/help", t("help"), "cloud_help", NULL, 9);
}
}
@@ -224,7 +223,7 @@ function cloud_admin() {
$edit = $_POST["edit"];
if (empty($op)) {
- $op = arg(3);
+ $op = arg(4);
}
if (user_access("administer site cloud")) {
@@ -233,10 +232,10 @@ function cloud_admin() {
$output = cloud_form();
break;
case "edit":
- $output = cloud_form(cloud_get_site(arg(4)));
+ $output = cloud_form(cloud_get_site(arg(5)));
break;
case "update":
- $output = status(cloud_update(cloud_get_site(arg(4))));
+ $output = status(cloud_update(cloud_get_site(arg(5))));
$output .= cloud_display();
break;
case "Delete":
diff --git a/modules/import.module b/modules/import.module
index 0bf4a2abe..7a2b2ec3d 100644
--- a/modules/import.module
+++ b/modules/import.module
@@ -109,7 +109,7 @@ function import_link($type) {
if (user_access("administer news feeds")) {
menu("admin/node/syndication", t("syndication"), NULL, NULL, 5);
- menu("admin/node/syndication/news", t("feeds"), "import_admin", import_help("admin/node/syndication/news") );
+ menu("admin/node/syndication/news", t("RSS/RDF"), "import_admin", import_help("admin/node/syndication/news") );
menu("admin/node/syndication/news/add/feed", t("new feed"), "import_admin", import_help("admin/node/syndication/news/add/feed"), 2);
menu("admin/node/syndication/news/add/bundle", t("new bundle"), "import_admin", import_help("admin/node/syndication/news/add/bundle"), 3);
menu("admin/node/syndication/news/tag", t("tag items"), "import_admin", import_help("admin/node/syndication/news/tag"), 4);