From fe09d5a7867e9f5294e23cb202def475c102fcbc Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sat, 27 Sep 2003 06:00:43 +0000 Subject: [PATCH] - Committed Al's new admin link texts. Remarks: 1) As explained by Al, there is still a glitch with the 'create content' menu. 2) The user module part of the patch did not apply due to Kjartan's earlier patch. --- modules/aggregator.module | 20 ++++++++++---------- modules/aggregator/aggregator.module | 20 ++++++++++---------- modules/block.module | 14 +++++++------- modules/block/block.module | 14 +++++++------- modules/blog.module | 4 ++-- modules/blog/blog.module | 4 ++-- modules/book.module | 3 +-- modules/book/book.module | 3 +-- modules/comment.module | 14 +++++++------- modules/comment/comment.module | 14 +++++++------- modules/import.module | 20 ++++++++++---------- modules/node.module | 7 ++++--- modules/node/node.module | 7 ++++--- modules/page.module | 2 +- modules/page/page.module | 2 +- modules/poll.module | 2 +- modules/poll/poll.module | 2 +- modules/statistics.module | 14 +++++++------- modules/statistics/statistics.module | 14 +++++++------- modules/story.module | 2 +- modules/story/story.module | 2 +- modules/system.module | 2 +- modules/system/system.module | 2 +- modules/tracker.module | 2 +- modules/tracker/tracker.module | 2 +- modules/user.module | 11 +++++++---- modules/user/user.module | 11 +++++++---- modules/watchdog.module | 14 +++++++------- modules/watchdog/watchdog.module | 14 +++++++------- 29 files changed, 124 insertions(+), 118 deletions(-) diff --git a/modules/aggregator.module b/modules/aggregator.module index 4bb4431ec0d..be4ca7fc40d 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -59,16 +59,16 @@ function import_help($section = "admin/import/help") { case 'admin/system/modules/import': $output = "Drupal's news aggregator controls how many RSS/RDF items from a single source are displayed in a \"Block\", and on the page that goes with that block."; break; - case 'admin/syndication/news': + case 'admin/node/syndication/news': $output = strtr("Several web sites, especially news related sites, syndicate parts of their site's content for other web sites to display. Usually, the syndicated content includes the latest headlines with a direct link to that story on the remote site. Some syndicated content also includes a description of the headline. The standard method of syndication is using the XML based Rich Site Summary (RSS). To get a feed to work you must run \"cron.php\". To display the feed in a block you must turn on the %block.
", array("%block" => l(t("feed's block"), "admin/block") )); break; - case 'admin/syndication/news/add/feed': + case 'admin/node/syndication/news/add/feed': $output = strtr("Add a site that has an RSS/RDF feed. The URL is the full path to the RSS feed file. For the feed to update automatically you must run \"cron.php\". The \"Attributes\" are used to bundle this feed with other feeds (See %bundle), and to tag articles from this feed.
Note: If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.", array("%bundle" => l(t("add new bundle"), "admin/syndication/news/add/bundle") )); break; - case 'admin/syndication/news/add/bundle': + case 'admin/node/syndication/news/add/bundle': $output = strtr("Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called Sport. If an article from a feed has been \"tag\"-ged (See %tag too look at and change tags.) with a matching \"Attribute\" then it will be added to the bundle.", array("%tag" => l(t("tag news item"), "admin/syndication/news/tag") )); break; - case 'admin/syndication/news/tag': + case 'admin/node/syndication/news/tag': $output = "This allows you to see and change an news item's \"tag\". All articles are originally tagged with the \"Attributes\" of their feed."; break; } @@ -108,12 +108,12 @@ function import_link($type) { if ($type == "system") { if (user_access("administer news feeds")) { - menu("admin/syndication", "content syndication", NULL, NULL, 5); - menu("admin/syndication/news", "news aggregation", "import_admin", import_help("admin/syndication/news") ); - menu("admin/syndication/news/add/feed", "add new feed", "import_admin", import_help("admin/syndication/news/add/feed"), 2); - menu("admin/syndication/news/add/bundle", "add new bundle", "import_admin", import_help("admin/syndication/news/add/bundle"), 3); - menu("admin/syndication/news/tag", "tag news items", "import_admin", import_help("admin/syndication/news/tag"), 4); - menu("admin/syndication/news/help", "help", "import_help", NULL, 9); + menu("admin/node/syndication", "syndication", NULL, NULL, 5); + menu("admin/node/syndication/news", "feeds", "import_admin", import_help("admin/node/syndication/news") ); + menu("admin/node/syndication/news/add/feed", "new feed", "import_admin", import_help("admin/node/syndication/news/add/feed"), 2); + menu("admin/node/syndication/news/add/bundle", "new bundle", "import_admin", import_help("admin/node/syndication/news/add/bundle"), 3); + menu("admin/node/syndication/news/tag", "tag items", "import_admin", import_help("admin/node/syndication/news/tag"), 4); + menu("admin/node/syndication/news/help", "help", "import_help", NULL, 9); } } diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 4bb4431ec0d..be4ca7fc40d 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -59,16 +59,16 @@ function import_help($section = "admin/import/help") { case 'admin/system/modules/import': $output = "Drupal's news aggregator controls how many RSS/RDF items from a single source are displayed in a \"Block\", and on the page that goes with that block."; break; - case 'admin/syndication/news': + case 'admin/node/syndication/news': $output = strtr("Several web sites, especially news related sites, syndicate parts of their site's content for other web sites to display. Usually, the syndicated content includes the latest headlines with a direct link to that story on the remote site. Some syndicated content also includes a description of the headline. The standard method of syndication is using the XML based Rich Site Summary (RSS). To get a feed to work you must run \"cron.php\". To display the feed in a block you must turn on the %block.
", array("%block" => l(t("feed's block"), "admin/block") )); break; - case 'admin/syndication/news/add/feed': + case 'admin/node/syndication/news/add/feed': $output = strtr("Add a site that has an RSS/RDF feed. The URL is the full path to the RSS feed file. For the feed to update automatically you must run \"cron.php\". The \"Attributes\" are used to bundle this feed with other feeds (See %bundle), and to tag articles from this feed.
Note: If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.", array("%bundle" => l(t("add new bundle"), "admin/syndication/news/add/bundle") )); break; - case 'admin/syndication/news/add/bundle': + case 'admin/node/syndication/news/add/bundle': $output = strtr("Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called Sport. If an article from a feed has been \"tag\"-ged (See %tag too look at and change tags.) with a matching \"Attribute\" then it will be added to the bundle.", array("%tag" => l(t("tag news item"), "admin/syndication/news/tag") )); break; - case 'admin/syndication/news/tag': + case 'admin/node/syndication/news/tag': $output = "This allows you to see and change an news item's \"tag\". All articles are originally tagged with the \"Attributes\" of their feed."; break; } @@ -108,12 +108,12 @@ function import_link($type) { if ($type == "system") { if (user_access("administer news feeds")) { - menu("admin/syndication", "content syndication", NULL, NULL, 5); - menu("admin/syndication/news", "news aggregation", "import_admin", import_help("admin/syndication/news") ); - menu("admin/syndication/news/add/feed", "add new feed", "import_admin", import_help("admin/syndication/news/add/feed"), 2); - menu("admin/syndication/news/add/bundle", "add new bundle", "import_admin", import_help("admin/syndication/news/add/bundle"), 3); - menu("admin/syndication/news/tag", "tag news items", "import_admin", import_help("admin/syndication/news/tag"), 4); - menu("admin/syndication/news/help", "help", "import_help", NULL, 9); + menu("admin/node/syndication", "syndication", NULL, NULL, 5); + menu("admin/node/syndication/news", "feeds", "import_admin", import_help("admin/node/syndication/news") ); + menu("admin/node/syndication/news/add/feed", "new feed", "import_admin", import_help("admin/node/syndication/news/add/feed"), 2); + menu("admin/node/syndication/news/add/bundle", "new bundle", "import_admin", import_help("admin/node/syndication/news/add/bundle"), 3); + menu("admin/node/syndication/news/tag", "tag items", "import_admin", import_help("admin/node/syndication/news/tag"), 4); + menu("admin/node/syndication/news/help", "help", "import_help", NULL, 9); } } diff --git a/modules/block.module b/modules/block.module index ac89366f6ff..0c81981cd3a 100644 --- a/modules/block.module +++ b/modules/block.module @@ -38,14 +38,14 @@ function block_help($section = "admin/block/help") { case 'admin/system/modules': $output = "Controls the boxes that are displayed around the main content."; break; - case 'admin/block': + case 'admin/system/block': $output = strtr("Blocks are the boxes in the left- and right- side bars of the web site, depending on the choosen theme. They are created by active Drupal modules. In order to view a block it must be enabled. You can assign the block's placement by giving it a region and a weight. The region specifies which side of the page the block is on, and the weight sorts blocks within a region. Lighter (smaller weight value) blocks \"float up\" towards the top of the page. The path setting lets you define which pages you want a block to be shown on. The custom checkbox lets your users hide the block using their account setting. You can also create your own blocks, where you specify the content of the block rather than its being generated by a module (you can even use PHP in these). You can create one of these by clicking the %createblock link in the menu to the left. Edit and delete links will become active below for these customized blocks.", array("%createblock" => l(t("create new block"), "admin/block/add"))); ; break; - case 'admin/block/add': + case 'admin/system/block/add': $output = strtr("Here you can create a custom content block. Once you have created this block you must make it active, and give it a place on the page using %overview. The title is used when displaying the block. The description is used in the \"block\" column on the %overview page. If you are going to place PHP code in the block, and you have create php content permission (see %permission) you must change the type to PHP to make your code active.", array("%overview" => l(t("block management"), "admin/block"), "%permission" => l(t("user management"), "admin/user/permission"))); break; - case 'admin/block/preview': + case 'admin/system/block/preview': $output = "This page show you the placement of your blocks in different themes types. The numbers are the weight of each block, which is used to sort them within the sidebars."; break; } @@ -68,10 +68,10 @@ function block_perm() { function block_link($type) { if ($type == "system" && user_access("administer blocks")) { - menu("admin/block", "block management", "block_admin", block_help("admin/block"), 3); - menu("admin/block/add", "create new block", "block_admin", block_help("admin/block/add"), 2); - menu("admin/block/preview", "preview placement", "block_admin", block_help("admin/block/preview"), 3); - menu("admin/block/help", "help", "block_help", NULL, 9); + menu("admin/system/block", "blocks", "block_admin", block_help("admin/system/block"), 3); + menu("admin/system/block/add", "new block", "block_admin", block_help("admin/system/block/add"), 2); + menu("admin/system/block/preview", "preview placement", "block_admin", block_help("admin/system/block/preview"), 3); + menu("admin/system/block/help", "help", "block_help", NULL, 9); } } diff --git a/modules/block/block.module b/modules/block/block.module index ac89366f6ff..0c81981cd3a 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -38,14 +38,14 @@ function block_help($section = "admin/block/help") { case 'admin/system/modules': $output = "Controls the boxes that are displayed around the main content."; break; - case 'admin/block': + case 'admin/system/block': $output = strtr("Blocks are the boxes in the left- and right- side bars of the web site, depending on the choosen theme. They are created by active Drupal modules. In order to view a block it must be enabled. You can assign the block's placement by giving it a region and a weight. The region specifies which side of the page the block is on, and the weight sorts blocks within a region. Lighter (smaller weight value) blocks \"float up\" towards the top of the page. The path setting lets you define which pages you want a block to be shown on. The custom checkbox lets your users hide the block using their account setting. You can also create your own blocks, where you specify the content of the block rather than its being generated by a module (you can even use PHP in these). You can create one of these by clicking the %createblock link in the menu to the left. Edit and delete links will become active below for these customized blocks.", array("%createblock" => l(t("create new block"), "admin/block/add"))); ; break; - case 'admin/block/add': + case 'admin/system/block/add': $output = strtr("Here you can create a custom content block. Once you have created this block you must make it active, and give it a place on the page using %overview. The title is used when displaying the block. The description is used in the \"block\" column on the %overview page. If you are going to place PHP code in the block, and you have create php content permission (see %permission) you must change the type to PHP to make your code active.", array("%overview" => l(t("block management"), "admin/block"), "%permission" => l(t("user management"), "admin/user/permission"))); break; - case 'admin/block/preview': + case 'admin/system/block/preview': $output = "This page show you the placement of your blocks in different themes types. The numbers are the weight of each block, which is used to sort them within the sidebars."; break; } @@ -68,10 +68,10 @@ function block_perm() { function block_link($type) { if ($type == "system" && user_access("administer blocks")) { - menu("admin/block", "block management", "block_admin", block_help("admin/block"), 3); - menu("admin/block/add", "create new block", "block_admin", block_help("admin/block/add"), 2); - menu("admin/block/preview", "preview placement", "block_admin", block_help("admin/block/preview"), 3); - menu("admin/block/help", "help", "block_help", NULL, 9); + menu("admin/system/block", "blocks", "block_admin", block_help("admin/system/block"), 3); + menu("admin/system/block/add", "new block", "block_admin", block_help("admin/system/block/add"), 2); + menu("admin/system/block/preview", "preview placement", "block_admin", block_help("admin/system/block/preview"), 3); + menu("admin/system/block/help", "help", "block_help", NULL, 9); } } diff --git a/modules/blog.module b/modules/blog.module index 5f00f3d8a96..c2f11b90a4f 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -261,10 +261,10 @@ function blog_link($type, $node = 0, $main) { if ($type == "system") { if (user_access("maintain personal blog")) { - menu("node/add/blog", t("create blog entry"), NULL, NULL, 0); + menu("node/add/blog", t("blog entry"), NULL, NULL, 0); } if (user_access("maintain personal blog")) { - menu("blog/" . $user->uid,t("view personal blog"), NULL, NULL, 1); + menu("blog/" . $user->uid,t("view my blog"), NULL, NULL, 1); } } diff --git a/modules/blog/blog.module b/modules/blog/blog.module index 5f00f3d8a96..c2f11b90a4f 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -261,10 +261,10 @@ function blog_link($type, $node = 0, $main) { if ($type == "system") { if (user_access("maintain personal blog")) { - menu("node/add/blog", t("create blog entry"), NULL, NULL, 0); + menu("node/add/blog", t("blog entry"), NULL, NULL, 0); } if (user_access("maintain personal blog")) { - menu("blog/" . $user->uid,t("view personal blog"), NULL, NULL, 1); + menu("blog/" . $user->uid,t("view my blog"), NULL, NULL, 1); } } diff --git a/modules/book.module b/modules/book.module index bebd9a24d23..5ac34dc6738 100644 --- a/modules/book.module +++ b/modules/book.module @@ -79,8 +79,7 @@ function book_link($type, $node = 0, $main = 0) { if ($type == "system") { if (user_access("maintain books")) { - menu("node/add/book",t("create book page"),NULL, NULL,0); - + menu("node/add/book",t("book page"), NULL, NULL,0); menu("admin/node/book", "books", NULL, NULL, 4); menu("admin/node/book/orphan", "orphan pages", NULL, NULL, 8); menu("admin/node/book/help", "help", NULL, NULL, 9); diff --git a/modules/book/book.module b/modules/book/book.module index bebd9a24d23..5ac34dc6738 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -79,8 +79,7 @@ function book_link($type, $node = 0, $main = 0) { if ($type == "system") { if (user_access("maintain books")) { - menu("node/add/book",t("create book page"),NULL, NULL,0); - + menu("node/add/book",t("book page"), NULL, NULL,0); menu("admin/node/book", "books", NULL, NULL, 4); menu("admin/node/book/orphan", "orphan pages", NULL, NULL, 8); menu("admin/node/book/help", "help", NULL, NULL, 9); diff --git a/modules/comment.module b/modules/comment.module index 5e40378a7c1..02a0fba275c 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -816,21 +816,21 @@ function comment_link($type, $node = 0, $main = 0) { if ($type == "system") { if (user_access("administer comments")) { - menu("admin/comment", "comment management", "comment_admin", comment_help("admin/comment"), 2); - menu("admin/comment/comments", "comment overview",NULL, comment_help("admin/comment/comments"), 2); - menu("admin/comment/comments/0", "new or updated comments", "comment_admin", comment_help("admin/comment/comments/0"), 1); - menu("admin/comment/comments/1", "comment approval queue", "comment_admin", comment_help("admin/comment/comments/1"), 2); - menu("admin/comment/search", "search comments", "comment_admin", comment_help("admin/comment/search"), 8); + menu("admin/comment", "comments", "comment_admin", comment_help("admin/comment"), 1); + menu("admin/comment/comments", "overview",NULL, comment_help("admin/comment/comments"), 2); + menu("admin/comment/comments/0", "new/updated", "comment_admin", comment_help("admin/comment/comments/0"), 1); + menu("admin/comment/comments/1", "approval queue", "comment_admin", comment_help("admin/comment/comments/1"), 2); + menu("admin/comment/search", "search", "comment_admin", comment_help("admin/comment/search"), 8); menu("admin/comment/help", "help", "comment_help", NULL, 9); menu("admin/comment/edit", "edit comment", "comment_admin", NULL, 0, 1); // comment settings: if (user_access("administer moderation")) { - menu("admin/comment/moderation", "comment moderation", NULL, comment_help("admin/comment/moderation"), 3); + menu("admin/comment/moderation", "moderation", NULL, comment_help("admin/comment/moderation"), 3); menu("admin/comment/moderation/votes", "votes", "comment_admin", comment_help("admin/comment/moderation/votes")); menu("admin/comment/moderation/matrix", "matrix", "comment_admin", comment_help("admin/comment/moderation/matrix")); menu("admin/comment/moderation/filters", "thresholds", "comment_admin", comment_help("admin/comment/moderation/filters")); - menu("admin/comment/moderation/roles", "initial comment scores", "comment_admin", comment_help("admin/comment/roles"), 6); + menu("admin/comment/moderation/roles", "initial scores", "comment_admin", comment_help("admin/comment/roles"), 6); } } } diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 5e40378a7c1..02a0fba275c 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -816,21 +816,21 @@ function comment_link($type, $node = 0, $main = 0) { if ($type == "system") { if (user_access("administer comments")) { - menu("admin/comment", "comment management", "comment_admin", comment_help("admin/comment"), 2); - menu("admin/comment/comments", "comment overview",NULL, comment_help("admin/comment/comments"), 2); - menu("admin/comment/comments/0", "new or updated comments", "comment_admin", comment_help("admin/comment/comments/0"), 1); - menu("admin/comment/comments/1", "comment approval queue", "comment_admin", comment_help("admin/comment/comments/1"), 2); - menu("admin/comment/search", "search comments", "comment_admin", comment_help("admin/comment/search"), 8); + menu("admin/comment", "comments", "comment_admin", comment_help("admin/comment"), 1); + menu("admin/comment/comments", "overview",NULL, comment_help("admin/comment/comments"), 2); + menu("admin/comment/comments/0", "new/updated", "comment_admin", comment_help("admin/comment/comments/0"), 1); + menu("admin/comment/comments/1", "approval queue", "comment_admin", comment_help("admin/comment/comments/1"), 2); + menu("admin/comment/search", "search", "comment_admin", comment_help("admin/comment/search"), 8); menu("admin/comment/help", "help", "comment_help", NULL, 9); menu("admin/comment/edit", "edit comment", "comment_admin", NULL, 0, 1); // comment settings: if (user_access("administer moderation")) { - menu("admin/comment/moderation", "comment moderation", NULL, comment_help("admin/comment/moderation"), 3); + menu("admin/comment/moderation", "moderation", NULL, comment_help("admin/comment/moderation"), 3); menu("admin/comment/moderation/votes", "votes", "comment_admin", comment_help("admin/comment/moderation/votes")); menu("admin/comment/moderation/matrix", "matrix", "comment_admin", comment_help("admin/comment/moderation/matrix")); menu("admin/comment/moderation/filters", "thresholds", "comment_admin", comment_help("admin/comment/moderation/filters")); - menu("admin/comment/moderation/roles", "initial comment scores", "comment_admin", comment_help("admin/comment/roles"), 6); + menu("admin/comment/moderation/roles", "initial scores", "comment_admin", comment_help("admin/comment/roles"), 6); } } } diff --git a/modules/import.module b/modules/import.module index 4bb4431ec0d..be4ca7fc40d 100644 --- a/modules/import.module +++ b/modules/import.module @@ -59,16 +59,16 @@ function import_help($section = "admin/import/help") { case 'admin/system/modules/import': $output = "Drupal's news aggregator controls how many RSS/RDF items from a single source are displayed in a \"Block\", and on the page that goes with that block."; break; - case 'admin/syndication/news': + case 'admin/node/syndication/news': $output = strtr("Several web sites, especially news related sites, syndicate parts of their site's content for other web sites to display. Usually, the syndicated content includes the latest headlines with a direct link to that story on the remote site. Some syndicated content also includes a description of the headline. The standard method of syndication is using the XML based Rich Site Summary (RSS). To get a feed to work you must run \"cron.php\". To display the feed in a block you must turn on the %block.
", array("%block" => l(t("feed's block"), "admin/block") )); break; - case 'admin/syndication/news/add/feed': + case 'admin/node/syndication/news/add/feed': $output = strtr("Add a site that has an RSS/RDF feed. The URL is the full path to the RSS feed file. For the feed to update automatically you must run \"cron.php\". The \"Attributes\" are used to bundle this feed with other feeds (See %bundle), and to tag articles from this feed.
Note: If you already have a feed with the URL you are planning to use, the system will not accept another feed with the same URL.", array("%bundle" => l(t("add new bundle"), "admin/syndication/news/add/bundle") )); break; - case 'admin/syndication/news/add/bundle': + case 'admin/node/syndication/news/add/bundle': $output = strtr("Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called Sport. If an article from a feed has been \"tag\"-ged (See %tag too look at and change tags.) with a matching \"Attribute\" then it will be added to the bundle.", array("%tag" => l(t("tag news item"), "admin/syndication/news/tag") )); break; - case 'admin/syndication/news/tag': + case 'admin/node/syndication/news/tag': $output = "This allows you to see and change an news item's \"tag\". All articles are originally tagged with the \"Attributes\" of their feed."; break; } @@ -108,12 +108,12 @@ function import_link($type) { if ($type == "system") { if (user_access("administer news feeds")) { - menu("admin/syndication", "content syndication", NULL, NULL, 5); - menu("admin/syndication/news", "news aggregation", "import_admin", import_help("admin/syndication/news") ); - menu("admin/syndication/news/add/feed", "add new feed", "import_admin", import_help("admin/syndication/news/add/feed"), 2); - menu("admin/syndication/news/add/bundle", "add new bundle", "import_admin", import_help("admin/syndication/news/add/bundle"), 3); - menu("admin/syndication/news/tag", "tag news items", "import_admin", import_help("admin/syndication/news/tag"), 4); - menu("admin/syndication/news/help", "help", "import_help", NULL, 9); + menu("admin/node/syndication", "syndication", NULL, NULL, 5); + menu("admin/node/syndication/news", "feeds", "import_admin", import_help("admin/node/syndication/news") ); + menu("admin/node/syndication/news/add/feed", "new feed", "import_admin", import_help("admin/node/syndication/news/add/feed"), 2); + menu("admin/node/syndication/news/add/bundle", "new bundle", "import_admin", import_help("admin/node/syndication/news/add/bundle"), 3); + menu("admin/node/syndication/news/tag", "tag items", "import_admin", import_help("admin/node/syndication/news/tag"), 4); + menu("admin/node/syndication/news/help", "help", "import_help", NULL, 9); } } diff --git a/modules/node.module b/modules/node.module index d4b985eaab7..0fe2c461b68 100644 --- a/modules/node.module +++ b/modules/node.module @@ -571,12 +571,13 @@ function node_link($type, $node = 0, $main = 0) { } if ($type == "system") { + menu("node/add", t("create content"), NULL, NULL, 1); if (user_access("administer nodes")) { - menu("admin/node", "content management", "node_admin", node_help("admin/node")); - menu("admin/node/search", "search posts", "node_admin", node_help("admin/node/search"), 8); + menu("admin/node", "content", "node_admin", node_help("admin/node")); + menu("admin/node/search", "search", "node_admin", node_help("admin/node/search"), 8); menu("admin/node/help", "help", "node_help", NULL, 9); menu("admin/node/edit", "edit node", "node_admin", NULL, 0, 1); - menu("admin/node/settings", "content settings", "node_admin", node_help("admin/node/settings"), 8); + menu("admin/node/settings", "settings", "node_admin", node_help("admin/node/settings"), 8); } } diff --git a/modules/node/node.module b/modules/node/node.module index d4b985eaab7..0fe2c461b68 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -571,12 +571,13 @@ function node_link($type, $node = 0, $main = 0) { } if ($type == "system") { + menu("node/add", t("create content"), NULL, NULL, 1); if (user_access("administer nodes")) { - menu("admin/node", "content management", "node_admin", node_help("admin/node")); - menu("admin/node/search", "search posts", "node_admin", node_help("admin/node/search"), 8); + menu("admin/node", "content", "node_admin", node_help("admin/node")); + menu("admin/node/search", "search", "node_admin", node_help("admin/node/search"), 8); menu("admin/node/help", "help", "node_help", NULL, 9); menu("admin/node/edit", "edit node", "node_admin", NULL, 0, 1); - menu("admin/node/settings", "content settings", "node_admin", node_help("admin/node/settings"), 8); + menu("admin/node/settings", "settings", "node_admin", node_help("admin/node/settings"), 8); } } diff --git a/modules/page.module b/modules/page.module index f03699ccece..db19c566f4b 100644 --- a/modules/page.module +++ b/modules/page.module @@ -97,7 +97,7 @@ function page_link($type) { if ($type == "system") { if (user_access("maintain static pages")) { - menu("node/add/page", t("create static page"), NULL, NULL, 0); + menu("node/add/page", t("static page"), NULL, NULL, 0); } } diff --git a/modules/page/page.module b/modules/page/page.module index f03699ccece..db19c566f4b 100644 --- a/modules/page/page.module +++ b/modules/page/page.module @@ -97,7 +97,7 @@ function page_link($type) { if ($type == "system") { if (user_access("maintain static pages")) { - menu("node/add/page", t("create static page"), NULL, NULL, 0); + menu("node/add/page", t("static page"), NULL, NULL, 0); } } diff --git a/modules/poll.module b/modules/poll.module index 36a903bd56e..de68cb451d4 100644 --- a/modules/poll.module +++ b/modules/poll.module @@ -163,7 +163,7 @@ function poll_link($type, $node = 0, $main) { if ($type == "system") { if (user_access("create polls")) { - menu("node/add/poll",t("create poll"), NULL, NULL, 0); + menu("node/add/poll",t("poll"), NULL, NULL, 0); } } else if ($type == "page" && user_access("access content")) { diff --git a/modules/poll/poll.module b/modules/poll/poll.module index 36a903bd56e..de68cb451d4 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -163,7 +163,7 @@ function poll_link($type, $node = 0, $main) { if ($type == "system") { if (user_access("create polls")) { - menu("node/add/poll",t("create poll"), NULL, NULL, 0); + menu("node/add/poll",t("poll"), NULL, NULL, 0); } } else if ($type == "page" && user_access("access content")) { diff --git a/modules/statistics.module b/modules/statistics.module index cbe1a2f988e..7b0b9c09df8 100644 --- a/modules/statistics.module +++ b/modules/statistics.module @@ -117,7 +117,7 @@ function statistics_link($type, $node = 0, $main = 0) { if ($type == "system") { if ((user_access("administer statistics module") || (user_access("administer statistics")))) { - menu("admin/statistics", "site statistics", "statistics_admin", statistics_help("admin/statistics"), 6); + menu("admin/statistics", "statistics", "statistics_admin", statistics_help("admin/statistics"), 6); menu("admin/statistics/referrers", "referrer log", "statistics_admin", statistics_help("admin/statistics/referrers") ); menu("admin/statistics/referrers/internal", "internal referrers only", "statistics_admin", statistics_help("admin/statistics/referrers/internal") ); menu("admin/statistics/referrers/external", "external referrers only", "statistics_admin", statistics_help("admin/statistics/referrers/external") ); @@ -129,8 +129,8 @@ function statistics_link($type, $node = 0, $main = 0) { menu("admin/statistics/help", "help", "statistics_help", NULL, 9); // block configuration: - menu("admin/block/top nodes block", "configure 'top nodes' block", "statistics_admin", statistics_help("admin/block/top nodes/block"), 5); - menu("admin/block/whos online block", "configure 'who is online' block", "statistics_admin", statistics_help("admin/block/whos online block"), 5); + menu("admin/system/block/top nodes block", "configure 'top nodes' block", "statistics_admin", statistics_help("admin/system/block/top nodes/block"), 5); + menu("admin/system/block/whos online block", "configure 'who is online' block", "statistics_admin", statistics_help("admin/system/block/whos online block"), 5); } } @@ -172,13 +172,13 @@ function statistics_help($section = "admin/statistics/help") { $output .= "

Top nodes block

"; $output .= "

This module creates a block that can display the day's top viewed nodes, the all time top viewed nodes and the last nodes viewed. Each of these links can be enabled or disabled individually, and the number of nodes displayed for each can be configured with a drop down menu. If you disable all sections of this block, it will not appear.

"; $output .= "

The administrative \"top nodes block\" screen also allows you to assign a name to the block.

"; - $output .= strtr("

Don't forget to enable the block %here.

",array("%here" => l(t("here"), "admin/block") )); + $output .= strtr("

Don't forget to enable the block %here.

",array("%here" => l(t("here"), "admin/system/block") )); $output .= "

Top nodes page

"; $output .= "

This module creates a user page that can display summaries of the day's top viewed nodes, the all time top nodes and the last nodes viewed. Each of these summaries can be enabled or disabled individually, and the number of nodes displayed for each can be configured with a drop down menu.

"; $output .= "

The administrative \"top nodes page\" screen also allows you to assign a name for the automatically generated link to the user page. If no name is set, the link will not be displayed.

"; $output .= "

Who's online block

This module creates a block that can display how many user's and guests are currently online. You are able to configure the name of the block, the name of a sub-block for displaying names of user's currently online, how recently a user must have been active to be considered online, the maximum characters to display from a user's name and the maximum number of user names to display.

"; - $output .= strtr("

Don't forget to enable the block %here.

",array("%here" => l(t("here"), "admin/block") )); + $output .= strtr("

Don't forget to enable the block %here.

",array("%here" => l(t("here"), "admin/system/block") )); $output .= strtr("

Permissions

This module has four permissions that need to be configured in %permissions.

",array("%permissions" => l(t("user permissions"), "admin/user/permission") )); $output .= "