diff options
| -rw-r--r-- | modules/node.module | 12 | ||||
| -rw-r--r-- | modules/node/node.module | 12 | ||||
| -rw-r--r-- | modules/user.module | 5 | ||||
| -rw-r--r-- | modules/user/user.module | 5 |
4 files changed, 12 insertions, 22 deletions
diff --git a/modules/node.module b/modules/node.module index 63e1ca02a..f718246a0 100644 --- a/modules/node.module +++ b/modules/node.module @@ -639,16 +639,12 @@ function node_menu($may_cache) { 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/node/overview', 'title' => t('list'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/node/configure', 'title' => t('configure'), + $items[] = array('path' => 'admin/settings/node', 'title' => t('posts'), 'callback' => 'node_configure', - 'access' => user_access('administer nodes'), - 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'admin/node/configure/settings', 'title' => t('settings'), - 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/node/configure/types', 'title' => t('content types'), + 'access' => user_access('administer nodes')); + $items[] = array('path' => 'admin/settings/content-types', 'title' => t('content types'), 'callback' => 'node_types_configure', - 'access' => user_access('administer nodes'), - 'type' => MENU_LOCAL_TASK); + 'access' => user_access('administer nodes')); if (module_exist('search')) { $items[] = array('path' => 'admin/node/search', 'title' => t('search'), 'callback' => 'node_admin', diff --git a/modules/node/node.module b/modules/node/node.module index 63e1ca02a..f718246a0 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -639,16 +639,12 @@ function node_menu($may_cache) { 'type' => MENU_CALLBACK); $items[] = array('path' => 'admin/node/overview', 'title' => t('list'), 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/node/configure', 'title' => t('configure'), + $items[] = array('path' => 'admin/settings/node', 'title' => t('posts'), 'callback' => 'node_configure', - 'access' => user_access('administer nodes'), - 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'admin/node/configure/settings', 'title' => t('settings'), - 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10); - $items[] = array('path' => 'admin/node/configure/types', 'title' => t('content types'), + 'access' => user_access('administer nodes')); + $items[] = array('path' => 'admin/settings/content-types', 'title' => t('content types'), 'callback' => 'node_types_configure', - 'access' => user_access('administer nodes'), - 'type' => MENU_LOCAL_TASK); + 'access' => user_access('administer nodes')); if (module_exist('search')) { $items[] = array('path' => 'admin/node/search', 'title' => t('search'), 'callback' => 'node_admin', diff --git a/modules/user.module b/modules/user.module index e8c118fbd..8ad3b82d8 100644 --- a/modules/user.module +++ b/modules/user.module @@ -671,9 +671,8 @@ function user_menu($may_cache) { $items[] = array('path' => 'admin/user/create', 'title' => t('add user'), 'callback' => 'user_admin', 'access' => $admin_access, 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'admin/user/configure', 'title' => t('configure'), - 'callback' => 'user_configure', 'access' => $admin_access, - 'type' => MENU_LOCAL_TASK); + $items[] = array('path' => 'admin/settings/user', 'title' => t('users'), + 'callback' => 'user_configure', 'access' => $admin_access); $items[] = array('path' => 'admin/access', 'title' => t('access control'), 'callback' => 'user_admin_perm', 'access' => $admin_access); $items[] = array('path' => 'admin/access/permissions', 'title' => t('permissions'), diff --git a/modules/user/user.module b/modules/user/user.module index e8c118fbd..8ad3b82d8 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -671,9 +671,8 @@ function user_menu($may_cache) { $items[] = array('path' => 'admin/user/create', 'title' => t('add user'), 'callback' => 'user_admin', 'access' => $admin_access, 'type' => MENU_LOCAL_TASK); - $items[] = array('path' => 'admin/user/configure', 'title' => t('configure'), - 'callback' => 'user_configure', 'access' => $admin_access, - 'type' => MENU_LOCAL_TASK); + $items[] = array('path' => 'admin/settings/user', 'title' => t('users'), + 'callback' => 'user_configure', 'access' => $admin_access); $items[] = array('path' => 'admin/access', 'title' => t('access control'), 'callback' => 'user_admin_perm', 'access' => $admin_access); $items[] = array('path' => 'admin/access/permissions', 'title' => t('permissions'), |