? sites/default/files ? sites/default/private ? sites/default/settings.php Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1102 diff -u -p -r1.1102 node.module --- modules/node/node.module 20 Aug 2009 09:47:04 -0000 1.1102 +++ modules/node/node.module 20 Aug 2009 22:00:25 -0000 @@ -1691,6 +1691,7 @@ function _node_add_access() { function node_menu() { $items['admin/content'] = array( 'title' => 'Content', + 'description' => 'Find and manage content and comments.', 'page callback' => 'drupal_get_form', 'page arguments' => array('node_admin_content'), 'access arguments' => array('administer nodes'), Index: modules/system/system.admin.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v retrieving revision 1.180 diff -u -p -r1.180 system.admin.inc --- modules/system/system.admin.inc 17 Aug 2009 19:14:41 -0000 1.180 +++ modules/system/system.admin.inc 20 Aug 2009 22:00:29 -0000 @@ -40,11 +40,25 @@ function system_main_admin_page($arg = N } $block = $item; $block['content'] = ''; + $block['show'] = FALSE; if ($item['block_callback'] && function_exists($item['block_callback'])) { $function = $item['block_callback']; $block['content'] .= $function(); } - $block['content'] .= theme('admin_block_content', system_admin_menu_block($item)); + $content = system_admin_menu_block($item); + if ((isset($item['page_callback']) && !in_array($item['page_callback'], array('system_admin_menu_block_page', 'system_admin_config_page', 'system_settings_overview'))) || count($content)) { + // Only show blocks for items which are not containers, or those which + // are containers and do have items we can show. + $block['show'] = TRUE; + if (empty($content)) { + // If no items found below, but access checks did not fail, show. + $block['title'] = l($item['title'], $item['href'], $item['localized_options']); + } + else { + // Theme items below. + $block['content'] .= theme('admin_block_content', $content); + } + } // Prepare for sorting as in function _menu_tree_check_access(). // The weight is offset so it is always positive, with a uniform 5-digits. $blocks[(50000 + $item['weight']) . ' ' . $item['title'] . ' ' . $item['mlid']] = $block; @@ -86,6 +100,7 @@ function system_admin_config_page() { } $block = $item; $block['content'] = ''; + $block['show'] = TRUE; if ($item['block_callback'] && function_exists($item['block_callback'])) { $function = $item['block_callback']; $block['content'] .= $function(); @@ -1923,20 +1938,34 @@ function system_batch_page() { */ function theme_admin_block($block) { // Don't display the block if it has no content to display. - if (empty($block['content'])) { + if (!$block['show']) { return ''; } - $output = <<< EOT -
-

- $block[title] -

-
- $block[content] + if (empty($block['content'])) { + $output = <<< EOT +
+

+ $block[title] +

+
+ $block[description] +
+
+EOT; + } + else { + $output = <<< EOT +
+

+ $block[title] +

+
+ $block[content] +
-
EOT; + } return $output; } Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.752 diff -u -p -r1.752 system.module --- modules/system/system.module 20 Aug 2009 10:48:03 -0000 1.752 +++ modules/system/system.module 20 Aug 2009 22:00:35 -0000 @@ -545,9 +545,11 @@ function system_menu() { // Appearance. $items['admin/appearance'] = array( 'title' => 'Appearance', + 'description' => 'Select and configure your site theme.', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_themes_form'), 'access arguments' => array('administer site configuration'), + 'position' => 'left', 'weight' => -6, ); $items['admin/appearance/select'] = array( Index: modules/user/user.module =================================================================== RCS file: /cvs/drupal/drupal/modules/user/user.module,v retrieving revision 1.1023 diff -u -p -r1.1023 user.module --- modules/user/user.module 19 Aug 2009 13:31:14 -0000 1.1023 +++ modules/user/user.module 20 Aug 2009 22:00:41 -0000 @@ -1348,9 +1348,11 @@ function user_menu() { // User administration pages. $items['admin/people'] = array( 'title' => 'People', + 'description' => 'Find and manage people interacting with your site.', 'page callback' => 'user_admin', 'page arguments' => array('list'), 'access arguments' => array('administer users'), + 'position' => 'left', 'weight' => -4, ); $items['admin/people/list'] = array( Index: themes/seven/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/seven/style.css,v retrieving revision 1.11 diff -u -p -r1.11 style.css --- themes/seven/style.css 20 Aug 2009 15:59:58 -0000 1.11 +++ themes/seven/style.css 20 Aug 2009 22:00:42 -0000 @@ -318,11 +318,11 @@ ul.secondary li.active a.active { #block-system-main ul.admin-list li { position: relative; padding-left: 30px; - padding-bottom: 9px; - border-bottom: 1px solid #ccc; + padding-top: 9px; + border-top: 1px solid #ccc; margin-left: 0; margin-bottom: 10px; - background: url(images/list-item.png) no-repeat 0 3px; + background: url(images/list-item.png) no-repeat 0 11px; list-style-type: none; list-style-image: none; } @@ -639,9 +639,8 @@ div.admin-panel { #block-system-main div.admin-panel h3 { font-size: 12px; text-transform: uppercase; - margin: 0 0 10px; + margin: 0; padding-bottom: 9px; - border-bottom: 1px solid #ccc; } .container-inline fieldset {