From 90b08f2bd880e036d16186925c9f11b3629a37a0 Mon Sep 17 00:00:00 2001 From: Angie Byron Date: Tue, 12 Jan 2010 23:04:48 +0000 Subject: [PATCH] #620616 by Bojhan, reglogge, lisarex, jhodgdon, and yoroy: Fix inconsistencies in menu description labeling. --- modules/comment/comment.module | 2 +- modules/dashboard/dashboard.module | 2 ++ modules/help/help.module | 1 + modules/node/node.module | 2 +- modules/system/system.module | 11 ++++++----- modules/toolbar/toolbar.module | 2 ++ modules/user/user.module | 1 + 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 50531cefd9e..1f24e44eb23 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -2487,7 +2487,7 @@ function comment_ranking() { */ function comment_menu_alter(&$items) { // Add comments to the description for admin/content. - $items['admin/content']['description'] = "View, edit, and delete your site's content and comments."; + $items['admin/content']['description'] = "Administer content and comments"; } /** diff --git a/modules/dashboard/dashboard.module b/modules/dashboard/dashboard.module index 301cb6c1b40..86f14e03494 100644 --- a/modules/dashboard/dashboard.module +++ b/modules/dashboard/dashboard.module @@ -27,6 +27,7 @@ function dashboard_help($path, $arg) { function dashboard_menu() { $items['admin/dashboard'] = array( 'title' => 'Dashboard', + 'description' => 'View and customize your dashboard', 'page callback' => 'dashboard_admin', 'access arguments' => array('access dashboard'), // Make this appear first, so for example, in admin menus, it shows up on @@ -35,6 +36,7 @@ function dashboard_menu() { ); $items['admin/dashboard/customize'] = array( 'title' => 'Dashboard', + 'description' => 'View and customize your dashboard', 'page callback' => 'dashboard_admin', 'page arguments' => array(TRUE), 'access arguments' => array('access dashboard'), diff --git a/modules/help/help.module b/modules/help/help.module index bdb3796d504..18357b4b463 100644 --- a/modules/help/help.module +++ b/modules/help/help.module @@ -12,6 +12,7 @@ function help_menu() { $items['admin/help'] = array( 'title' => 'Help', + 'description' => 'Reference for usage, configuration, and modules', 'page callback' => 'help_main', 'access arguments' => array('access administration pages'), 'weight' => 9, diff --git a/modules/node/node.module b/modules/node/node.module index 7a38f88da39..b56199455b0 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -1764,7 +1764,7 @@ function node_menu() { ); $items['admin/content/node'] = array( 'title' => 'Content', - 'description' => "View, edit, and delete your site's content.", + 'description' => "Administer content", 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -10, ); diff --git a/modules/system/system.module b/modules/system/system.module index 79d1c660d82..ef5b72af0c7 100644 --- a/modules/system/system.module +++ b/modules/system/system.module @@ -570,7 +570,7 @@ function system_menu() { // Menu items that are basically just menu blocks. $items['admin/structure'] = array( 'title' => 'Structure', - 'description' => 'Control how your site looks and feels.', + 'description' => 'Administer blocks, content types, menus, etc.', 'position' => 'right', 'weight' => -8, 'page callback' => 'system_admin_menu_block_page', @@ -580,7 +580,7 @@ function system_menu() { // Appearance. $items['admin/appearance'] = array( 'title' => 'Appearance', - 'description' => 'Select and configure your site theme.', + 'description' => 'Select and configure your themes', 'page callback' => 'system_themes_page', 'access arguments' => array('administer themes'), 'position' => 'left', @@ -589,7 +589,7 @@ function system_menu() { ); $items['admin/appearance/list'] = array( 'title' => 'List', - 'description' => 'Select and configure your site theme.', + 'description' => 'Select and configure your theme', 'type' => MENU_DEFAULT_LOCAL_TASK, 'weight' => -1, 'file' => 'system.admin.inc', @@ -645,7 +645,7 @@ function system_menu() { // Modules. $items['admin/modules'] = array( 'title' => 'Modules', - 'description' => 'Enable or disable add-on modules for your site.', + 'description' => 'Enable or disable modules', 'page callback' => 'drupal_get_form', 'page arguments' => array('system_modules'), 'access arguments' => array('administer modules'), @@ -678,6 +678,7 @@ function system_menu() { // Configuration. $items['admin/config'] = array( 'title' => 'Configuration', + 'description' => 'Administer settings', 'page callback' => 'system_admin_config_page', 'access arguments' => array('access administration pages'), 'file' => 'system.admin.inc', @@ -1003,7 +1004,7 @@ function system_menu() { // Reports. $items['admin/reports'] = array( 'title' => 'Reports', - 'description' => 'View reports from system logs and other status information.', + 'description' => 'View reports, updates, and errors', 'page callback' => 'system_admin_menu_block_page', 'access arguments' => array('access site reports'), 'weight' => 5, diff --git a/modules/toolbar/toolbar.module b/modules/toolbar/toolbar.module index f4978b6f6fb..5bf10230ba0 100644 --- a/modules/toolbar/toolbar.module +++ b/modules/toolbar/toolbar.module @@ -204,6 +204,7 @@ function toolbar_view() { 'title' => t('Hello @username', array('@username' => format_username($user))), 'href' => 'user', 'html' => TRUE, + 'attributes' => array('title' => t('User account')), ), 'logout' => array( 'title' => t('Log out'), @@ -231,6 +232,7 @@ function toolbar_view() { 'title' => 'Home', 'href' => '', 'html' => TRUE, + 'attributes' => array('title' => t('Home')), ), ); $build['toolbar_home'] = array( diff --git a/modules/user/user.module b/modules/user/user.module index e972ee8bc42..8db32ccd6f6 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1436,6 +1436,7 @@ function user_menu() { // User listing pages. $items['admin/people'] = array( 'title' => 'People', + 'description' => 'Manage user accounts', 'page callback' => 'user_admin', 'page arguments' => array('list'), 'access arguments' => array('administer users'),