Thousands of web sites, especially news sites and weblogs, syndicate their most recent site content for others to display. The syndicated content always includes titles, also known as headlines, for the newest published stories. Each headline acts as a direct link to the stories on the remote site. Along with the headline, most sites typically provide either the first few paragraphs of the story or a short summary. Many individuals use client-based news aggregators on their personal computer to aggregate content, such as %amphetadesk
"; $output .= "Drupal also has a news aggregator built in as a standard feature. With it, you can subscribe to feeds from other sites and display their content for your site users. Simply enable the import module in site administration and enter the feeds that you choose.
"; $output .= "Thousands of web sites, especially news sites and weblogs, syndicate their most recent site content for others to display. The syndicated content always includes titles, also known as headlines, for the newest published stories. Each headline acts as a direct link to the stories on the remote site. Along with the headline, most sites typically provide either the first few paragraphs of the story or a short summary. Many individuals use client-based news aggregators on their personal computer to aggregate content, such as %amphetadesk
"; $output .= "Drupal also has a news aggregator built in as a standard feature. With it, you can subscribe to feeds from other sites and display their content for your site users. Simply enable the import module in site administration and enter the feeds that you choose.
"; $output .= "The sidebar each block appears in depends on both which theme you're using (some are left-only, some right, some both), and on the settings in block management.
Whether a block is visible in the first place depends on three things:
The block management screen also lets you specify the vertical sort-order of the blocks within a sidebar. You do this by assigning a weight to each block. Lighter blocks (smaller weight) \"float up\" towards the top of the sidebar. Heavier ones \"sink down\" towards the bottom of it. Once you've positioned things just so, you can preview what the layout will look like in different types of themes by clicking the preview placement link in the menu to the left.
"; @@ -60,10 +60,10 @@ function block_perm() { function block_link($type) { if ($type == "system" && user_access("administer blocks")) { - menu("admin/system/block", t("blocks"), "block_admin", block_help("admin/system/block"), 3); - menu("admin/system/block/add", t("new block"), "block_admin", block_help("admin/system/block/add"), 2); - menu("admin/system/block/preview", t("preview placement"), "block_admin", block_help("admin/system/block/preview"), 3); - menu("admin/system/block/help", t("help"), "block_help", NULL, 9); + menu("admin/system/block", t("blocks"), "block_admin", 3); + menu("admin/system/block/add", t("new block"), "block_admin", 2); + menu("admin/system/block/preview", t("preview placement"), "block_admin", 3); + menu("admin/system/block/help", t("help"), "block_help", 9); } } diff --git a/modules/block/block.module b/modules/block/block.module index 40c26c036f5a405cc04e39e7e359db5a53f49674..64f2d1b8b5d6afb47172b3cf8dda21d5d0525e9b 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -1,11 +1,11 @@ Blocks are the boxes visible in the sidebar(s) of your web site. These are usually generated automatically by modules (e.g. recent forum topics), but you can also create your own blocks using either static HTML or dynamic PHP content."; $output .= "The sidebar each block appears in depends on both which theme you're using (some are left-only, some right, some both), and on the settings in block management.
Whether a block is visible in the first place depends on three things:
The block management screen also lets you specify the vertical sort-order of the blocks within a sidebar. You do this by assigning a weight to each block. Lighter blocks (smaller weight) \"float up\" towards the top of the sidebar. Heavier ones \"sink down\" towards the bottom of it. Once you've positioned things just so, you can preview what the layout will look like in different types of themes by clicking the preview placement link in the menu to the left.
"; @@ -60,10 +60,10 @@ function block_perm() { function block_link($type) { if ($type == "system" && user_access("administer blocks")) { - menu("admin/system/block", t("blocks"), "block_admin", block_help("admin/system/block"), 3); - menu("admin/system/block/add", t("new block"), "block_admin", block_help("admin/system/block/add"), 2); - menu("admin/system/block/preview", t("preview placement"), "block_admin", block_help("admin/system/block/preview"), 3); - menu("admin/system/block/help", t("help"), "block_help", NULL, 9); + menu("admin/system/block", t("blocks"), "block_admin", 3); + menu("admin/system/block/add", t("new block"), "block_admin", 2); + menu("admin/system/block/preview", t("preview placement"), "block_admin", 3); + menu("admin/system/block/help", t("help"), "block_help", 9); } } diff --git a/modules/blog.module b/modules/blog.module index ba27e1f41bb381d210a5bebe84da3c9f11261ce5..b72bb7719d4598d9b1487b0b53439d18d2c63942 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -69,8 +69,7 @@ function blog_help($section) { $output =""; switch ($section) { - case 'admin/blog/help': - case 'admin/help': + case 'admin/help#blog': $output .= "Drupal's blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. These can be filled with daily thoughts, poetry, boneless blabber, spiritual theories, intimate details, valuable experiences, cynical rants, semi-coherent comments, writing experiments, artistic babblings, critics on current facts, fresh insights, diverse dreams, chronicles and mumbling madness available for public consumption.
"; $output .= "Blogs are made up of individual entries (nodes) that are timestamped and are typically viewed by day as you would a diary. Blogs often contain links to things you've seen and/or agree/disagree with. A typical example of a long term blog can be seen at %scripting-com.
"; $output .= "The blog module adds a \"user blogs\" navigation link to the site, which takes any visitor to a page that displays the most recent blog entries from all the users on the site. Personal user menus gain a \"create a blog entry\" link (which takes you to a submission form) and a \"view personal blog\" link (which displays your blog entries as other people will see them). On the bottom of each of your own blog entries, there is an \"edit this blog entry\" link that lets you edit or delete that entry.
"; @@ -253,10 +252,10 @@ function blog_link($type, $node = 0, $main) { if ($type == "system") { if (user_access("maintain personal blog")) { - menu("node/add/blog", t("blog entry"), "blog_page", NULL, 0); + menu("node/add/blog", t("blog entry"), "blog_page", 0); } if (user_access("maintain personal blog")) { - menu("blog/" . $user->uid, t("my blog"), "user_page", NULL, 1); + menu("blog/" . $user->uid, t("my blog"), "user_page", 1); } } diff --git a/modules/blog/blog.module b/modules/blog/blog.module index ba27e1f41bb381d210a5bebe84da3c9f11261ce5..b72bb7719d4598d9b1487b0b53439d18d2c63942 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -69,8 +69,7 @@ function blog_help($section) { $output =""; switch ($section) { - case 'admin/blog/help': - case 'admin/help': + case 'admin/help#blog': $output .= "Drupal's blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. These can be filled with daily thoughts, poetry, boneless blabber, spiritual theories, intimate details, valuable experiences, cynical rants, semi-coherent comments, writing experiments, artistic babblings, critics on current facts, fresh insights, diverse dreams, chronicles and mumbling madness available for public consumption.
"; $output .= "Blogs are made up of individual entries (nodes) that are timestamped and are typically viewed by day as you would a diary. Blogs often contain links to things you've seen and/or agree/disagree with. A typical example of a long term blog can be seen at %scripting-com.
"; $output .= "The blog module adds a \"user blogs\" navigation link to the site, which takes any visitor to a page that displays the most recent blog entries from all the users on the site. Personal user menus gain a \"create a blog entry\" link (which takes you to a submission form) and a \"view personal blog\" link (which displays your blog entries as other people will see them). On the bottom of each of your own blog entries, there is an \"edit this blog entry\" link that lets you edit or delete that entry.
"; @@ -253,10 +252,10 @@ function blog_link($type, $node = 0, $main) { if ($type == "system") { if (user_access("maintain personal blog")) { - menu("node/add/blog", t("blog entry"), "blog_page", NULL, 0); + menu("node/add/blog", t("blog entry"), "blog_page", 0); } if (user_access("maintain personal blog")) { - menu("blog/" . $user->uid, t("my blog"), "user_page", NULL, 1); + menu("blog/" . $user->uid, t("my blog"), "user_page", 1); } } diff --git a/modules/bloggerapi.module b/modules/bloggerapi.module index acd0806779daea09a1b9691f2871a1092f4221ce..02244f3ffb80c5bc112b5870227d80b0bb5970a4 100644 --- a/modules/bloggerapi.module +++ b/modules/bloggerapi.module @@ -337,8 +337,7 @@ function bloggerapi_help($section) { $output = ""; switch ($section) { - case 'admin/bloggerapi/help': - case 'admin/help': + case 'admin/help#bloggerapi': $output = "%blogger-com, the well-known public weblog service, provides an application programing interface (API) to allow remote procedure calls (RPC) to the Blogger service. Drupal supports this %blogger-api, which means that many remote clients (e.g. %client-radio, %client-blogbuddy, %client-w_bloggar, and %client-textrouter) may post to Drupal. These clients provide a bevy of interesting capabilities like offline composing, spellcheck, and WYSIWYG editing; many folks prefer to blog with a client application over typical web forms. By supporting the Blogger API, Drupal grows grander than a web site engine, it's a content accepting machine™.
"; $output .= "The %blogger_api uses the %xml-rpc protocol for communicating with the outside world. %xml-rpc, originally developed by Dave Winer of %userland-software, is a simple XML-based RPC specification ideally suited to the web. Drupal also uses %xml-rpc for several other tasks (e.g. notifiying %weblogs-com of blog updates and making/accepting %dist-auth requests)
"; diff --git a/modules/book.module b/modules/book.module index d27591c8023407ad1a03230accf862f963be6ce3..60ae902ed54f97857204105ede6a42a3f3613fed 100644 --- a/modules/book.module +++ b/modules/book.module @@ -71,10 +71,10 @@ function book_link($type, $node = 0, $main = 0) { if ($type == "system") { if (user_access("maintain books")) { - menu("node/add/book", t("book page"), "book_page", NULL, 0); - menu("admin/node/book", t("books"), NULL, NULL, 4); - menu("admin/node/book/orphan", t("orphan pages"), NULL, NULL, 8); - menu("admin/node/book/help", t("help"), NULL, NULL, 9); + menu("node/add/book", t("book page"), "book_page", 0); + menu("admin/node/book", t("books"), NULL, 4); + menu("admin/node/book/orphan", t("orphan pages"), NULL, 8); + menu("admin/node/book/help", t("help"), NULL, 9); $result = db_query("SELECT n.nid, n.title FROM {node} n INNER JOIN {book} b ON n.nid = b.nid WHERE b.parent = 0 ORDER BY b.weight, n.title"); while ($book = db_fetch_object($result)) { @@ -834,13 +834,11 @@ function book_admin() { } } -function book_help($section = "admin/node/book/help") { +function book_help($section = "admin/help#book") { $output = ""; switch ($section) { - case 'admin/node/book/help': - case 'admin/book/help': - case 'admin/help': + case 'admin/help#book': $output .= "The book organises content into a nested hierarchical structure. It is particularly good for manuals, Frequently Asked Questions (FAQs) and the like, allowing you to have chapters, sections, etc.
"; $output .= "A book is simply a collection of nodes that have been linked together. These nodes are usually of type book page, but you can insert nodes of any type into a book outline. Every node in the book has a parent node which \"contains\" it. This is how book.module establishes its hierarchy. At any given level in the hierarchy, a book can contain many nodes. All these sibling nodes are sorted according to the weight that you give them.
"; $output .= "A book page is a special node type that allows you to embed PHP within the body of the page. This capability is only offerred to administrators, since malicious users could abuse this power. In addiiton, book pages contain a log message field which helps your users understand the motivation behind an edit of a book page. Each edited version of a book page is stored as a new revision of a node. This capability makes it easy to revert to an old version of a page, should that be desirable.
"; diff --git a/modules/book/book.module b/modules/book/book.module index d27591c8023407ad1a03230accf862f963be6ce3..60ae902ed54f97857204105ede6a42a3f3613fed 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -71,10 +71,10 @@ function book_link($type, $node = 0, $main = 0) { if ($type == "system") { if (user_access("maintain books")) { - menu("node/add/book", t("book page"), "book_page", NULL, 0); - menu("admin/node/book", t("books"), NULL, NULL, 4); - menu("admin/node/book/orphan", t("orphan pages"), NULL, NULL, 8); - menu("admin/node/book/help", t("help"), NULL, NULL, 9); + menu("node/add/book", t("book page"), "book_page", 0); + menu("admin/node/book", t("books"), NULL, 4); + menu("admin/node/book/orphan", t("orphan pages"), NULL, 8); + menu("admin/node/book/help", t("help"), NULL, 9); $result = db_query("SELECT n.nid, n.title FROM {node} n INNER JOIN {book} b ON n.nid = b.nid WHERE b.parent = 0 ORDER BY b.weight, n.title"); while ($book = db_fetch_object($result)) { @@ -834,13 +834,11 @@ function book_admin() { } } -function book_help($section = "admin/node/book/help") { +function book_help($section = "admin/help#book") { $output = ""; switch ($section) { - case 'admin/node/book/help': - case 'admin/book/help': - case 'admin/help': + case 'admin/help#book': $output .= "The book organises content into a nested hierarchical structure. It is particularly good for manuals, Frequently Asked Questions (FAQs) and the like, allowing you to have chapters, sections, etc.
"; $output .= "A book is simply a collection of nodes that have been linked together. These nodes are usually of type book page, but you can insert nodes of any type into a book outline. Every node in the book has a parent node which \"contains\" it. This is how book.module establishes its hierarchy. At any given level in the hierarchy, a book can contain many nodes. All these sibling nodes are sorted according to the weight that you give them.
"; $output .= "A book page is a special node type that allows you to embed PHP within the body of the page. This capability is only offerred to administrators, since malicious users could abuse this power. In addiiton, book pages contain a log message field which helps your users understand the motivation behind an edit of a book page. Each edited version of a book page is stored as a new revision of a node. This capability makes it easy to revert to an old version of a page, should that be desirable.
"; diff --git a/modules/cloud.module b/modules/cloud.module index 17f8fa8c3305af1260ef1ee5f05c0b0faabd5bbb..fe293237bbbed948ccd1242a0e650fb354a93a2b 100644 --- a/modules/cloud.module +++ b/modules/cloud.module @@ -1,13 +1,11 @@ "; $output .= "Attached to each comment board is a control panel for customizing the way that comments are displayed. Users can control the chronological ordering of posts (newest or oldest first) and the number of posts to display on each page. Additional settings include:
"; @@ -843,21 +842,21 @@ function comment_link($type, $node = 0, $main = 0) { if ($type == "system") { if (user_access("administer comments")) { - menu("admin/comment", t("comments"), "comment_admin", comment_help("admin/comment"), 1); - menu("admin/comment/comments", t("overview"), NULL, comment_help("admin/comment/comments"), 2); - menu("admin/comment/comments/0", t("new/updated"), "comment_admin", comment_help("admin/comment/comments/0"), 1); - menu("admin/comment/comments/1", t("approval queue"), "comment_admin", comment_help("admin/comment/comments/1"), 2); - menu("admin/comment/search", t("search"), "comment_admin", comment_help("admin/comment/search"), 8); - menu("admin/comment/help", t("help"), "comment_help", NULL, 9); - menu("admin/comment/edit", t("edit comment"), "comment_admin", NULL, 0, 1); + menu("admin/comment", t("comments"), "comment_admin", 1); + menu("admin/comment/comments", t("overview"), NULL, 2); + menu("admin/comment/comments/0", t("new/updated"), "comment_admin", 1); + menu("admin/comment/comments/1", t("approval queue"), "comment_admin", 2); + menu("admin/comment/search", t("search"), "comment_admin", 8); + menu("admin/comment/help", t("help"), "comment_help", 9); + menu("admin/comment/edit", t("edit comment"), "comment_admin", 0, 1); // comment settings: if (user_access("administer moderation")) { - menu("admin/comment/moderation", t("moderation"), NULL, comment_help("admin/comment/moderation"), 3); - menu("admin/comment/moderation/votes", t("votes"), "comment_admin", comment_help("admin/comment/moderation/votes")); - menu("admin/comment/moderation/matrix", t("matrix"), "comment_admin", comment_help("admin/comment/moderation/matrix")); - menu("admin/comment/moderation/filters", t("thresholds"), "comment_admin", comment_help("admin/comment/moderation/filters")); - menu("admin/comment/moderation/roles", t("initial scores"), "comment_admin", comment_help("admin/comment/roles"), 6); + menu("admin/comment/moderation", t("moderation"), NULL, 3); + menu("admin/comment/moderation/votes", t("votes"), "comment_admin"); + menu("admin/comment/moderation/matrix", t("matrix"), "comment_admin"); + menu("admin/comment/moderation/filters", t("thresholds"), "comment_admin"); + menu("admin/comment/moderation/roles", t("initial scores"), "comment_admin", 6); } } } diff --git a/modules/comment/comment.module b/modules/comment/comment.module index a03f236d9f4b9591fa8d84730fd1a66c180f80d9..9a590471d7da4d41f22587b305f04cb00d47630b 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -1,12 +1,11 @@ When enabled, the Drupal comment module creates a discussion board for each Drupal node. Users can post comments to discuss a forum topic, weblog post, collaborative book page, etc."; $output .= "Attached to each comment board is a control panel for customizing the way that comments are displayed. Users can control the chronological ordering of posts (newest or oldest first) and the number of posts to display on each page. Additional settings include:
"; @@ -843,21 +842,21 @@ function comment_link($type, $node = 0, $main = 0) { if ($type == "system") { if (user_access("administer comments")) { - menu("admin/comment", t("comments"), "comment_admin", comment_help("admin/comment"), 1); - menu("admin/comment/comments", t("overview"), NULL, comment_help("admin/comment/comments"), 2); - menu("admin/comment/comments/0", t("new/updated"), "comment_admin", comment_help("admin/comment/comments/0"), 1); - menu("admin/comment/comments/1", t("approval queue"), "comment_admin", comment_help("admin/comment/comments/1"), 2); - menu("admin/comment/search", t("search"), "comment_admin", comment_help("admin/comment/search"), 8); - menu("admin/comment/help", t("help"), "comment_help", NULL, 9); - menu("admin/comment/edit", t("edit comment"), "comment_admin", NULL, 0, 1); + menu("admin/comment", t("comments"), "comment_admin", 1); + menu("admin/comment/comments", t("overview"), NULL, 2); + menu("admin/comment/comments/0", t("new/updated"), "comment_admin", 1); + menu("admin/comment/comments/1", t("approval queue"), "comment_admin", 2); + menu("admin/comment/search", t("search"), "comment_admin", 8); + menu("admin/comment/help", t("help"), "comment_help", 9); + menu("admin/comment/edit", t("edit comment"), "comment_admin", 0, 1); // comment settings: if (user_access("administer moderation")) { - menu("admin/comment/moderation", t("moderation"), NULL, comment_help("admin/comment/moderation"), 3); - menu("admin/comment/moderation/votes", t("votes"), "comment_admin", comment_help("admin/comment/moderation/votes")); - menu("admin/comment/moderation/matrix", t("matrix"), "comment_admin", comment_help("admin/comment/moderation/matrix")); - menu("admin/comment/moderation/filters", t("thresholds"), "comment_admin", comment_help("admin/comment/moderation/filters")); - menu("admin/comment/moderation/roles", t("initial scores"), "comment_admin", comment_help("admin/comment/roles"), 6); + menu("admin/comment/moderation", t("moderation"), NULL, 3); + menu("admin/comment/moderation/votes", t("votes"), "comment_admin"); + menu("admin/comment/moderation/matrix", t("matrix"), "comment_admin"); + menu("admin/comment/moderation/filters", t("thresholds"), "comment_admin"); + menu("admin/comment/moderation/roles", t("initial scores"), "comment_admin", 6); } } } diff --git a/modules/drupal.module b/modules/drupal.module index 93ebc1205487c7abca24056028155fdf692d48db..85b9573f3272f4d2447c152b6f5b1d6668ff3016 100644 --- a/modules/drupal.module +++ b/modules/drupal.module @@ -1,12 +1,11 @@ The \"Drupal\" module features a capability whereby other drupal sites may call home to report their existence. In turn, this enables a pod of Drupal sites to find, cooperate and advertise each other."; $output .= "Currently, the main application of this feature is the %drupal-sites. By default, fresh Drupal installations can use %Drupal as their directory server and report their existence. This reporting occurs via scheduled %xml-rpc pings.
"; $output .= "Drupal administrators should simply enable this feature to get listed on the %drupal-sites; just set your site's name, e-mail address, slogan and mission statement. Then make sure that the field called Drupal XML-RPC server on the %drupal-settings page is set to http://www.drupal.org/xmlrpc.php, and enable this feature using the dropdown directly below.
"; @@ -20,7 +19,7 @@ function drupal_help($section = "admin/drupal/help") { case 'admin/system/modules/drupal': $output = t("Using this your Drupal site can \"call home\" and add itself to the Drupal directory. If you want it to add itself to a different directory server you can change the %Drupal-setting setting -- but the directory server has to be able to handle Drupal XML. To get a full site listing go to the %general and set:%drupal is the name of the software which powers %site. There are Drupal web sites all over the world, and many of them share their registration databases so that users may freely login to any Drupal site using a single Drupal ID.
\n"; @@ -159,7 +158,7 @@ function drupal_auth($username, $password, $server) { function drupal_page() { theme("header"); - theme("box", "Drupal", drupal_help("user/help")); + theme("box", "Drupal", drupal_help("user/help#drupal")); theme("footer"); } diff --git a/modules/drupal/drupal.module b/modules/drupal/drupal.module index 93ebc1205487c7abca24056028155fdf692d48db..85b9573f3272f4d2447c152b6f5b1d6668ff3016 100644 --- a/modules/drupal/drupal.module +++ b/modules/drupal/drupal.module @@ -1,12 +1,11 @@ The \"Drupal\" module features a capability whereby other drupal sites may call home to report their existence. In turn, this enables a pod of Drupal sites to find, cooperate and advertise each other."; $output .= "Currently, the main application of this feature is the %drupal-sites. By default, fresh Drupal installations can use %Drupal as their directory server and report their existence. This reporting occurs via scheduled %xml-rpc pings.
"; $output .= "Drupal administrators should simply enable this feature to get listed on the %drupal-sites; just set your site's name, e-mail address, slogan and mission statement. Then make sure that the field called Drupal XML-RPC server on the %drupal-settings page is set to http://www.drupal.org/xmlrpc.php, and enable this feature using the dropdown directly below.
"; @@ -20,7 +19,7 @@ function drupal_help($section = "admin/drupal/help") { case 'admin/system/modules/drupal': $output = t("Using this your Drupal site can \"call home\" and add itself to the Drupal directory. If you want it to add itself to a different directory server you can change the %Drupal-setting setting -- but the directory server has to be able to handle Drupal XML. To get a full site listing go to the %general and set:%drupal is the name of the software which powers %site. There are Drupal web sites all over the world, and many of them share their registration databases so that users may freely login to any Drupal site using a single Drupal ID.
\n"; @@ -159,7 +158,7 @@ function drupal_auth($username, $password, $server) { function drupal_page() { theme("header"); - theme("box", "Drupal", drupal_help("user/help")); + theme("box", "Drupal", drupal_help("user/help#drupal")); theme("footer"); } diff --git a/modules/forum.module b/modules/forum.module index 0edd252445f00abfb44d54fe3cfab04b4a49a818..15a12bd59440c784f13c38898372f379105096f1 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -630,12 +630,11 @@ function _forum_get_topic_order($sortby) { } } -function forum_help($section = "admin/forum/help") { +function forum_help($section = "admin/help#forum") { $output = ""; switch ($section) { - case 'admin/help': - case 'admin/forum/help': + case 'admin/help#forum': $output .= "The forum module uses taxonomy to organize itself. To create a forum you first have to create a %taxonomy. When doing this, choose a sensible name for it (such as \"fora\") and make sure under \"Types\" that \"forum\" is selected. Once you have done this, %taxo-terms to it. Each term will become a forum. If you fill in the description field, users will be given additonal information about the forum on the main forum page. For example: \"troubleshooting\" - \"Please ask your questions here.\"
"; $output .= "When you are happy with your vocabulary, go to %forums and set Forum vocabulary to the one you have just created. There will now be fora active on the site. For users to access them they must have the \"access content\" %permission and to create a topic they must have the \"create forum topics\" %permission. These permissions can be set in the %permission pages.
"; diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 0edd252445f00abfb44d54fe3cfab04b4a49a818..15a12bd59440c784f13c38898372f379105096f1 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -630,12 +630,11 @@ function _forum_get_topic_order($sortby) { } } -function forum_help($section = "admin/forum/help") { +function forum_help($section = "admin/help#forum") { $output = ""; switch ($section) { - case 'admin/help': - case 'admin/forum/help': + case 'admin/help#forum': $output .= "The forum module uses taxonomy to organize itself. To create a forum you first have to create a %taxonomy. When doing this, choose a sensible name for it (such as \"fora\") and make sure under \"Types\" that \"forum\" is selected. Once you have done this, %taxo-terms to it. Each term will become a forum. If you fill in the description field, users will be given additonal information about the forum on the main forum page. For example: \"troubleshooting\" - \"Please ask your questions here.\"
"; $output .= "When you are happy with your vocabulary, go to %forums and set Forum vocabulary to the one you have just created. There will now be fora active on the site. For users to access them they must have the \"access content\" %permission and to create a topic they must have the \"create forum topics\" %permission. These permissions can be set in the %permission pages.
"; diff --git a/modules/help.module b/modules/help.module index cfb5e846d2cbfe0e0b38f397d733c23be2b3573f..f7477a2ab752cf13ad069b1e4200ccd23916d3e1 100644 --- a/modules/help.module +++ b/modules/help.module @@ -3,8 +3,8 @@ function help_link($type) { if ($type == "system" && user_access("access administration pages")) { - menu("admin/help/glossary", t("glossary"), "help_glossary", NULL, 8); - menu("admin/help", t("help"), "help_help", NULL, 9); + menu("admin/help/glossary", t("glossary"), "help_glossary", 8); + menu("admin/help", t("help"), "help_help", 9); } } @@ -31,15 +31,18 @@ function help_glossary() { return $output; } -function help_help($section = "admin/help") { +function help_help($section = "admin/help#help") { $output = ""; switch ($section) { - case 'admin/help': + case 'admin/help#help': foreach (module_list() as $name) { - if (module_hook($name, "help")) { - $temp = module_invoke($name, "help", "admin/$name/help"); + if ($name == 'help') { + continue; + } + else if (module_hook($name, "help")) { + $temp = module_invoke($name, "help", "admin/help#$name"); if (!empty($temp)) { $links[] = l($name, "admin/help#$name"); $output .= "Thousands of web sites, especially news sites and weblogs, syndicate their most recent site content for others to display. The syndicated content always includes titles, also known as headlines, for the newest published stories. Each headline acts as a direct link to the stories on the remote site. Along with the headline, most sites typically provide either the first few paragraphs of the story or a short summary. Many individuals use client-based news aggregators on their personal computer to aggregate content, such as %amphetadesk
"; $output .= "Drupal also has a news aggregator built in as a standard feature. With it, you can subscribe to feeds from other sites and display their content for your site users. Simply enable the import module in site administration and enter the feeds that you choose.
"; $output .= "%jabber is an %opensource instant messaging system designed to give the power of choice and freedom back to the users of instant messaging. Not only does Jabber allow its users to use (and create) clients for numerous platforms, but it allows people to communicate to whomever they want in the way which is most convenient for them.
"; @@ -163,7 +163,7 @@ function jabber_auth($username, $password, $server) { function jabber_page() { theme("header"); - theme("box", "Jabber", jabber_help("user/help")); + theme("box", "Jabber", jabber_help("user/help#jabber")); theme("footer"); } diff --git a/modules/locale.module b/modules/locale.module index faecd98b54827e4b48fa91f10ee14bd6038531f8..738dcfc17e94867fcceff13f39a1f9a94dfeaabd 100644 --- a/modules/locale.module +++ b/modules/locale.module @@ -1,12 +1,11 @@ Most programs are written and documented in English, and use English to interact with users. This is also true for a great deal of web sites. However, most people are less comfortable with English than with their native language, and would prefer to use their mother tongue as much as possible. Many people love see their web site showing a lot less English, and far more of their own language."; $output .= "Therefore Drupal provides a framework to setup a multi-lingual web site, or to overwrite the default English texts. We explored the various alternatives to support internationalization (I18N) and decided to design the framework in such a way that the impact of internationalization on drupal's sources is minimized, modular and doesn't require a HTML or PHP wizard to maintain translations. Maintaining translations had to be simple so it became as easy as filling out forms on the administration page.
"; $output .= "Therefore Drupal provides a framework to setup a multi-lingual web site, or to overwrite the default English texts. We explored the various alternatives to support internationalization (I18N) and decided to design the framework in such a way that the impact of internationalization on drupal's sources is minimized, modular and doesn't require a HTML or PHP wizard to maintain translations. Maintaining translations had to be simple so it became as easy as filling out forms on the administration page.
"; $output .= "The core of the Drupal system is the node. All of the contents of the system are placed in nodes, or extensions of nodes."; $output .= "A base node contains:
The core of the Drupal system is the node. All of the contents of the system are placed in nodes, or extensions of nodes."; $output .= "A base node contains:
Site pages, unlike many other forms of Drupal content, may be made of PHP code in addition to HTML and text. All Drupal objects and functions are available to a site administrator.
"; $output = t($output); @@ -90,7 +89,7 @@ function page_link($type) { if ($type == "system") { if (user_access("maintain static pages")) { - menu("node/add/page", t("static page"), "page_page", NULL, 0); + menu("node/add/page", t("static page"), "page_page", 0); } } diff --git a/modules/page/page.module b/modules/page/page.module index d7bdc3a3bd89be37c9c20bb00817dc43554fe89a..0dd8489967b181bcc6dd6058d0b3baf0d3a8cf4f 100644 --- a/modules/page/page.module +++ b/modules/page/page.module @@ -1,12 +1,11 @@ The page module is used to create a static page. Unlike a story, a static page is a persistent web page on your site which usually shortcuts the typical lifecycle of user generated content (i.e. submit -> moderate -> post -> comment). A static page is usually linked from the main navigation bar, using whatever text the author wishes. To create a static page without this navigation link, simply skip the link text field."; $output .= "Site pages, unlike many other forms of Drupal content, may be made of PHP code in addition to HTML and text. All Drupal objects and functions are available to a site administrator.
"; $output = t($output); @@ -90,7 +89,7 @@ function page_link($type) { if ($type == "system") { if (user_access("maintain static pages")) { - menu("node/add/page", t("static page"), "page_page", NULL, 0); + menu("node/add/page", t("static page"), "page_page", 0); } } diff --git a/modules/path.module b/modules/path.module index 3dc56946214e96f063190401bce78327630d487b..98ac778b868146950628c92ecf1ff0b414f0f5c7 100644 --- a/modules/path.module +++ b/modules/path.module @@ -102,7 +102,7 @@ function path_form($edit = "", $error = "") { return form($form); } -function path_help($section = "admin/path/help") { +function path_help($section = "admin/help#path") { $output = ""; switch ($section) { @@ -115,7 +115,7 @@ function path_help($section = "admin/path/help") { case "admin/path/add": $output = t("Enter the path you wish to create the alias for, followed by the name of the new alias. Each path can be associated with only one alias."); break; - case "admin/path/help": + case "admin/help#path": $output .= "URL aliasing gives users the ability to have control over all Drupal paths. This functionality will integrate seamlessly into node forms and also provide the administrator an interface to view all aliases that have been created.
Aliases have a 1 to 1 relationship with their original Drupal URLs. In otherwards you cannot have an alias map to more than one path. Likewise, a Drupal URL can't be mapped to more than one alias.
"; $output .= "Two new permissions are introduced for aliasing URLs: create url aliases and administer url aliases.
"; $output .= "URL aliasing gives users the ability to have control over all Drupal paths. This functionality will integrate seamlessly into node forms and also provide the administrator an interface to view all aliases that have been created.
Aliases have a 1 to 1 relationship with their original Drupal URLs. In otherwards you cannot have an alias map to more than one path. Likewise, a Drupal URL can't be mapped to more than one alias.
"; $output .= "Two new permissions are introduced for aliasing URLs: create url aliases and administer url aliases.
"; $output .= "%weblogs, a web site that tracks and displays links to changed weblogs and news-oriented web sites. To get your Drupal site listed, weblogs.com must be informed about your site's updates. This is the job of the ping module and when installed, the administrator doesn't have to do anything to participate in the %weblogs system. The ping module automatically notifies weblogs.com when your site is updated. To do so, Drupal implements the %weblogs-XML.
"; $output .= "%weblogs-RSS, a web site that tracks and displays links to recently changed RSS feeds in XML format. To get your Drupal site listed, %weblogs-RSS must be informed about updates to your RSS feed. This is the job of the ping module and when installed, the administrator doesn't have to do anything to participate in the %weblogs-RSS-changes system. The ping module automatically notifies %weblogs-RSS when your site is updated.
"; diff --git a/modules/ping/ping.module b/modules/ping/ping.module index a791e44f6bc0d0c2da059834ce0709c25ae0971b..b8c7107874096d3bae5109bcf1be0742b1eaa44d 100644 --- a/modules/ping/ping.module +++ b/modules/ping/ping.module @@ -1,12 +1,11 @@ Drupal can pings sites automatically to notify them that your site has changed. It can ping the following sites:"; $output .= "%weblogs, a web site that tracks and displays links to changed weblogs and news-oriented web sites. To get your Drupal site listed, weblogs.com must be informed about your site's updates. This is the job of the ping module and when installed, the administrator doesn't have to do anything to participate in the %weblogs system. The ping module automatically notifies weblogs.com when your site is updated. To do so, Drupal implements the %weblogs-XML.
"; $output .= "%weblogs-RSS, a web site that tracks and displays links to recently changed RSS feeds in XML format. To get your Drupal site listed, %weblogs-RSS must be informed about updates to your RSS feed. This is the job of the ping module and when installed, the administrator doesn't have to do anything to participate in the %weblogs-RSS-changes system. The ping module automatically notifies %weblogs-RSS when your site is updated.
"; diff --git a/modules/poll.module b/modules/poll.module index ccfa3011bf38b3ce657f4affde87869ffd8a33e5..72deda17e16dbf371dafd6e82b9128f950d62992 100644 --- a/modules/poll.module +++ b/modules/poll.module @@ -137,12 +137,12 @@ function poll_form(&$node, &$help, &$error) { return $output; } -function poll_help($section = "admin/poll/help") { +function poll_help($section = "admin/help#poll") { $output = ""; switch ($section) { - case 'admin/poll/help': + case 'admin/help#poll': $output .= "Users with the correct %permissions can create and/or vote on polls.
"; $output .= "Users with the correct %permissions can create and/or vote on polls.
"; $output .= "The search page allows you to search the web site's content. You can specify multiple words, and they will all be searched for. You can also use wildcards, so 'walk*' will match 'walk', 'walking', 'walker', 'walkable' and so on. Furthermore, searches are not case sensitive so searching for 'walk', 'Walk' or 'WALK' will yield exactly the same results.
"; $output .= "Words excluded from the search"; diff --git a/modules/search/search.module b/modules/search/search.module index 6f9e68b8d53a3604942b2f9ab6cdc54a3322841c..bc2cded6fff2fe64531b0fe648f43313d156638b 100644 --- a/modules/search/search.module +++ b/modules/search/search.module @@ -1,12 +1,11 @@ Search guidelines"; $output .= "The search page allows you to search the web site's content. You can specify multiple words, and they will all be searched for. You can also use wildcards, so 'walk*' will match 'walk', 'walking', 'walker', 'walkable' and so on. Furthermore, searches are not case sensitive so searching for 'walk', 'Walk' or 'WALK' will yield exactly the same results.
"; $output .= "Words excluded from the search"; diff --git a/modules/statistics.module b/modules/statistics.module index 446b91f596e0badeab383136dd9f87d0f3baa173..082861578962b9c589a198fdbcdb0c5546cc08ed 100644 --- a/modules/statistics.module +++ b/modules/statistics.module @@ -106,20 +106,20 @@ function statistics_link($type, $node = 0, $main = 0) { if ($type == "system") { if ((user_access("administer statistics module") || (user_access("administer statistics")))) { - menu("admin/statistics", t("statistics"), "statistics_admin", statistics_help("admin/statistics"), 6); - menu("admin/statistics/referrers", t("referrer log"), "statistics_admin", statistics_help("admin/statistics/referrers")); - menu("admin/statistics/referrers/internal", t("internal referrers only"), "statistics_admin", statistics_help("admin/statistics/referrers/internal")); - menu("admin/statistics/referrers/external", t("external referrers only"), "statistics_admin", statistics_help("admin/statistics/referrers/external")); - menu("admin/statistics/log", t("access log"), "statistics_admin", statistics_help("admin/statistics/log")); - menu("admin/statistics/log/node", t("track node"), "statistics_admin", statistics_help("admin/statistics/log/node"), 0, 1); //hidden - menu("admin/statistics/log/user", t("track user"), "statistics_admin", statistics_help("admin/statistics/log/user"), 0, 1); //hidden - menu("admin/statistics/log/host", t("track host"), "statistics_admin", statistics_help("admin/statistics/log/host"), 0, 1); //hidden - menu("admin/statistics/top nodes page", t("configure 'top nodes' page"), "statistics_admin", statistics_help("admin/statistics/top nodes page"), 5); - menu("admin/statistics/help", t("help"), "statistics_help", NULL, 9); + menu("admin/statistics", t("statistics"), "statistics_admin", 6); + menu("admin/statistics/referrers", t("referrer log"), "statistics_admin"); + menu("admin/statistics/referrers/internal", t("internal referrers only"), "statistics_admin"); + menu("admin/statistics/referrers/external", t("external referrers only"), "statistics_admin"); + menu("admin/statistics/log", t("access log"), "statistics_admin"); + menu("admin/statistics/log/node", t("track node"), "statistics_admin", 0, 1); //hidden + menu("admin/statistics/log/user", t("track user"), "statistics_admin", 0, 1); //hidden + menu("admin/statistics/log/host", t("track host"), "statistics_admin", 0, 1); //hidden + menu("admin/statistics/top nodes page", t("configure 'top nodes' page"), "statistics_admin", 5); + menu("admin/statistics/help", t("help"), "statistics_help", 9); // block configuration: - menu("admin/system/block/top nodes block", t("configure 'top nodes' block"), "statistics_admin", statistics_help("admin/system/block/top nodes/block"), 5); - menu("admin/system/block/whos online block", t("configure 'who is online' block"), "statistics_admin", statistics_help("admin/system/block/whos online block"), 5); + menu("admin/system/block/top nodes block", t("configure 'top nodes' block"), "statistics_admin", 5); + menu("admin/system/block/whos online block", t("configure 'who is online' block"), "statistics_admin", 5); } } @@ -127,12 +127,11 @@ function statistics_link($type, $node = 0, $main = 0) { } -function statistics_help($section = "admin/statistics/help") { +function statistics_help($section = "admin/help#statistics") { $output = ""; switch ($section) { - case 'admin/help': - case 'admin/statistics/help': + case 'admin/help#statistics': $output .= "The statistics.module keeps track of numerous statistics for your site but be warned, statistical collection does cause a little overhead, thus everything comes disabled by default.
"; $output .= "
The module counts how many times, and from where -- using HTTP referrer -- each of your nodes is viewed. Once we have that count the module can do the following with it:"; diff --git a/modules/statistics/statistics.module b/modules/statistics/statistics.module index 446b91f596e0badeab383136dd9f87d0f3baa173..082861578962b9c589a198fdbcdb0c5546cc08ed 100644 --- a/modules/statistics/statistics.module +++ b/modules/statistics/statistics.module @@ -106,20 +106,20 @@ function statistics_link($type, $node = 0, $main = 0) { if ($type == "system") { if ((user_access("administer statistics module") || (user_access("administer statistics")))) { - menu("admin/statistics", t("statistics"), "statistics_admin", statistics_help("admin/statistics"), 6); - menu("admin/statistics/referrers", t("referrer log"), "statistics_admin", statistics_help("admin/statistics/referrers")); - menu("admin/statistics/referrers/internal", t("internal referrers only"), "statistics_admin", statistics_help("admin/statistics/referrers/internal")); - menu("admin/statistics/referrers/external", t("external referrers only"), "statistics_admin", statistics_help("admin/statistics/referrers/external")); - menu("admin/statistics/log", t("access log"), "statistics_admin", statistics_help("admin/statistics/log")); - menu("admin/statistics/log/node", t("track node"), "statistics_admin", statistics_help("admin/statistics/log/node"), 0, 1); //hidden - menu("admin/statistics/log/user", t("track user"), "statistics_admin", statistics_help("admin/statistics/log/user"), 0, 1); //hidden - menu("admin/statistics/log/host", t("track host"), "statistics_admin", statistics_help("admin/statistics/log/host"), 0, 1); //hidden - menu("admin/statistics/top nodes page", t("configure 'top nodes' page"), "statistics_admin", statistics_help("admin/statistics/top nodes page"), 5); - menu("admin/statistics/help", t("help"), "statistics_help", NULL, 9); + menu("admin/statistics", t("statistics"), "statistics_admin", 6); + menu("admin/statistics/referrers", t("referrer log"), "statistics_admin"); + menu("admin/statistics/referrers/internal", t("internal referrers only"), "statistics_admin"); + menu("admin/statistics/referrers/external", t("external referrers only"), "statistics_admin"); + menu("admin/statistics/log", t("access log"), "statistics_admin"); + menu("admin/statistics/log/node", t("track node"), "statistics_admin", 0, 1); //hidden + menu("admin/statistics/log/user", t("track user"), "statistics_admin", 0, 1); //hidden + menu("admin/statistics/log/host", t("track host"), "statistics_admin", 0, 1); //hidden + menu("admin/statistics/top nodes page", t("configure 'top nodes' page"), "statistics_admin", 5); + menu("admin/statistics/help", t("help"), "statistics_help", 9); // block configuration: - menu("admin/system/block/top nodes block", t("configure 'top nodes' block"), "statistics_admin", statistics_help("admin/system/block/top nodes/block"), 5); - menu("admin/system/block/whos online block", t("configure 'who is online' block"), "statistics_admin", statistics_help("admin/system/block/whos online block"), 5); + menu("admin/system/block/top nodes block", t("configure 'top nodes' block"), "statistics_admin", 5); + menu("admin/system/block/whos online block", t("configure 'who is online' block"), "statistics_admin", 5); } } @@ -127,12 +127,11 @@ function statistics_link($type, $node = 0, $main = 0) { } -function statistics_help($section = "admin/statistics/help") { +function statistics_help($section = "admin/help#statistics") { $output = ""; switch ($section) { - case 'admin/help': - case 'admin/statistics/help': + case 'admin/help#statistics': $output .= "
The statistics.module keeps track of numerous statistics for your site but be warned, statistical collection does cause a little overhead, thus everything comes disabled by default.
"; $output .= "
The module counts how many times, and from where -- using HTTP referrer -- each of your nodes is viewed. Once we have that count the module can do the following with it:"; diff --git a/modules/story.module b/modules/story.module index f7e1c4bfcea78b85351cdeb155bb9cabb0b27df9..7429b0a3007677908a0609de550abfababc53df5 100644 --- a/modules/story.module +++ b/modules/story.module @@ -1,17 +1,17 @@ submit -> moderate -> post to the main page -> comments. Below you may fix a minimum word count for stories and also write some submission or content guidelines for users wanting to post a story."); break; - case "admin/story/help": + case 'admin/help#story': $output = "
The story module lets your users submit articles for consideration by the rest of the community, who can vote on them if moderation is enabled. Stories usually follow a publishing flow of submit -> moderate -> post to the main page -> comments. Administrators are able to shortcut this flow as desired.
"; $output .= "In %story-config you can set up an introductory text for story authors, and a floor on the number of words which may be included in a story. This is designed to help discourage the submission of trivially short stories."; $output = t($output, array("%story-config" => l(t("site configuration » modules » story"), "admin/system/modules/story"))); @@ -53,7 +53,7 @@ function story_link($type) { if ($type == "system") { if (user_access("create stories")) { - menu("node/add/story", t("story"), "story_page", NULL, 0); + menu("node/add/story", t("story"), "story_page", 0); } } diff --git a/modules/story/story.module b/modules/story/story.module index f7e1c4bfcea78b85351cdeb155bb9cabb0b27df9..7429b0a3007677908a0609de550abfababc53df5 100644 --- a/modules/story/story.module +++ b/modules/story/story.module @@ -1,17 +1,17 @@ submit -> moderate -> post to the main page -> comments. Below you may fix a minimum word count for stories and also write some submission or content guidelines for users wanting to post a story."); break; - case "admin/story/help": + case 'admin/help#story': $output = "The story module lets your users submit articles for consideration by the rest of the community, who can vote on them if moderation is enabled. Stories usually follow a publishing flow of submit -> moderate -> post to the main page -> comments. Administrators are able to shortcut this flow as desired.
"; $output .= "In %story-config you can set up an introductory text for story authors, and a floor on the number of words which may be included in a story. This is designed to help discourage the submission of trivially short stories."; $output = t($output, array("%story-config" => l(t("site configuration » modules » story"), "admin/system/modules/story"))); @@ -53,7 +53,7 @@ function story_link($type) { if ($type == "system") { if (user_access("create stories")) { - menu("node/add/story", t("story"), "story_page", NULL, 0); + menu("node/add/story", t("story"), "story_page", 0); } } diff --git a/modules/system.module b/modules/system.module index 11680ee198fa58506e5609d3db7301d425417199..cc0860468de3c242ab82490c0dfcced65a525a34 100644 --- a/modules/system.module +++ b/modules/system.module @@ -1,24 +1,25 @@ Drupal comes with system-wide defaults but the setting-module provides control over many Drupal preferences, behaviours including visual and operational settings."; $output .= "Taxonomy is the study of classification. Drupal's taxonomy module allows you to define categories which are used to classify content. The module supports hierarchical classification and association between terms, allowing for truly flexible information retrieval and classification. For more details about %classification-types and insight into the development of the taxonomy.module, see this %drupal-dis.
"; $output .= "Notes
Taxonomy is the study of classification. Drupal's taxonomy module allows you to define categories which are used to classify content. The module supports hierarchical classification and association between terms, allowing for truly flexible information retrieval and classification. For more details about %classification-types and insight into the development of the taxonomy.module, see this %drupal-dis.
"; $output .= "Notes
This Drupal module allows you to enable and configure the auto-throttle congestion control mechanism offered by the %stats-mod. The auto-throttle mechanism allows your site to automatically adapt to different server levels.
"; $output .= "This module also adds a block that displays the current status of the throttle. You must have \"%throttle-block\" privileges to view the block. As a general rule of thumb, only site administrators should be granted access to this block.
"; $output .= "The auto-throttle mechanism performs an extra database query in order to determine what the current throttle level should be. Fortunately the throttle can be tuned so these database queries only occur on a fraction of all pages geenrated by your site, reducing the overhead to an insignificant amount. Additionally, when the top-most throttle level is reached, all throttle queries are suspended for a configurable period of time. More detail follows.
"; diff --git a/modules/throttle/throttle.module b/modules/throttle/throttle.module index dd11a0dfbd7a2a6784ea08977adaa784299af48e..ebc44dc18d01eacc08815ae8904f25b067e3f50b 100644 --- a/modules/throttle/throttle.module +++ b/modules/throttle/throttle.module @@ -9,7 +9,7 @@ function throttle_perm() { return array("access throttle box"); } -function throttle_help($section = "admin/throttle/help") { +function throttle_help($section = "admin/help#throttle") { switch ($section) { case "admin/system/modules#description": @@ -17,7 +17,7 @@ function throttle_help($section = "admin/throttle/help") { break; case "admin/system/modules/throttle": return t("If your site gets popular, or comes under a \"Denial of Service\" (DOS) attack, your hardware might become overwhelmed. These settings allow you to \"slow down\" the access to your site. To use throttle you need to have the %access enabled. For Drupal to preform throttling it needs to do an extra database query. This extra query happens on page displays. Auto-throttle probability limiter tells Drupal to do this extra DB query once every \"x\" page displays, where \"x\" is the percentage. So if it is set to 10%, the default, then for every 100 web pages it displays, it will preform the extra query ten time. ", array("%access" => l(t("access log"), "admin/system/modules/statistics"))); - case "admin/throttle/help": + case "admin/help#throttle": $output .= "This Drupal module allows you to enable and configure the auto-throttle congestion control mechanism offered by the %stats-mod. The auto-throttle mechanism allows your site to automatically adapt to different server levels.
"; $output .= "This module also adds a block that displays the current status of the throttle. You must have \"%throttle-block\" privileges to view the block. As a general rule of thumb, only site administrators should be granted access to this block.
"; $output .= "The auto-throttle mechanism performs an extra database query in order to determine what the current throttle level should be. Fortunately the throttle can be tuned so these database queries only occur on a fraction of all pages geenrated by your site, reducing the overhead to an insignificant amount. Additionally, when the top-most throttle level is reached, all throttle queries are suspended for a configurable period of time. More detail follows.
"; diff --git a/modules/tracker.module b/modules/tracker.module index d40079cb3d59bf8f1eadaa6d15e27a7f57aeeed2..5b5a6a59c1946284484d5a72e77063f245a24630 100644 --- a/modules/tracker.module +++ b/modules/tracker.module @@ -1,11 +1,11 @@ The tracker module is a handy module for displaying the most recent posts. By following the view recent posts link in the user block, a user may quickly review all recent postings."); break; case 'admin/system/modules#description': @@ -22,7 +22,7 @@ function tracker_link($type) { if ($type == "system") { if (user_access("access content")) { - menu("tracker", t("recent posts"), "tracker_page", NULL, 1); + menu("tracker", t("recent posts"), "tracker_page", 1); } } diff --git a/modules/tracker/tracker.module b/modules/tracker/tracker.module index d40079cb3d59bf8f1eadaa6d15e27a7f57aeeed2..5b5a6a59c1946284484d5a72e77063f245a24630 100644 --- a/modules/tracker/tracker.module +++ b/modules/tracker/tracker.module @@ -1,11 +1,11 @@ The tracker module is a handy module for displaying the most recent posts. By following the view recent posts link in the user block, a user may quickly review all recent postings."); break; case 'admin/system/modules#description': @@ -22,7 +22,7 @@ function tracker_link($type) { if ($type == "system") { if (user_access("access content")) { - menu("tracker", t("recent posts"), "tracker_page", NULL, 1); + menu("tracker", t("recent posts"), "tracker_page", 1); } } diff --git a/modules/user.module b/modules/user.module index 4c8daaa129d6184a58ac57019664267e7b2b4feb..4d0d5a21b231eb266d019a3a0d0a245e34f8d888 100644 --- a/modules/user.module +++ b/modules/user.module @@ -496,26 +496,26 @@ function user_link($type) { if ($type == "system") { global $user; if ($user->uid) { - menu("user/edit", t("my account"), "user_page", NULL, 8); - menu("user/logout", t("log out"), "user_page", NULL, 10); + menu("user/edit", t("my account"), "user_page", 8); + menu("user/logout", t("log out"), "user_page", 10); } if (user_access("administer users")) { - menu("admin/user", t("accounts"), "user_admin", user_help("admin/user"), 2); - menu("admin/user/create", t("new user"), "user_admin", user_help("admin/user/create"), 1); - menu("admin/user/account", t("users"), "user_admin", user_help("admin/user/account"), 2); - menu("admin/user/access", t("access rules"), NULL, user_help("admin/user/access"), 3); - menu("admin/user/access/mail", t("by e-mail"), "user_admin", user_help("admin/user/access/mail")); - menu("admin/user/access/user", t("by name"), "user_admin", user_help("admin/user/access/user")); - menu("admin/user/role", t("roles"), "user_admin", user_help("admin/user/role"), 4); - menu("admin/user/permission", t("permissions"), "user_admin", user_help("admin/user/permission"), 5); - menu("admin/user/search", t("search"), "user_admin", user_help("admin/user/search"), 8); - menu("admin/user/help", t("help"), "user_help", NULL, 9); - menu("admin/user/edit", t("edit user account"), "user_admin", NULL, 0, 1); // hidden menu - menu("admin/user/account/1", t("blocked users"), "user_admin", user_help("admin/user/account/1"), 3); + menu("admin/user", t("accounts"), "user_admin", 2); + menu("admin/user/create", t("new user"), "user_admin", 1); + menu("admin/user/account", t("users"), "user_admin", 2); + menu("admin/user/access", t("access rules"), NULL, 3); + menu("admin/user/access/mail", t("by e-mail"), "user_admin"); + menu("admin/user/access/user", t("by name"), "user_admin"); + menu("admin/user/role", t("roles"), "user_admin", 4); + menu("admin/user/permission", t("permissions"), "user_admin", 5); + menu("admin/user/search", t("search"), "user_admin", 8); + menu("admin/user/help", t("help"), "user_help", 9); + menu("admin/user/edit", t("edit user account"), "user_admin", 0, 1); // hidden menu + menu("admin/user/account/1", t("blocked users"), "user_admin", 3); $i = 2; foreach (user_roles(1) as $key => $value) { - menu("admin/user/account/$i", t("users with role '%role'", array("%role" => $value)), "user_admin", user_help("admin/user/account/".$i++), 4); + menu("admin/user/account/$i", t("users with role '%role'", array("%role" => $value)), "user_admin", 4); } } } @@ -1195,7 +1195,7 @@ function user_page() { break; case "help": theme("header"); - theme("box", t("Distributed authentication"), user_help("user/help")); + theme("box", t("Distributed authentication"), user_help("user/help#user")); theme("footer"); break; default: @@ -1692,13 +1692,14 @@ function user_admin() { } } // the following functions comprise help for admins and developers -function user_help($section = "admin/user/help") { +function user_help($section = "admin/help#user") { $output = ""; switch ($section) { case 'admin/user': $output .= 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.Drupal offers a powerful access system that allows users to register, login, logout, maintain user profiles, etc. By using \"%user-role\" you can setup fine grained %user-permission allowing each role to do only what you want them to. Each user is assigned to a role. By default there are two roles \"anonymous\" - a user who has not logged in, and \"authorized\" a user who has signed up and who has been authorized. As anonymous users, participants suffer numerous disadvantages, for example they cannot sign their names to nodes, and their moderated posts beginning at a lower score.
"; diff --git a/modules/user/user.module b/modules/user/user.module index 4c8daaa129d6184a58ac57019664267e7b2b4feb..4d0d5a21b231eb266d019a3a0d0a245e34f8d888 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -496,26 +496,26 @@ function user_link($type) { if ($type == "system") { global $user; if ($user->uid) { - menu("user/edit", t("my account"), "user_page", NULL, 8); - menu("user/logout", t("log out"), "user_page", NULL, 10); + menu("user/edit", t("my account"), "user_page", 8); + menu("user/logout", t("log out"), "user_page", 10); } if (user_access("administer users")) { - menu("admin/user", t("accounts"), "user_admin", user_help("admin/user"), 2); - menu("admin/user/create", t("new user"), "user_admin", user_help("admin/user/create"), 1); - menu("admin/user/account", t("users"), "user_admin", user_help("admin/user/account"), 2); - menu("admin/user/access", t("access rules"), NULL, user_help("admin/user/access"), 3); - menu("admin/user/access/mail", t("by e-mail"), "user_admin", user_help("admin/user/access/mail")); - menu("admin/user/access/user", t("by name"), "user_admin", user_help("admin/user/access/user")); - menu("admin/user/role", t("roles"), "user_admin", user_help("admin/user/role"), 4); - menu("admin/user/permission", t("permissions"), "user_admin", user_help("admin/user/permission"), 5); - menu("admin/user/search", t("search"), "user_admin", user_help("admin/user/search"), 8); - menu("admin/user/help", t("help"), "user_help", NULL, 9); - menu("admin/user/edit", t("edit user account"), "user_admin", NULL, 0, 1); // hidden menu - menu("admin/user/account/1", t("blocked users"), "user_admin", user_help("admin/user/account/1"), 3); + menu("admin/user", t("accounts"), "user_admin", 2); + menu("admin/user/create", t("new user"), "user_admin", 1); + menu("admin/user/account", t("users"), "user_admin", 2); + menu("admin/user/access", t("access rules"), NULL, 3); + menu("admin/user/access/mail", t("by e-mail"), "user_admin"); + menu("admin/user/access/user", t("by name"), "user_admin"); + menu("admin/user/role", t("roles"), "user_admin", 4); + menu("admin/user/permission", t("permissions"), "user_admin", 5); + menu("admin/user/search", t("search"), "user_admin", 8); + menu("admin/user/help", t("help"), "user_help", 9); + menu("admin/user/edit", t("edit user account"), "user_admin", 0, 1); // hidden menu + menu("admin/user/account/1", t("blocked users"), "user_admin", 3); $i = 2; foreach (user_roles(1) as $key => $value) { - menu("admin/user/account/$i", t("users with role '%role'", array("%role" => $value)), "user_admin", user_help("admin/user/account/".$i++), 4); + menu("admin/user/account/$i", t("users with role '%role'", array("%role" => $value)), "user_admin", 4); } } } @@ -1195,7 +1195,7 @@ function user_page() { break; case "help": theme("header"); - theme("box", t("Distributed authentication"), user_help("user/help")); + theme("box", t("Distributed authentication"), user_help("user/help#user")); theme("footer"); break; default: @@ -1692,13 +1692,14 @@ function user_admin() { } } // the following functions comprise help for admins and developers -function user_help($section = "admin/user/help") { +function user_help($section = "admin/help#user") { $output = ""; switch ($section) { case 'admin/user': $output .= 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.Drupal offers a powerful access system that allows users to register, login, logout, maintain user profiles, etc. By using \"%user-role\" you can setup fine grained %user-permission allowing each role to do only what you want them to. Each user is assigned to a role. By default there are two roles \"anonymous\" - a user who has not logged in, and \"authorized\" a user who has signed up and who has been authorized. As anonymous users, participants suffer numerous disadvantages, for example they cannot sign their names to nodes, and their moderated posts beginning at a lower score.
"; diff --git a/modules/watchdog.module b/modules/watchdog.module index 45971a7cab28ce57f97eeb8a2fb959b4ab6bc4de..86207a0ec1f5bb80c76205bd0cdfa91becb07140 100644 --- a/modules/watchdog.module +++ b/modules/watchdog.module @@ -1,12 +1,11 @@ Watchdog module monitors your web site, capturing system events in a log to be reviewed by an authorized individual at a later time. The Watchdog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. It is vital to %watchdog on a regular basis as it is often the only way to tell what is going on."; $output .= "To ease administration, the watchdog will automatically discard old log entries, %log-entry. Needs \"cron.php\" to discard the entries.
"; $output = t($output, array("%watchdog" => l(t("check the Watchdog report"), "admin/watchdog"), "%log-entry" => l(t("as configured"), "admin/system/modules/watchdog"))); @@ -50,14 +49,14 @@ function watchdog_perm() { function watchdog_link($type) { if ($type == "system") { if (user_access("administer watchdog")) { - menu("admin/watchdog", t("messages"), "watchdog_admin", watchdog_help("admin/watchdog"), 6); - menu("admin/watchdog/user", t("user"), "watchdog_admin", watchdog_help("admin/watchdog/user")); - menu("admin/watchdog/regular", t("regular"), "watchdog_admin", watchdog_help("admin/watchdog/regular")); - menu("admin/watchdog/special", t("special"), "watchdog_admin", watchdog_help("admin/watchdog/special")); - menu("admin/watchdog/warning", t("warning"), "watchdog_admin", watchdog_help("admin/watchdog/warning")); - menu("admin/watchdog/error", t("error"), "watchdog_admin", watchdog_help("admin/watchdog/error")); - menu("admin/watchdog/httpd", t("httpd"), "watchdog_admin", watchdog_help("admin/watchdog/httpd")); - menu("admin/watchdog/view", t("view details"), "watchdog_admin", NULL, 0, 1); // hidden menu + menu("admin/watchdog", t("messages"), "watchdog_admin", 6); + menu("admin/watchdog/user", t("user"), "watchdog_admin"); + menu("admin/watchdog/regular", t("regular"), "watchdog_admin"); + menu("admin/watchdog/special", t("special"), "watchdog_admin"); + menu("admin/watchdog/warning", t("warning"), "watchdog_admin"); + menu("admin/watchdog/error", t("error"), "watchdog_admin"); + menu("admin/watchdog/httpd", t("httpd"), "watchdog_admin"); + menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, 1); // hidden menu } } } diff --git a/modules/watchdog/watchdog.module b/modules/watchdog/watchdog.module index 45971a7cab28ce57f97eeb8a2fb959b4ab6bc4de..86207a0ec1f5bb80c76205bd0cdfa91becb07140 100644 --- a/modules/watchdog/watchdog.module +++ b/modules/watchdog/watchdog.module @@ -1,12 +1,11 @@ Watchdog module monitors your web site, capturing system events in a log to be reviewed by an authorized individual at a later time. The Watchdog log is simply a list of recorded events containing usage data, performance data, errors, warnings and operational information. It is vital to %watchdog on a regular basis as it is often the only way to tell what is going on."; $output .= "To ease administration, the watchdog will automatically discard old log entries, %log-entry. Needs \"cron.php\" to discard the entries.
"; $output = t($output, array("%watchdog" => l(t("check the Watchdog report"), "admin/watchdog"), "%log-entry" => l(t("as configured"), "admin/system/modules/watchdog"))); @@ -50,14 +49,14 @@ function watchdog_perm() { function watchdog_link($type) { if ($type == "system") { if (user_access("administer watchdog")) { - menu("admin/watchdog", t("messages"), "watchdog_admin", watchdog_help("admin/watchdog"), 6); - menu("admin/watchdog/user", t("user"), "watchdog_admin", watchdog_help("admin/watchdog/user")); - menu("admin/watchdog/regular", t("regular"), "watchdog_admin", watchdog_help("admin/watchdog/regular")); - menu("admin/watchdog/special", t("special"), "watchdog_admin", watchdog_help("admin/watchdog/special")); - menu("admin/watchdog/warning", t("warning"), "watchdog_admin", watchdog_help("admin/watchdog/warning")); - menu("admin/watchdog/error", t("error"), "watchdog_admin", watchdog_help("admin/watchdog/error")); - menu("admin/watchdog/httpd", t("httpd"), "watchdog_admin", watchdog_help("admin/watchdog/httpd")); - menu("admin/watchdog/view", t("view details"), "watchdog_admin", NULL, 0, 1); // hidden menu + menu("admin/watchdog", t("messages"), "watchdog_admin", 6); + menu("admin/watchdog/user", t("user"), "watchdog_admin"); + menu("admin/watchdog/regular", t("regular"), "watchdog_admin"); + menu("admin/watchdog/special", t("special"), "watchdog_admin"); + menu("admin/watchdog/warning", t("warning"), "watchdog_admin"); + menu("admin/watchdog/error", t("error"), "watchdog_admin"); + menu("admin/watchdog/httpd", t("httpd"), "watchdog_admin"); + menu("admin/watchdog/view", t("view details"), "watchdog_admin", 0, 1); // hidden menu } } }