? primary.patch
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.275
diff -u -p -r1.275 menu.inc
--- includes/menu.inc 12 Jun 2008 20:49:39 -0000 1.275
+++ includes/menu.inc 18 Jun 2008 14:33:29 -0000
@@ -1251,28 +1251,28 @@ function menu_get_names($reset = FALSE)
* Return an array containing the names of system-defined (default) menus.
*/
function menu_list_system_menus() {
- return array('navigation', 'primary-links', 'secondary-links');
+ return array('navigation', 'main-menu', 'secondary-menu');
}
/**
- * Return an array of links to be rendered as the Primary links.
+ * Return an array of links to be rendered as the Main menu.
*/
-function menu_primary_links() {
- return menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links'));
+function menu_main_menu() {
+ return menu_navigation_links(variable_get('menu_main_menu_source', 'main-menu'));
}
/**
* Return an array of links to be rendered as the Secondary links.
*/
-function menu_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', 'secondary-links') == variable_get('menu_primary_links_source', 'primary-links')) {
- return menu_navigation_links(variable_get('menu_primary_links_source', 'primary-links'), 1);
+ if (variable_get('menu_secondary_menu_source', 'secondary-menu') == variable_get('menu_main_menu_source', 'main-menu')) {
+ return menu_navigation_links(variable_get('menu_main_menu_source', 'main-menu'), 1);
}
else {
- return menu_navigation_links(variable_get('menu_secondary_links_source', 'secondary-links'), 0);
+ return menu_navigation_links(variable_get('menu_secondary_menu_source', 'secondary-menu'), 0);
}
}
Index: includes/theme.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.inc,v
retrieving revision 1.426
diff -u -p -r1.426 theme.inc
--- includes/theme.inc 6 Jun 2008 01:50:20 -0000 1.426
+++ includes/theme.inc 18 Jun 2008 14:33:29 -0000
@@ -864,8 +864,8 @@ function theme_get_settings($key = NULL)
'logo_path' => '',
'default_favicon' => 1,
'favicon_path' => '',
- 'primary_links' => 1,
- 'secondary_links' => 1,
+ 'main_menu' => 1,
+ 'secondary_menu' => 1,
'toggle_logo' => 1,
'toggle_favicon' => 1,
'toggle_name' => 1,
@@ -874,8 +874,8 @@ function theme_get_settings($key = NULL)
'toggle_mission' => 1,
'toggle_node_user_picture' => 0,
'toggle_comment_user_picture' => 0,
- 'toggle_primary_links' => 1,
- 'toggle_secondary_links' => 1,
+ 'toggle_main_menu' => 1,
+ 'toggle_secondary_menu' => 1,
);
if (module_exists('node')) {
@@ -1838,8 +1838,8 @@ function template_preprocess_page(&$vari
$variables['logo'] = theme_get_setting('logo');
$variables['messages'] = $variables['show_messages'] ? theme('status_messages') : '';
$variables['mission'] = isset($mission) ? $mission : '';
- $variables['primary_links'] = theme_get_setting('toggle_primary_links') ? menu_primary_links() : array();
- $variables['secondary_links'] = theme_get_setting('toggle_secondary_links') ? menu_secondary_links() : array();
+ $variables['main_menu'] = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array();
+ $variables['secondary_menu'] = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array();
$variables['search_box'] = (theme_get_setting('toggle_search') ? drupal_get_form('search_theme_form') : '');
$variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : '');
$variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : '');
Index: includes/theme.maintenance.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/theme.maintenance.inc,v
retrieving revision 1.13
diff -u -p -r1.13 theme.maintenance.inc
--- includes/theme.maintenance.inc 28 Apr 2008 09:25:26 -0000 1.13
+++ includes/theme.maintenance.inc 18 Jun 2008 14:33:29 -0000
@@ -252,8 +252,8 @@ function template_preprocess_maintenance
$variables['logo'] = theme_get_setting('logo');
$variables['messages'] = $variables['show_messages'] ? theme('status_messages') : '';
$variables['mission'] = '';
- $variables['primary_links'] = array();
- $variables['secondary_links'] = array();
+ $variables['main_menu'] = array();
+ $variables['secondary_menu'] = array();
$variables['search_box'] = '';
$variables['site_name'] = (theme_get_setting('toggle_name') ? variable_get('site_name', 'Drupal') : '');
$variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? variable_get('site_slogan', '') : '');
Index: modules/menu/menu.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.admin.inc,v
retrieving revision 1.30
diff -u -p -r1.30 menu.admin.inc
--- modules/menu/menu.admin.inc 14 Apr 2008 17:48:37 -0000 1.30
+++ modules/menu/menu.admin.inc 18 Jun 2008 14:33:29 -0000
@@ -607,30 +607,30 @@ function menu_configure() {
$form['menu_default_node_menu'] = array(
'#type' => 'select',
'#title' => t('Default menu for content'),
- '#default_value' => variable_get('menu_default_node_menu', 'primary-links'),
+ '#default_value' => variable_get('menu_default_node_menu', 'main-menu'),
'#options' => $menu_options,
'#description' => t('Choose the menu to be the default in the menu options in the content authoring form.'),
);
- $primary = variable_get('menu_primary_links_source', 'primary-links');
- $primary_options = array_merge($menu_options, array('' => t('No primary links')));
- $form['menu_primary_links_source'] = array(
+ $main = variable_get('menu_main_menu_source', 'main-menu');
+ $main_options = array_merge($menu_options, array('' => t('No Main menu')));
+ $form['menu_main_menu_source'] = array(
'#type' => 'select',
- '#title' => t('Source for the primary links'),
- '#default_value' => $primary,
- '#options' => $primary_options,
+ '#title' => t('Source for the Main menu'),
+ '#default_value' => $main,
+ '#options' => $main_options,
'#tree' => FALSE,
- '#description' => t('Select what should be displayed as the primary links.'),
+ '#description' => t('Select what should be displayed as the Main menu.'),
);
- $secondary_options = array_merge($menu_options, array('' => t('No secondary links')));
- $form["menu_secondary_links_source"] = array(
+ $secondary_options = array_merge($menu_options, array('' => t('No Secondary menu')));
+ $form["menu_secondary_menu_source"] = array(
'#type' => 'select',
- '#title' => t('Source for the secondary links'),
- '#default_value' => variable_get('menu_secondary_links_source', 'secondary-links'),
+ '#title' => t('Source for the Secondary menu'),
+ '#default_value' => variable_get('menu_secondary_menu_source', 'secondary-menu'),
'#options' => $secondary_options,
'#tree' => FALSE,
- '#description' => t('Select what should be displayed as the secondary links. You can choose the same menu for secondary links as for primary links (currently %primary). If you do this, the children of the active primary menu link will be displayed as secondary links.', array('%primary' => $primary_options[$primary])),
+ '#description' => t("Select the source for the Secondary menu. An advanced option allows you to use the same source for both Main menu (currently %main) and Secondary menu: if your source menu has two levels of hierarchy, the top level menu items will appear in the Main menu, and the children of the active item will appear in the Secondary menu." , array('%main' => $main_options[$main])),
);
return system_settings_form($form);
Index: modules/menu/menu.install
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.install,v
retrieving revision 1.11
diff -u -p -r1.11 menu.install
--- modules/menu/menu.install 14 Mar 2008 08:54:31 -0000 1.11
+++ modules/menu/menu.install 18 Jun 2008 14:33:29 -0000
@@ -10,8 +10,8 @@ function menu_install() {
$t = get_t();
db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'navigation', $t('Navigation'), $t('The navigation menu is provided by Drupal and is the main interactive menu for any site. It is usually the only menu that contains personalized links for authenticated users, and is often not even visible to anonymous users.'));
- db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'primary-links', $t('Primary links'), $t('Primary links are often used at the theme layer to show the major sections of a site. A typical representation for primary links would be tabs along the top.'));
- db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'secondary-links', $t('Secondary links'), $t('Secondary links are often used for pages like legal notices, contact details, and other secondary navigation items that play a lesser role than primary links.'));
+ db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'main-menu', $t('Main menu'), $t('The Main menu is often used by themes to show the major sections of a site. A typical representation of the Main menu would be tabs along the top.'));
+ db_query("INSERT INTO {menu_custom} (menu_name, title, description) VALUES ('%s', '%s', '%s')", 'secondary-menu', $t('Secondary menu'), $t('The Secondary menu is often used for pages like legal notices, contact details, and other navigation items that play a lesser role than the Main menu.'));
}
/**
@@ -28,7 +28,7 @@ function menu_uninstall() {
*/
function menu_schema() {
$schema['menu_custom'] = array(
- 'description' => t('Holds definitions for top-level custom menus (for example, Primary Links).'),
+ 'description' => t('Holds definitions for top-level custom menus (for example, Main menu).'),
'fields' => array(
'menu_name' => array(
'type' => 'varchar',
Index: modules/menu/menu.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v
retrieving revision 1.164
diff -u -p -r1.164 menu.module
--- modules/menu/menu.module 10 May 2008 06:52:32 -0000 1.164
+++ modules/menu/menu.module 18 Jun 2008 14:33:29 -0000
@@ -18,7 +18,7 @@ define('MENU_MAX_MENU_NAME_LENGTH_UI', 2
function menu_help($path, $arg) {
switch ($path) {
case 'admin/help#menu':
- $output = '' . t("The menu module provides an interface to control and customize Drupal's powerful menu system. Menus are a hierarchical collection of links, or menu items, used to navigate a website, and are positioned and displayed using Drupal's flexible block system. By default, three menus are created during installation: Navigation, Primary links, and Secondary links. The Navigation menu contains most links necessary for working with and navigating your site, and is often displayed in either the left or right sidebar. Most Drupal themes also provide support for Primary links and Secondary links, by displaying them in either the header or footer of each page. By default, Primary links and Secondary links contain no menu items but may be configured to contain custom menu items specific to your site.") . '
';
+ $output = '' . t("The menu module provides an interface to control and customize Drupal's powerful menu system. Menus are a hierarchical collection of links, or menu items, used to navigate a website, and are positioned and displayed using Drupal's flexible block system. By default, three menus are created during installation: Navigation, Main menu, and Secondary menu. The Navigation menu contains most links necessary for working with and navigating your site, and is often displayed in either the left or right sidebar. Most Drupal themes also provide support for the Main menu and Secondary menu, by displaying them in either the header or footer of each page. By default, the Main menu and Secondary menu contain no menu items but may be configured to contain custom menu items specific to your site.") . '
';
$output .= '' . t('The menus page displays all menus currently available on your site. Select a menu from this list to add or edit a menu item, or to rearrange items within the menu. Create new menus using the add menu page (the block containing a new menu must also be enabled on the blocks administration page).', array('@menu' => url('admin/build/menu'), '@add-menu' => url('admin/build/menu/add'), '@blocks' => url('admin/build/block'))) . '
';
$output .= '' . t('For more information, see the online handbook entry for Menu module.', array('@menu' => 'http://drupal.org/handbook/modules/menu/')) . '
';
return $output;
@@ -48,7 +48,7 @@ function menu_perm() {
function menu_menu() {
$items['admin/build/menu'] = array(
'title' => 'Menus',
- 'description' => "Control your site's navigation menu, primary links and secondary links. as well as rename and reorganize menu items.",
+ 'description' => "Control your site's Navigation menu, Main menu and Secondary menu. as well as rename and reorganize menu items.",
'page callback' => 'menu_overview_page',
'access callback' => 'user_access',
'access arguments' => array('administer menu'),
@@ -310,7 +310,7 @@ function menu_nodeapi(&$node, $op) {
case 'prepare':
if (empty($node->menu)) {
// Prepare the node for the edit form so that $node->menu always exists.
- $menu_name = variable_get('menu_default_node_menu', 'primary-links');
+ $menu_name = variable_get('menu_default_node_menu', 'main-menu');
$item = array();
if (isset($node->nid)) {
// Give priority to the default menu
@@ -387,7 +387,7 @@ function menu_form_alter(&$form, $form_s
$options = menu_parent_options(menu_get_menus(), $item);
$default = $item['menu_name'] . ':' . $item['plid'];
if (!isset($options[$default])) {
- $default = 'primary-links:0';
+ $default = 'main-menu:0';
}
$form['menu']['parent'] = array(
'#type' => 'select',
Index: modules/system/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v
retrieving revision 1.11
diff -u -p -r1.11 page.tpl.php
--- modules/system/page.tpl.php 24 Jan 2008 09:42:51 -0000 1.11
+++ modules/system/page.tpl.php 18 Jun 2008 14:33:29 -0000
@@ -45,9 +45,9 @@
*
* Navigation:
* - $search_box: HTML to display the search box, empty if search has been disabled.
- * - $primary_links (array): An array containing primary navigation links for the
+ * - $main_menu (array): An array containing the Main menu links for the
* site, if they have been configured.
- * - $secondary_links (array): An array containing secondary navigation links for
+ * - $secondary_menu (array): An array containing the Secondary menu links for
* the site, if they have been configured.
*
* Page content (in order of occurrance in the default page.tpl.php):
@@ -124,16 +124,16 @@
-