' . t('Menus are a collection of links (menu items) used to navigate a website. The menus currently available on your site are displayed below. Select a menu from this list to manage its menu items.') . '
';
+ return '' . t('Menus are a collection of links used to navigate a website. If the Block module is enabled, each menu has a corresponding block that is managed on the blocks administration page. Select an existing menu from this list to manage its menu links.', array('@blocks' => url('admin/build/block'))) . '
';
case 'admin/build/menu/add':
return '' . t('Enter the name for your new menu. Remember to enable the newly created block in the blocks administration page.', array('@blocks' => url('admin/build/block'))) . '
';
case 'admin/build/menu-customize/%':
@@ -260,9 +260,7 @@ function menu_reset_item($item) {
* Implementation of hook_block_list().
*/
function menu_block_list() {
- $menus = menu_get_menus();
- // The Navigation menu is handled by the user module.
- unset($menus['navigation']);
+ $menus = menu_get_menus(FALSE);
$blocks = array();
foreach ($menus as $name => $title) {
@@ -279,10 +277,7 @@ function menu_block_list() {
* Implementation of hook_block_view().
*/
function menu_block_view($delta = '') {
- $menus = menu_get_menus();
- // The Navigation menu is handled by the user module.
- unset($menus['navigation']);
-
+ $menus = menu_get_menus(FALSE);
$data['subject'] = check_plain($menus[$delta]);
$data['content'] = menu_tree($delta);
return $data;
@@ -469,7 +464,7 @@ function menu_node_form_submit($form, &$
* titles as the values.
*/
function menu_get_menus($all = TRUE) {
- $system_menus = menu_list_system_menus();
+ $system_menus = array_keys(menu_list_system_menus());
$query = db_select('menu_custom');
$query->addField('menu_custom', 'menu_name', 'menu_name');
$query->addField('menu_custom', 'title', 'title');
Index: modules/node/node.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.module,v
retrieving revision 1.1031
diff -u -p -r1.1031 node.module
--- modules/node/node.module 14 Mar 2009 23:01:36 -0000 1.1031
+++ modules/node/node.module 19 Mar 2009 04:49:06 -0000
@@ -1665,6 +1665,9 @@ function _node_revision_access($node, $o
}
function _node_add_access() {
+ if (!user_access('administer content types')) {
+ return FALSE;
+ }
$types = node_get_types();
foreach ($types as $type) {
if (node_hook($type->type, 'form') && node_access('create', $type->type)) {
@@ -1733,10 +1736,11 @@ function node_menu() {
'type' => MENU_CALLBACK,
);
$items['node/add'] = array(
- 'title' => 'Create content',
+ 'title' => 'Content creation',
'page callback' => 'node_add_page',
'access callback' => '_node_add_access',
'weight' => 1,
+ 'menu_name' => 'management',
);
$items['rss.xml'] = array(
'title' => 'RSS feed',
@@ -1754,6 +1758,7 @@ function node_menu() {
'access callback' => 'node_access',
'access arguments' => array('create', $type->type),
'description' => $type->description,
+ 'menu_name' => 'create',
);
$items['admin/build/node-type/' . $type_url_str] = array(
'title' => $type->name,
Index: modules/node/node.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.pages.inc,v
retrieving revision 1.57
diff -u -p -r1.57 node.pages.inc
--- modules/node/node.pages.inc 14 Mar 2009 23:01:36 -0000 1.57
+++ modules/node/node.pages.inc 19 Mar 2009 04:49:06 -0000
@@ -17,7 +17,11 @@ function node_page_edit($node) {
}
function node_add_page() {
- $item = menu_get_item();
+ // Display menu items in the "Create" menu.
+ $item = array(
+ 'menu_name' => 'create',
+ 'mlid' => 0,
+ );
$content = system_admin_menu_block($item);
// Bypass the node/add listing if only one content type is available.
if (count($content) == 1) {
Index: modules/simpletest/tests/session.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/simpletest/tests/session.test,v
retrieving revision 1.10
diff -u -p -r1.10 session.test
--- modules/simpletest/tests/session.test 19 Jan 2009 10:46:51 -0000 1.10
+++ modules/simpletest/tests/session.test 19 Mar 2009 04:49:06 -0000
@@ -53,7 +53,7 @@ class SessionTestCase extends DrupalWebT
'pass' => $user->pass_raw
);
$this->drupalPost('user', $edit, t('Log in'));
- $this->drupalGet('node');
+ $this->drupalGet('user');
$pass = $this->assertText($user->name, t('Found name: %name', array('%name' => $user->name)), t('User login'));
$this->_logged_in = $pass;
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.18
diff -u -p -r1.18 page.tpl.php
--- modules/system/page.tpl.php 2 Mar 2009 19:23:54 -0000 1.18
+++ modules/system/page.tpl.php 19 Mar 2009 04:49:06 -0000
@@ -128,6 +128,12 @@
+
+
'main-menu', 'class' => 'links clearfix')); ?>
Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.673
diff -u -p -r1.673 system.module
--- modules/system/system.module 17 Mar 2009 15:26:29 -0000 1.673
+++ modules/system/system.module 19 Mar 2009 04:49:06 -0000
@@ -458,6 +458,7 @@ function system_menu() {
'access arguments' => array('access administration pages'),
'page callback' => 'system_main_admin_page',
'weight' => 9,
+ 'menu_name' => 'management',
);
$items['admin/compact'] = array(
'title' => 'Compact mode',
@@ -880,13 +881,19 @@ function system_user_timezone(&$edit, &$
* Implementation of hook_block_list().
*/
function system_block_list() {
- $image_path = 'misc/' . variable_get('drupal_badge_color', 'powered-blue') . '-' . variable_get('drupal_badge_size', '80x15') . '.png';
$blocks['powered-by'] = array(
'info' => t('Powered by Drupal'),
'weight' => '10',
// Not worth caching.
'cache' => BLOCK_NO_CACHE,
);
+ // System-defined menu blocks.
+ foreach (menu_list_system_menus() as $menu_name => $title) {
+ $blocks[$menu_name]['info'] = t($title);
+ // Menu blocks can't be cached because each menu item can have
+ // a custom access callback. menu.inc manages its own caching.
+ $blocks[$menu_name]['cache'] = BLOCK_NO_CACHE;
+ }
return $blocks;
}
@@ -929,13 +936,28 @@ function system_block_save($delta = '',
/**
* Implementation of hook_block_view().
*
- * Generate a block with a promotional link to Drupal.org.
+ * Generate a block with a promotional link to Drupal.org and
+ * all system menu blocks.
*/
function system_block_view($delta = '') {
- $image_path = 'misc/' . variable_get('drupal_badge_color', 'powered-blue') . '-' . variable_get('drupal_badge_size', '80x15') . '.png';
- $block['subject'] = NULL; // Don't display a title
- $block['content'] = theme('system_powered_by', $image_path);
- return $block;
+ $block = array();
+ switch ($delta) {
+ case 'powered-by':
+ $image_path = 'misc/' . variable_get('drupal_badge_color', 'powered-blue') . '-' . variable_get('drupal_badge_size', '80x15') . '.png';
+ // Don't display a title.
+ $block['subject'] = NULL;
+ $block['content'] = theme('system_powered_by', $image_path);
+ return $block;
+ default:
+ // All system menu blocks.
+ $system_menus = menu_list_system_menus();
+ if (isset($system_menus[$delta])) {
+ $block['subject'] = t($system_menus[$delta]);
+ $block['content'] = menu_tree($delta);
+ return $block;
+ }
+ break;
+ }
}
/**
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.970
diff -u -p -r1.970 user.module
--- modules/user/user.module 17 Mar 2009 02:07:42 -0000 1.970
+++ modules/user/user.module 19 Mar 2009 04:49:06 -0000
@@ -1013,11 +1013,6 @@ function user_block_list() {
// Not worth caching.
$blocks['login']['cache'] = BLOCK_NO_CACHE;
- $blocks['navigation']['info'] = t('Navigation');
- // Menu blocks can't be cached because each menu item can have
- // a custom access callback. menu.inc manages its own caching.
- $blocks['navigation']['cache'] = BLOCK_NO_CACHE;
-
$blocks['new']['info'] = t('Who\'s new');
// Too dynamic to cache.
@@ -1087,13 +1082,6 @@ function user_block_view($delta = '') {
}
return $block;
- case 'navigation':
- if ($menu = menu_tree()) {
- $block['subject'] = $user->uid ? check_plain($user->name) : t('Navigation');
- $block['content'] = $menu;
- }
- return $block;
-
case 'new':
if (user_access('access content')) {
// Retrieve a list of new users who have subsequently accessed the site successfully.
@@ -1306,6 +1294,7 @@ function user_menu() {
'access callback' => 'user_is_logged_in',
'page callback' => 'user_logout',
'weight' => 10,
+ 'menu_name' => 'user-menu',
);
// User administration pages.
@@ -1373,6 +1362,8 @@ function user_menu() {
'access callback' => 'user_view_access',
'access arguments' => array(1),
'parent' => '',
+ 'weight' => -10,
+ 'menu_name' => 'user-menu',
);
$items['user/%user/view'] = array(
@@ -1495,12 +1486,9 @@ function user_uid_optional_to_arg($arg)
}
/**
- * Menu item title callback - use the user name if it's not the current user.
+ * Menu item title callback - return the user name.
*/
function user_page_title($account) {
- if ($account->uid == $GLOBALS['user']->uid) {
- return t('My account');
- }
return $account->name;
}
Index: profiles/default/default.profile
===================================================================
RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v
retrieving revision 1.38
diff -u -p -r1.38 default.profile
--- profiles/default/default.profile 17 Mar 2009 12:41:54 -0000 1.38
+++ profiles/default/default.profile 19 Mar 2009 04:49:06 -0000
@@ -91,9 +91,11 @@ function default_profile_task_list() {
*/
function default_profile_tasks(&$task, $url) {
- // Enable 3 standard blocks.
+ // Enable 5 standard blocks.
db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', 'login', 'garland', 1, 0, 'left', '', -1);
- db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', 'navigation', 'garland', 1, 0, 'left', '', -1);
+ db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'system', 'navigation', 'garland', 1, 0, 'left', '', -1);
+ db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'system', 'create', 'garland', 1, 1, 'left', '', -1);
+ db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'system', 'management', 'garland', 1, 2, 'left', '', -1);
db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'system', 'powered-by', 'garland', 1, 10, 'footer', '', -1);
// Insert default user-defined node types into the database. For a complete
@@ -156,8 +158,6 @@ function default_profile_tasks(&$task, $
// Save some default links.
$link = array('link_path' => 'admin/build/menu-customize/main-menu/add', 'link_title' => 'Add a main menu link', 'menu_name' => 'main-menu');
menu_link_save($link);
- $link = array('link_path' => 'admin/build/menu-customize/secondary-menu/add', 'link_title' => 'Add a secondary menu link', 'menu_name' => 'secondary-menu');
- menu_link_save($link);
}
/**
Index: profiles/expert/expert.profile
===================================================================
RCS file: /cvs/drupal/drupal/profiles/expert/expert.profile,v
retrieving revision 1.4
diff -u -p -r1.4 expert.profile
--- profiles/expert/expert.profile 10 Feb 2009 03:28:51 -0000 1.4
+++ profiles/expert/expert.profile 19 Mar 2009 04:49:06 -0000
@@ -42,9 +42,11 @@ function expert_profile_task_list() {
* Perform any final installation tasks for this profile.
*/
function expert_profile_tasks(&$task, $url) {
- // Enable 2 standard blocks.
+ // Enable 4 standard blocks.
db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', 'login', 'garland', 1, 0, 'left', '', -1);
- db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'user', 'navigation', 'garland', 1, 0, 'left', '', -1);
+ db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'system', 'navigation', 'garland', 1, 0, 'left', '', -1);
+ db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'system', 'create', 'garland', 1, 1, 'left', '', -1);
+ db_query("INSERT INTO {block} (module, delta, theme, status, weight, region, pages, cache) VALUES ('%s', '%s', '%s', %d, %d, '%s', '%s', %d)", 'system', 'management', 'garland', 1, 2, 'left', '', -1);
}
/**
Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.24
diff -u -p -r1.24 page.tpl.php
--- themes/garland/page.tpl.php 18 Feb 2009 14:28:25 -0000 1.24
+++ themes/garland/page.tpl.php 19 Mar 2009 04:49:06 -0000
@@ -31,8 +31,8 @@
-
+