summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/admin.module21
-rw-r--r--modules/book.module8
-rw-r--r--modules/book/book.module8
-rw-r--r--modules/user.module29
-rw-r--r--modules/user/user.module29
5 files changed, 40 insertions, 55 deletions
diff --git a/modules/admin.module b/modules/admin.module
index 5057c1f60..3bba68456 100644
--- a/modules/admin.module
+++ b/modules/admin.module
@@ -37,26 +37,13 @@ function admin_system($field){
function admin_link($type) {
if ($type == "system" && user_access("access administration pages")) {
- menu("admin", t("administer %a", array("%a" => variable_get("site_name", "drupal"))) , NULL, NULL, 9);
- menu("admin/overview", "sitemap", "overview_callback", admin_help("admin/overview"), 8);
+ menu("admin", t("administer"), NULL, NULL, 9);
}
}
-function overview_callback() {
- return menu_map();
-}
-
-function admin_admin() {
- return menu_map();
-}
-
-
function admin_page() {
if (user_access("access administration pages")) {
- if (!isset($GLOBALS["_gmenu"])) {
- menu_build("system");
- }
- if ($help = menu_help()) {
+ if ($help = menu_get_active_help()) {
$contents = "<small>$help</small><hr />";
}
if (arg(1)) {
@@ -67,9 +54,9 @@ function admin_page() {
$title = t("System messages");
}
- $breadcrumb = menu_path();
+ $breadcrumb = menu_active_breadcrumb();
array_pop($breadcrumb);
- $title = menu_title();
+ $title = menu_get_active_title();
theme("header");
theme("breadcrumb", $breadcrumb);
diff --git a/modules/book.module b/modules/book.module
index 5ac34dc67..eb9fd971c 100644
--- a/modules/book.module
+++ b/modules/book.module
@@ -79,10 +79,10 @@ function book_link($type, $node = 0, $main = 0) {
if ($type == "system") {
if (user_access("maintain books")) {
- 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);
+ menu("node/add/book", t("book page"), NULL, 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);
$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)) {
diff --git a/modules/book/book.module b/modules/book/book.module
index 5ac34dc67..eb9fd971c 100644
--- a/modules/book/book.module
+++ b/modules/book/book.module
@@ -79,10 +79,10 @@ function book_link($type, $node = 0, $main = 0) {
if ($type == "system") {
if (user_access("maintain books")) {
- 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);
+ menu("node/add/book", t("book page"), NULL, 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);
$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)) {
diff --git a/modules/user.module b/modules/user.module
index 6bead895d..5808a128b 100644
--- a/modules/user.module
+++ b/modules/user.module
@@ -427,7 +427,6 @@ function user_block($op = "list", $delta = 0) {
$block["content"] = "<div class=\"user-login-link\">$output</div>";
}
- menu_build("system");
$block["content"] .= "<div id=\"menu\">". menu_tree()."</div>";
return $block;
break;
@@ -467,22 +466,22 @@ function user_link($type) {
if ($type == "system") {
global $user;
if ($user->uid) {
- menu("user/edit", t("edit account"), NULL, NULL, 8);
- menu("user/logout", t("logout"), NULL, NULL, 10);
+ menu("user/edit", t("edit my account"), NULL, NULL, 8);
+ menu("user/logout", t("log out"), NULL, NULL, 10);
}
if (user_access("administer users")) {
- menu("admin/user", "user management", "user_admin", user_help("admin/user"), 2);
- menu("admin/user/create", "create new account", "user_admin", user_help("admin/user/create"), 1);
- menu("admin/user/account", "view user accounts", "user_admin", user_help("admin/user/account"), 2);
- menu("admin/user/access", "access rules", NULL, user_help("admin/user/access"), 3);
- menu("admin/user/access/mail", "e-mail rules", "user_admin", user_help("admin/user/access/mail"));
- menu("admin/user/access/user", "username rules", "user_admin", user_help("admin/user/access/user"));
- menu("admin/user/role", "user roles", "user_admin", user_help("admin/user/role"), 4);
- menu("admin/user/permission", "user permissions", "user_admin", user_help("admin/user/permission"), 5);
- menu("admin/user/search", "search accounts", "user_admin", user_help("admin/user/search"), 8);
- menu("admin/user/help", "help", "user_help", NULL, 9);
- menu("admin/user/edit", "edit user account", "user_admin", NULL, 0, 1); // hidden menu
- menu("admin/user/account/1", "blocked users", "user_admin", user_help("admin/user/account/1"), 3);
+ menu("admin/user", "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);
$i = 2;
foreach (user_roles(1) as $key => $value) {
diff --git a/modules/user/user.module b/modules/user/user.module
index 6bead895d..5808a128b 100644
--- a/modules/user/user.module
+++ b/modules/user/user.module
@@ -427,7 +427,6 @@ function user_block($op = "list", $delta = 0) {
$block["content"] = "<div class=\"user-login-link\">$output</div>";
}
- menu_build("system");
$block["content"] .= "<div id=\"menu\">". menu_tree()."</div>";
return $block;
break;
@@ -467,22 +466,22 @@ function user_link($type) {
if ($type == "system") {
global $user;
if ($user->uid) {
- menu("user/edit", t("edit account"), NULL, NULL, 8);
- menu("user/logout", t("logout"), NULL, NULL, 10);
+ menu("user/edit", t("edit my account"), NULL, NULL, 8);
+ menu("user/logout", t("log out"), NULL, NULL, 10);
}
if (user_access("administer users")) {
- menu("admin/user", "user management", "user_admin", user_help("admin/user"), 2);
- menu("admin/user/create", "create new account", "user_admin", user_help("admin/user/create"), 1);
- menu("admin/user/account", "view user accounts", "user_admin", user_help("admin/user/account"), 2);
- menu("admin/user/access", "access rules", NULL, user_help("admin/user/access"), 3);
- menu("admin/user/access/mail", "e-mail rules", "user_admin", user_help("admin/user/access/mail"));
- menu("admin/user/access/user", "username rules", "user_admin", user_help("admin/user/access/user"));
- menu("admin/user/role", "user roles", "user_admin", user_help("admin/user/role"), 4);
- menu("admin/user/permission", "user permissions", "user_admin", user_help("admin/user/permission"), 5);
- menu("admin/user/search", "search accounts", "user_admin", user_help("admin/user/search"), 8);
- menu("admin/user/help", "help", "user_help", NULL, 9);
- menu("admin/user/edit", "edit user account", "user_admin", NULL, 0, 1); // hidden menu
- menu("admin/user/account/1", "blocked users", "user_admin", user_help("admin/user/account/1"), 3);
+ menu("admin/user", "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);
$i = 2;
foreach (user_roles(1) as $key => $value) {
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-07 12:28:47 +0000