' . t('This page shows you all available administration tasks for each module.') . '
'; case 'admin/appearance': $output = '' . t('Set and configure the default theme for your website. Alternative themes are available.', array('@themes' => 'http://drupal.org/project/themes')) . '
'; @@ -521,9 +521,9 @@ function system_menu() { 'file' => 'system.admin.inc', ); $items['admin'] = array( - 'title' => 'Administer', + 'title' => 'Administration', 'access arguments' => array('access administration pages'), - 'page callback' => 'system_main_admin_page', + 'page callback' => 'system_admin_menu_block_page', 'weight' => 9, 'menu_name' => 'management', 'theme callback' => 'variable_get', @@ -537,16 +537,13 @@ function system_menu() { 'type' => MENU_CALLBACK, 'file' => 'system.admin.inc', ); - $items['admin/by-task'] = array( - 'title' => 'By task', - 'page callback' => 'system_main_admin_page', - 'access arguments' => array('access administration pages'), + $items['admin/tasks'] = array( + 'title' => 'Tasks', 'type' => MENU_DEFAULT_LOCAL_TASK, - 'file' => 'system.admin.inc', 'weight' => -20, ); - $items['admin/by-module'] = array( - 'title' => 'By module', + $items['admin/index'] = array( + 'title' => 'Index', 'page callback' => 'system_admin_by_module', 'access arguments' => array('access administration pages'), 'type' => MENU_LOCAL_TASK, @@ -2008,6 +2005,15 @@ function system_preprocess_block(&$varia */ function system_admin_menu_block($item) { $cache = &drupal_static(__FUNCTION__, array()); + // If we are calling this function for a menu item that corresponds to a + // local task (for example, admin/tasks), then we want to retrieve the + // parent item's child links, not this item's (since this item won't have + // any). + // @todo Use tab_root_href instead, when made available. + if ($item['tab_root'] != $item['path']) { + $item = menu_get_item($item['tab_root']); + } + if (!isset($item['mlid'])) { $item += db_query("SELECT mlid, menu_name FROM {menu_links} ml WHERE ml.router_path = :path AND module = 'system'", array(':path' => $item['path']))->fetchAssoc(); } @@ -2017,26 +2023,12 @@ function system_admin_menu_block($item) } $content = array(); - $default_task = NULL; - $has_subitems = FALSE; $result = db_query(" - SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.delivery_callback, m.title, m.title_callback, m.title_arguments, m.theme_callback, m.theme_arguments, m.type, m.description, m.path, m.weight as router_weight, ml.* + SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.delivery_callback, m.title, m.title_callback, m.title_arguments, m.theme_callback, m.theme_arguments, m.type, m.description, ml.* FROM {menu_router} m LEFT JOIN {menu_links} ml ON m.path = ml.router_path - WHERE (ml.plid = :plid AND ml.menu_name = :name AND hidden = 0) OR (m.tab_parent = :path AND m.type IN (:local_task, :default_task))", array(':plid' => $item['mlid'], ':name' => $item['menu_name'], ':path' => $item['path'], ':local_task' => MENU_LOCAL_TASK, ':default_task' => MENU_DEFAULT_LOCAL_TASK), array('fetch' => PDO::FETCH_ASSOC)); + WHERE ml.plid = :plid AND ml.menu_name = :name AND hidden = 0", array(':plid' => $item['mlid'], ':name' => $item['menu_name']), array('fetch' => PDO::FETCH_ASSOC)); foreach ($result as $link) { - if (!isset($link['link_path'])) { - // If this was not an actual link, fake the tab as a menu link, so we - // don't need to special case it beyond this point. - $link['link_title'] = $link['title']; - $link['link_path'] = $link['path']; - $link['options'] = 'a:0:{}'; - $link['weight'] = $link['router_weight']; - } - else { - // We found a non-tab subitem, remember that. - $has_subitems = TRUE; - } _menu_link_translate($link); if (!$link['access']) { continue; @@ -2055,14 +2047,6 @@ function system_admin_menu_block($item) // The weight is offset so it is always positive, with a uniform 5-digits. $key = (50000 + $link['weight']) . ' ' . drupal_strtolower($link['title']) . ' ' . $link['mlid']; $content[$key] = $link; - if ($link['type'] == MENU_DEFAULT_LOCAL_TASK) { - $default_task = $key; - } - } - if ($has_subitems) { - // If we've had at least one non-tab subitem, remove the link for the - // default task, since that is already broken down to subitems. - unset($content[$default_task]); } ksort($content); $cache[$item['mlid']] = $content; @@ -2761,16 +2745,19 @@ function system_admin_compact_page($mode * * @param $module * Module name. + * @param $info + * Module's info array from {system} table (as built by system_get_info). + * * @return * An array of task links. */ -function system_get_module_admin_tasks($module) { +function system_get_module_admin_tasks($module, $info) { $items = &drupal_static(__FUNCTION__, array()); if (empty($items)) { $result = db_query(" SELECT m.load_functions, m.to_arg_functions, m.access_callback, m.access_arguments, m.page_callback, m.page_arguments, m.delivery_callback, m.title, m.title_callback, m.title_arguments, m.theme_callback, m.theme_arguments, m.type, ml.* - FROM {menu_links} ml INNER JOIN {menu_router} m ON ml.router_path = m.path WHERE ml.link_path LIKE 'admin/%' AND hidden >= 0 AND module = 'system' AND m.number_parts > 2", array(), array('fetch' => PDO::FETCH_ASSOC)); + FROM {menu_links} ml INNER JOIN {menu_router} m ON ml.router_path = m.path WHERE ml.link_path LIKE 'admin/%' AND hidden >= 0 AND module = 'system' AND m.number_parts > 1 AND page_callback <> 'system_admin_menu_block_page'", array(), array('fetch' => PDO::FETCH_ASSOC)); foreach ($result as $item) { _menu_link_translate($item); if ($item['access']) { @@ -2783,15 +2770,28 @@ function system_get_module_admin_tasks($ $admin_tasks = array(); $admin_task_count = 0; // Check for permissions. + $permissions_menu_item = menu_get_item('admin/people/permissions'); + unset($permissions_menu_item['description']); + $permissions_menu_item['title'] = t('Configure @module permissions', array('@module' => $info['name'])); if (in_array($module, module_implements('permission')) && $admin_access) { - $admin_tasks[-1] = l(t('Configure permissions'), 'admin/people/permissions', array('fragment' => 'module-' . $module)); + $permissions_menu_item['link_path'] = 'admin/people/permissions'; + $permissions_menu_item['localized_options']['fragment'] = 'module-' . $module; + $admin_tasks[-1] = $permissions_menu_item; } // Check for menu items that are admin links. if (in_array($module, module_implements('menu')) && $menu = module_invoke($module, 'menu')) { foreach (array_keys($menu) as $path) { if (isset($items[$path])) { - $admin_tasks[$items[$path]['title'] . $admin_task_count ++] = l($items[$path]['title'], $path); + // The link 'description' – either derived from the hook_menu + // 'description' or entered by the user via menu module – is saved as + // the title attribute. The title attribute is then unset to reduce + // redundancy in admin pages for screen readers. + if (!empty($items[$path]['localized_options']['attributes']['title'])) { + $items[$path]['description'] = $items[$path]['localized_options']['attributes']['title']; + unset($items[$path]['localized_options']['attributes']['title']); + } + $admin_tasks[$items[$path]['title'] . $admin_task_count ++] = $items[$path]; } } } Index: modules/system/system.test =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.test,v retrieving revision 1.140 diff -u -p -r1.140 system.test --- modules/system/system.test 22 Aug 2010 14:55:29 -0000 1.140 +++ modules/system/system.test 26 Aug 2010 05:23:40 -0000 @@ -1846,21 +1846,84 @@ class ShutdownFunctionsTest extends Drup } /** - * Functional tests compact mode. + * Tests administrative overview pages. */ -class CompactModeTest extends DrupalWebTestCase { +class SystemAdminTestCase extends DrupalWebTestCase { + protected $admin_user; + protected $web_user; + public static function getInfo() { return array( - 'name' => 'Compact mode', - 'description' => 'Tests compact mode functionality.', + 'name' => 'Administrative pages', + 'description' => 'Tests output on administrative pages and compact mode functionality.', 'group' => 'System', ); } function setUp() { - parent::setUp(); - $admin_user = $this->drupalCreateUser(array('access administration pages')); - $this->drupalLogin($admin_user); + // Locale is required for testAdminPages(). + parent::setUp(array('locale')); + + // Create an administrator with all permissions, as well as a regular user + // who can only access administration pages and perform some Locale module + // administrative tasks, but not all of them. + $this->admin_user = $this->drupalCreateUser(array_keys(module_invoke_all('permission'))); + $this->web_user = $this->drupalCreateUser(array( + 'access administration pages', + 'translate interface', + )); + + // Start by logging in as the administrator. + $this->drupalLogin($this->admin_user); + } + + /** + * Tests output on administrative listing pages. + */ + function testAdminPages() { + // Verify that all visible, top-level administration links are listed on + // the main administration page. + $this->drupalGet('admin'); + foreach (menu_get_router() as $path => $item) { + if (strpos($path, 'admin/') === 0 && ($item['type'] & MENU_VISIBLE_IN_TREE) && $item['_number_parts'] == 2) { + $this->assertLink($item['title']); + $this->assertLinkByHref($path); + $this->assertText($item['description']); + } + } + + // For each administrative listing page on which the Locale module appears, + // verify that there are links to the module's primary configuration pages, + // but no links to its individual sub-configuration pages. Also verify that + // a user with access to only some Locale module administration pages only + // sees links to the pages they have access to. + $admin_list_pages = array( + 'admin/index', + 'admin/config', + 'admin/config/regional', + ); + foreach ($admin_list_pages as $page) { + // First check the user who can see everything. On the admin/index page + // only, we also expect this user to see a "Configure permissions" link + // for the Locale module. + $this->drupalLogin($this->admin_user); + $this->drupalGet($page); + $this->assertLinkByHref('admin/config/regional/language'); + $this->assertNoLinkByHref('admin/config/regional/language/configure/session'); + $this->assertNoLinkByHref('admin/config/regional/language/configure/url'); + $this->assertLinkByHref('admin/config/regional/translate'); + if ($page == 'admin/index') { + $this->assertLinkByHref("admin/people/permissions#module-locale"); + } + // Then check the user who only has limited access. + $this->drupalLogin($this->web_user); + $this->drupalGet($page); + $this->assertNoLinkByHref('admin/config/regional/language'); + $this->assertLinkByHref('admin/config/regional/translate'); + if ($page == 'admin/index') { + $this->assertNoLinkByHref("admin/people/permissions#module-locale"); + } + } } /** Index: themes/seven/template.php =================================================================== RCS file: /cvs/drupal/drupal/themes/seven/template.php,v retrieving revision 1.20 diff -u -p -r1.20 template.php --- themes/seven/template.php 14 Aug 2010 00:43:24 -0000 1.20 +++ themes/seven/template.php 26 Aug 2010 05:23:40 -0000 @@ -51,7 +51,7 @@ function seven_node_add_list($variables) } /** - * Override of theme_admin_block_content(). + * Overrides theme_admin_block_content(). * * Use unordered list markup in both compact and extended mode. */ @@ -63,7 +63,7 @@ function seven_admin_block_content($vari foreach ($content as $item) { $output .= '