From 0de830accce8dbaad37f5b1fd95cd05bb0a5349a Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Fri, 18 Mar 2011 16:52:06 -0500 Subject: Remove -menu prefix from menu names. --- includes/menu.inc | 13 ++++++------- modules/menu/menu.admin.inc | 6 +++--- modules/menu/menu.install | 4 ++-- modules/menu/menu.module | 10 +++++----- modules/simpletest/tests/menu.test | 8 ++++---- modules/system/page.tpl.php | 2 +- modules/system/system.install | 6 +++--- modules/user/user.module | 6 +++--- profiles/standard/standard.install | 2 +- themes/bartik/color/preview.css | 18 +++++++++--------- themes/bartik/color/preview.html | 4 ++-- themes/bartik/css/colors.css | 4 ++-- themes/bartik/css/ie-rtl.css | 6 +++--- themes/bartik/css/style-rtl.css | 4 ++-- themes/bartik/css/style.css | 22 +++++++++++----------- themes/bartik/templates/page.tpl.php | 6 +++--- themes/garland/print.css | 2 +- themes/garland/style-rtl.css | 4 ++-- themes/garland/style.css | 14 +++++++------- themes/garland/template.php | 2 +- 20 files changed, 71 insertions(+), 72 deletions(-) diff --git a/includes/menu.inc b/includes/menu.inc index a3121c7..8f31478 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -1711,8 +1711,8 @@ function menu_list_system_menus() { return array( 'navigation' => 'Navigation', 'management' => 'Management', - 'user-menu' => 'User menu', - 'main-menu' => 'Main menu', + 'user' => 'User', + 'main' => 'Main', ); } @@ -1720,21 +1720,20 @@ function menu_list_system_menus() { * Return an array of links to be rendered as the Main menu. */ function menu_main_menu() { - return menu_navigation_links(variable_get('menu_main_links_source', 'main-menu')); + return menu_navigation_links(variable_get('menu_main_links_source', 'main')); } /** * Return an array of links to be rendered as the Secondary links. */ function menu_secondary_menu() { - // If the secondary menu source is set as the primary menu, we display the // second level of the primary menu. - if (variable_get('menu_secondary_links_source', 'user-menu') == variable_get('menu_main_links_source', 'main-menu')) { - return menu_navigation_links(variable_get('menu_main_links_source', 'main-menu'), 1); + if (variable_get('menu_secondary_links_source', 'user') == variable_get('menu_main_links_source', 'main')) { + return menu_navigation_links(variable_get('menu_main_links_source', 'main'), 1); } else { - return menu_navigation_links(variable_get('menu_secondary_links_source', 'user-menu'), 0); + return menu_navigation_links(variable_get('menu_secondary_links_source', 'user'), 0); } } diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc index 1f3c4f7..cb43872 100644 --- a/modules/menu/menu.admin.inc +++ b/modules/menu/menu.admin.inc @@ -660,11 +660,11 @@ function menu_configure() { $menu_options = menu_get_menus(); - $main = variable_get('menu_main_links_source', 'main-menu'); + $main = variable_get('menu_main_links_source', 'main'); $form['menu_main_links_source'] = array( '#type' => 'select', '#title' => t('Source for the Main links'), - '#default_value' => variable_get('menu_main_links_source', 'main-menu'), + '#default_value' => variable_get('menu_main_links_source', 'main'), '#empty_option' => t('No Main links'), '#options' => $menu_options, '#tree' => FALSE, @@ -674,7 +674,7 @@ function menu_configure() { $form['menu_secondary_links_source'] = array( '#type' => 'select', '#title' => t('Source for the Secondary links'), - '#default_value' => variable_get('menu_secondary_links_source', 'user-menu'), + '#default_value' => variable_get('menu_secondary_links_source', 'user'), '#empty_option' => t('No Secondary links'), '#options' => $menu_options, '#tree' => FALSE, diff --git a/modules/menu/menu.install b/modules/menu/menu.install index 05aed28..a844b31 100644 --- a/modules/menu/menu.install +++ b/modules/menu/menu.install @@ -48,9 +48,9 @@ function menu_install() { $t = get_t(); $descriptions = array( 'navigation' => $t('The Navigation menu contains links intended for site visitors. Links are added to the Navigation menu automatically by some modules.'), - 'user-menu' => $t("The User menu contains links related to the user's account, as well as the 'Log out' link."), + 'user' => $t("The User menu contains links related to the user's account, as well as the 'Log out' link."), 'management' => $t('The Management menu contains links for administrative tasks.'), - 'main-menu' => $t('The Main menu is used on many sites to show the major sections of the site, often in a top navigation bar.'), + 'main' => $t('The Main menu is used on many sites to show the major sections of the site, often in a top navigation bar.'), ); foreach ($system_menus as $menu_name => $title) { $menu = array( diff --git a/modules/menu/menu.module b/modules/menu/menu.module index ec41c2f..df4a0b3 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -339,7 +339,7 @@ function menu_parent_options($menus, $item) { else { // If $item is a node type, get all available menus for this type and // prepare a dummy menu item for _menu_parent_depth_limit(). - $type_menus = variable_get('menu_options_' . $item, array('main-menu' => 'main-menu')); + $type_menus = variable_get('menu_options_' . $item, array('main' => 'main')); foreach ($type_menus as $menu) { $available_menus[$menu] = $menu; } @@ -534,7 +534,7 @@ function menu_node_delete($node) { function menu_node_prepare($node) { if (empty($node->menu)) { // Prepare the node for the edit form so that $node->menu always exists. - $menu_name = variable_get('menu_parent_' . $node->type, 'main-menu:0'); + $menu_name = variable_get('menu_parent_' . $node->type, 'main:0'); $item = array(); if (isset($node->nid)) { // Give priority to the default menu @@ -646,7 +646,7 @@ function menu_form_node_form_alter(&$form, $form_state) { '#description' => t('Shown when hovering over the menu link.'), ); - $default = ($link['mlid'] ? $link['menu_name'] . ':' . $link['plid'] : variable_get('menu_parent_' . $type, 'main-menu:0')); + $default = ($link['mlid'] ? $link['menu_name'] . ':' . $link['plid'] : variable_get('menu_parent_' . $type, 'main:0')); // @todo This will fail with the new selective menus per content type. if (!isset($options[$default])) { $default = 'navigation:0'; @@ -701,7 +701,7 @@ function menu_form_node_type_form_alter(&$form, $form_state) { $form['menu']['menu_options'] = array( '#type' => 'checkboxes', '#title' => t('Available menus'), - '#default_value' => variable_get('menu_options_' . $type->type, array('main-menu')), + '#default_value' => variable_get('menu_options_' . $type->type, array('main')), '#options' => $menu_options, '#description' => t('The menus available to place links in for this content type.'), ); @@ -713,7 +713,7 @@ function menu_form_node_type_form_alter(&$form, $form_state) { $form['menu']['menu_parent'] = array( '#type' => 'select', '#title' => t('Default parent item'), - '#default_value' => variable_get('menu_parent_' . $type->type, 'main-menu:0'), + '#default_value' => variable_get('menu_parent_' . $type->type, 'main:0'), '#options' => $options, '#description' => t('Choose the menu item to be the default parent for a new link in the content authoring form.'), '#attributes' => array('class' => array('menu-title-select')), diff --git a/modules/simpletest/tests/menu.test b/modules/simpletest/tests/menu.test index 24c0023..1d7f2d3 100644 --- a/modules/simpletest/tests/menu.test +++ b/modules/simpletest/tests/menu.test @@ -201,14 +201,14 @@ class MenuRouterTestCase extends DrupalWebTestCase { menu_link_maintain('menu_test', 'insert', 'menu_test_maintain/1', 'Menu link #1-1'); menu_link_maintain('menu_test', 'insert', 'menu_test_maintain/2', 'Menu link #2'); - // Move second link to the main-menu, to test caching later on. + // Move second link to the main, to test caching later on. db_update('menu_links') - ->fields(array('menu_name' => 'main-menu')) + ->fields(array('menu_name' => 'main')) ->condition('link_title', 'Menu link #1-1') ->condition('customized', 0) ->condition('module', 'menu_test') ->execute(); - menu_cache_clear('main-menu'); + menu_cache_clear('main'); // Load front page. $this->drupalGet('node'); @@ -1016,7 +1016,7 @@ class MenuBreadcrumbTestCase extends DrupalWebTestCase { // latter is a preferred menu by default. // @todo Also test all themes? Manually testing led to the suspicion that // breadcrumbs may differ, possibly due to template.php overrides. - $menus = array('main-menu', 'navigation'); + $menus = array('main', 'navigation'); // Alter node type menu settings. variable_set("menu_options_$type", $menus); variable_set("menu_parent_$type", 'navigation:0'); diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php index 8ffe82a..c3fadeb 100644 --- a/modules/system/page.tpl.php +++ b/modules/system/page.tpl.php @@ -103,7 +103,7 @@ diff --git a/modules/system/system.install b/modules/system/system.install index af02edc..86a7f85 100644 --- a/modules/system/system.install +++ b/modules/system/system.install @@ -2016,7 +2016,7 @@ function system_update_7015() { db_update('menu_links') ->fields(array( - 'menu_name' => 'user-menu', + 'menu_name' => 'user', 'plid' => 0, )) ->condition(db_or() @@ -2403,7 +2403,7 @@ function system_update_7053() { if (db_table_exists('menu_custom')) { // Create the same menus as in menu_install(). db_insert('menu_custom') - ->fields(array('menu_name' => 'user-menu', 'title' => 'User Menu', 'description' => "The User menu contains links related to the user's account, as well as the 'Log out' link.")) + ->fields(array('menu_name' => 'user', 'title' => 'User Menu', 'description' => "The User menu contains links related to the user's account, as well as the 'Log out' link.")) ->execute(); db_insert('menu_custom') @@ -2416,7 +2416,7 @@ function system_update_7053() { // Show the new menu blocks along the navigation block. $blocks = db_query("SELECT theme, status, region, weight, visibility, pages FROM {block} WHERE module = 'system' AND delta = 'navigation'"); $deltas = db_or() - ->condition('delta', 'user-menu') + ->condition('delta', 'user') ->condition('delta', 'management'); foreach ($blocks as $block) { diff --git a/modules/user/user.module b/modules/user/user.module index 7f22f7c..579a718 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -1564,7 +1564,7 @@ function user_menu() { 'access callback' => TRUE, 'file' => 'user.pages.inc', 'weight' => -10, - 'menu_name' => 'user-menu', + 'menu_name' => 'user', ); $items['user/login'] = array( @@ -1603,7 +1603,7 @@ function user_menu() { 'access callback' => 'user_is_logged_in', 'page callback' => 'user_logout', 'weight' => 10, - 'menu_name' => 'user-menu', + 'menu_name' => 'user', 'file' => 'user.pages.inc', ); @@ -1834,7 +1834,7 @@ function user_menu_link_alter(&$link) { $link['options']['alter'] = TRUE; } - // Force the Logout link to appear on the top-level of 'user-menu' menu by + // Force the Logout link to appear on the top-level of 'user' menu by // default (i.e., unless it has been customized). if ($link['link_path'] == 'user/logout' && $link['module'] == 'system' && empty($link['customized'])) { $link['plid'] = 0; diff --git a/profiles/standard/standard.install b/profiles/standard/standard.install index 75d8dbd..668106e 100644 --- a/profiles/standard/standard.install +++ b/profiles/standard/standard.install @@ -411,7 +411,7 @@ function standard_install() { $item = array( 'link_title' => st('Home'), 'link_path' => '', - 'menu_name' => 'main-menu', + 'menu_name' => 'main', ); menu_link_save($item); diff --git a/themes/bartik/color/preview.css b/themes/bartik/color/preview.css index 48a4a83..ea3408e 100644 --- a/themes/bartik/color/preview.css +++ b/themes/bartik/color/preview.css @@ -39,20 +39,20 @@ html.js #preview { margin-left: 15px; padding-top: 34px; } -#preview-main-menu { +#preview-main { clear: both; padding: 0 15px 3px; } -#preview-main-menu-links a { +#preview-main-links a { color: #d9d9d9; padding: 0.6em 1em 0.4em; } -#preview-main-menu-links { +#preview-main-links { font-size: 0.929em; margin: 0; padding: 0; } -#preview-main-menu-links a { +#preview-main-links a { color: #333; background: #ccc; background: rgba(255, 255, 255, 0.7); @@ -66,19 +66,19 @@ html.js #preview { -webkit-border-top-right-radius: 8px; border-top-right-radius: 8px; } -#preview-main-menu-links a:hover, -#preview-main-menu-links a:focus { +#preview-main-links a:hover, +#preview-main-links a:focus { background: #fff; background: rgba(255, 255, 255, 0.95); } -#preview-main-menu-links a:active { +#preview-main-links a:active { background: #b3b3b3; background: rgba(255, 255, 255, 1); } -#preview-main-menu-links li a.active { +#preview-main-links li a.active { border-bottom: none; } -#preview-main-menu-links li { +#preview-main-links li { display: inline; list-style-type: none; padding: 0.6em 0 0.4em; diff --git a/themes/bartik/color/preview.html b/themes/bartik/color/preview.html index 52ea566..ef91383 100644 --- a/themes/bartik/color/preview.html +++ b/themes/bartik/color/preview.html @@ -3,8 +3,8 @@
Bartik
-
-