Commit fe09d5a7 authored by Dries's avatar Dries

- 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.
parent 0ff789c6
......@@ -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 <b>must</b> run \"cron.php\". To display the feed in a block you must turn on the %block. <br /><ul><li>To delete a feed choose \"edit feed\"</li><li>To clear all of the entries from a feed choose \"Remove items\"</li><li>To check whether a feed is working, and to get new items <b>now</b> click on \"update items\"</li></ul><ul><li>To delete a bundle choose \"edit bundle\".</li></ul>", 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.<br />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 <i>Sport</i>. 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);
}
}
......
......@@ -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 <b>must</b> run \"cron.php\". To display the feed in a block you must turn on the %block. <br /><ul><li>To delete a feed choose \"edit feed\"</li><li>To clear all of the entries from a feed choose \"Remove items\"</li><li>To check whether a feed is working, and to get new items <b>now</b> click on \"update items\"</li></ul><ul><li>To delete a bundle choose \"edit bundle\".</li></ul>", 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.<br />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 <i>Sport</i>. 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);
}
}
......
......@@ -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 <b>active</b> 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 <b>create php content</b> permission (see %permission) you <b>must</b> 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);
}
}
......
......@@ -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 <b>active</b> 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 <b>create php content</b> permission (see %permission) you <b>must</b> 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);
}
}
......
......@@ -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);
}
}
......
......@@ -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);
}
}
......
......@@ -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);
......
......@@ -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);
......
......@@ -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);
}
}
}
......
......@@ -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);
}
}
}
......
......@@ -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 <b>must</b> run \"cron.php\". To display the feed in a block you must turn on the %block. <br /><ul><li>To delete a feed choose \"edit feed\"</li><li>To clear all of the entries from a feed choose \"Remove items\"</li><li>To check whether a feed is working, and to get new items <b>now</b> click on \"update items\"</li></ul><ul><li>To delete a bundle choose \"edit bundle\".</li></ul>", 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.<br />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 <i>Sport</i>. 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);
}
}
......
......@@ -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);
}
}
......
......@@ -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);
}
}
......
......@@ -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);
}
}
......
......@@ -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);
}
}
......
......@@ -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")) {
......
......@@ -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")) {
......
......@@ -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 .= "<h3>Top nodes block</h3>";
$output .= "<p>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.</p>";
$output .= "<p>The administrative \"top nodes block\" screen also allows you to assign a name to the block.</p>";
$output .= strtr("<p>Don't forget to enable the block %here.</p>",array("%here" => l(t("here"), "admin/block") ));
$output .= strtr("<p>Don't forget to enable the block %here.</p>",array("%here" => l(t("here"), "admin/system/block") ));
$output .= "<h3>Top nodes page</h3>";
$output .= "<p>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.</p>";
$output .= "<p>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.</p>";
$output .= "<h3>Who's online block</h3><p>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.</p>";
$output .= strtr("<p>Don't forget to enable the block %here.</p>",array("%here" => l(t("here"), "admin/block") ));
$output .= strtr("<p>Don't forget to enable the block %here.</p>",array("%here" => l(t("here"), "admin/system/block") ));
$output .= strtr("<h3>Permissions</h3><p>This module has four permissions that need to be configured in %permissions.</p>",array("%permissions" => l(t("user permissions"), "admin/user/permission") ));
$output .= "<ul>";
$output .= "<li><i>access statistics</i> - enable for user roles that get to see individual node counts. (This does not define access to the block)</li>";
......@@ -241,10 +241,10 @@ function statistics_help($section = "admin/statistics/help") {
case 'admin/statistics/top nodes page':
$output = "The statistics 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.";
break;
case 'admin/block/top nodes block':
case 'admin/system/block/top nodes block':
$output = "The statistics module exports a block that can display the top viewed nodes of the day, 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.";
break;
case 'admin/block/whos online block':
case 'admin/system/block/whos online block':
$output = "The statistics module exports a block that can display how many user's and guests are currently online. You can 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.";
break;
}
......
......@@ -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 .= "<h3>Top nodes block</h3>";
$output .= "<p>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.</p>";
$output .= "<p>The administrative \"top nodes block\" screen also allows you to assign a name to the block.</p>";
$output .= strtr("<p>Don't forget to enable the block %here.</p>",array("%here" => l(t("here"), "admin/block") ));
$output .= strtr("<p>Don't forget to enable the block %here.</p>",array("%here" => l(t("here"), "admin/system/block") ));
$output .= "<h3>Top nodes page</h3>";
$output .= "<p>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.</p>";
$output .= "<p>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.</p>";
$output .= "<h3>Who's online block</h3><p>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.</p>";
$output .= strtr("<p>Don't forget to enable the block %here.</p>",array("%here" => l(t("here"), "admin/block") ));
$output .= strtr("<p>Don't forget to enable the block %here.</p>",array("%here" => l(t("here"), "admin/system/block") ));
$output .= strtr("<h3>Permissions</h3><p>This module has four permissions that need to be configured in %permissions.</p>",array("%permissions" => l(t("user permissions"), "admin/user/permission") ));
$output .= "<ul>";
$output .= "<li><i>access statistics</i> - enable for user roles that get to see individual node counts. (This does not define access to the block)</li>";
......@@ -241,10 +241,10 @@ function statistics_help($section = "admin/statistics/help") {
case 'admin/statistics/top nodes page':
$output = "The statistics 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.";
break;
case 'admin/block/top nodes block':
case 'admin/system/block/top nodes block':
$output = "The statistics module exports a block that can display the top viewed nodes of the day, 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.";
break;
case 'admin/block/whos online block':
case 'admin/system/block/whos online block':
$output = "The statistics module exports a block that can display how many user's and guests are currently online. You can 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.";
break;
}
......
......@@ -56,7 +56,7 @@ function story_link($type) {
if ($type == "system") {
if (user_access("create stories")) {
menu("node/add/story", t("create story"), NULL, NULL, 0);
menu("node/add/story", t("story"), NULL, NULL, 0);
}
}
......
......@@ -56,7 +56,7 @@ function story_link($type) {
if ($type == "system") {
if (user_access("create stories")) {
menu("node/add/story", t("create story"), NULL, NULL, 0);
menu("node/add/story", t("story"), NULL, NULL, 0);
}
}
......
......@@ -59,7 +59,7 @@ function system_link($type) {
$help["modules"] = t("Modules are plugins for Drupal that extend its core functionality. Here you can select which modules are enabled. On the left hand side click on the name of the module for their individual configurations. Once a module is enabled, you will need to grant permissions to users in user management.");
$help["filters"] = t("Filters fit between the raw text in a node and the HTML output. They allow you to replace text selectively. Uses include automatic conversion of emoticons into graphics and filtering HTML content from users' submissions.");
menu("admin/system", "site configuration", "system_admin", system_help("admin/system"), 3);
menu("admin/system", "configuration", "system_admin", system_help("admin/system"), 3);
menu("admin/system/themes", "themes", "system_admin", system_help("admin/system/themes"), 2);
foreach (theme_list(1) as $theme) {
......
......@@ -59,7 +59,7 @@ function system_link($type) {
$help["modules"] = t("Modules are plugins for Drupal that extend its core functionality. Here you can select which modules are enabled. On the left hand side click on the name of the module for their individual configurations. Once a module is enabled, you will need to grant permissions to users in user management.");
$help["filters"] = t("Filters fit between the raw text in a node and the HTML output. They allow you to replace text selectively. Uses include automatic conversion of emoticons into graphics and filtering HTML content from users' submissions.");
menu("admin/system", "site configuration", "system_admin", system_help("admin/system"), 3);
menu("admin/system", "configuration", "system_admin", system_help("admin/system"), 3);
menu("admin/system/themes", "themes", "system_admin", system_help("admin/system/themes"), 2);
foreach (theme_list(1) as $theme) {
......
......@@ -20,7 +20,7 @@ function tracker_link($type) {
if ($type == "system") {
if (user_access("access content")) {
menu("tracker", t("view recent posts"), NULL, NULL, 1);
menu("tracker", t("recent posts"), NULL, NULL, 1);
}
}
......
......@@ -20,7 +20,7 @@ function tracker_link($type) {
if ($type == "system") {
if (user_access("access content")) {
menu("tracker", t("view recent posts"), NULL, NULL, 1);
menu("tracker", t("recent posts"), NULL, NULL, 1);
}
}
......
......@@ -1646,7 +1646,6 @@ function user_admin() {
$output = user_admin_perm($edit);
break;
case t("Create account"):
case "create":
$output = user_admin_create($edit);
break;
case t("Add role"):
......@@ -1661,7 +1660,11 @@ function user_admin() {
$output = user_admin_edit($edit);
break;
default:
$output = user_admin_account();
if ($op == "account" && arg(3) == "create") {
$output = user_admin_create($edit);
} else {
$output = user_admin_account();
}
}
return $output;
}
......@@ -1719,10 +1722,10 @@ function user_help($section = "admin/user/help") {
return t($output);
case "admin/user":
return t("Drupal allows users to register, login, logout, maintain user profiles, etc. No participant can use his own name to post content until he signs up for a user account.<br />Click on either the \"username\" or \"edit account\" to edit a user's information.");
case "admin/user/create":
return t("This web page allows the administrators to register a new users by hand.<br />Note:<ul><li>You cannot have a user where either the e-mail address or the username match another user in the system.</li></ul>");
case "admin/user/account":
return t("This page allows you to review and edit any user's profile. To edit a profile click on either the \"username\" or \"edit account\".");
case "admin/user/account/create":
return t("This web page allows the administrators to register a new users by hand.<br />Note:<ul><li>You cannot have a user where either the e-mail address or the username match another user in the system.</li></ul>");
case "admin/user/account/0":
return t("This page allows you to review and edit an active user's profile. To edit a profile click on either the \"username\" or \"edit account\".");
case "admin/user/account/1":
......
......@@ -1646,7 +1646,6 @@ function user_admin() {
$output = user_admin_perm($edit);
break;
case t("Create account"):
case "create":
$output = user_admin_create($edit);
break;
case t("Add role"):
......@@ -1661,7 +1660,11 @@ function user_admin() {
$output = user_admin_edit($edit);
break;
default:
$output = user_admin_account();
if ($op == "account" && arg(3) == "create") {
$output = user_admin_create($edit);
} else {
$output = user_admin_account();
}
}
return $output;
}
......@@ -1719,10 +1722,10 @@ function user_help($section = "admin/user/help") {
return t($output);
case "admin/user":
return t("Drupal allows users to register, login, logout, maintain user profiles, etc. No participant can use his own name to post content until he signs up for a user account.<br />Click on either the \"username\" or \"edit account\" to edit a user's information.");
case "admin/user/create":
return t("This web page allows the administrators to register a new users by hand.<br />Note:<ul><li>You cannot have a user where either the e-mail address or the username match another user in the system.</li></ul>");
case "admin/user/account":
return t("This page allows you to review and edit any user's profile. To edit a profile click on either the \"username\" or \"edit account\".");
case "admin/user/account/create":
return t("This web page allows the administrators to register a new users by hand.<br />Note:<ul><li>You cannot have a user where either the e-mail address or the username match another user in the system.</li></ul>");
case "admin/user/account/0":
return t("This page allows you to review and edit an active user's profile. To edit a profile click on either the \"username