? .DS_Store ? .project ? 410646-secondary-menu-theme-changes-02.patch ? 410646-secondary-menu-theme-changes-03.patch ? 410646-secondary-menu-theme-changes-04.patch ? 410646-secondary-menu-theme-changes-106.patch ? 410646-secondary-menu-theme-changes-119.patch ? 410646-secondary-menu-theme-changes-126.patch ? 410646-secondary-menu-theme-changes-134.patch ? 410646-secondary-menu-theme-changes-137.patch ? taxonomy_description_796692_3.patch ? sites/.DS_Store ? sites/devel ? sites/make_site.php ? sites/make_site.sh ? sites/standards ? sites/taxonomy ? sites/template ? sites/test ? sites/all/libraries ? sites/all/modules ? sites/default/settings.php Index: includes/menu.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/menu.inc,v retrieving revision 1.406 diff -u -p -r1.406 menu.inc --- includes/menu.inc 22 Aug 2010 14:57:44 -0000 1.406 +++ includes/menu.inc 23 Aug 2010 13:52:21 -0000 @@ -1617,7 +1617,6 @@ function menu_list_system_menus() { 'management' => 'Management', 'user-menu' => 'User menu', 'main-menu' => 'Main menu', - 'secondary-menu' => 'Secondary menu', ); } @@ -2077,7 +2076,7 @@ function menu_set_active_menu_names($men $active = $menu_names; } elseif (!isset($active)) { - $active = variable_get('menu_default_active_menus', array('management', 'navigation', 'user-menu', 'main-menu')); + $active = variable_get('menu_default_active_menus', array_keys(menu_list_system_menus())); } return $active; } Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.606 diff -u -p -r1.606 theme.inc --- includes/theme.inc 22 Aug 2010 12:46:21 -0000 1.606 +++ includes/theme.inc 23 Aug 2010 13:52:21 -0000 @@ -2258,14 +2258,47 @@ function template_preprocess_page(&$vari $variables['language']->dir = $GLOBALS['language']->direction ? 'rtl' : 'ltr'; $variables['logo'] = theme_get_setting('logo'); $variables['messages'] = $variables['show_messages'] ? theme('status_messages') : ''; - $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['primary_links'] = theme_get_setting('toggle_main_menu') ? menu_main_menu() : array(); + $variables['secondary_links'] = theme_get_setting('toggle_secondary_menu') ? menu_secondary_menu() : array(); $variables['action_links'] = menu_local_actions(); $variables['site_name'] = (theme_get_setting('toggle_name') ? filter_xss_admin(variable_get('site_name', 'Drupal')) : ''); $variables['site_slogan'] = (theme_get_setting('toggle_slogan') ? filter_xss_admin(variable_get('site_slogan', '')) : ''); $variables['tabs'] = theme('menu_local_tasks'); $variables['title'] = drupal_get_title(); + if (!empty($variables['primary_links'])) { + $variables['primary_navigation'] = theme('links__system_main_menu', array( + 'links' => $variables['primary_links'], + 'attributes' => array( + 'class' => array('links', 'main-menu'), + ), + 'heading' => array( + 'text' => t('Main menu'), + 'level' => 'h2', + 'class' => array('element-invisible'), + ) + )); + } + else { + $variables['primary_navigation'] = FALSE; + } + if (!empty($variables['secondary_links'])) { + $variables['secondary_navigation'] = theme('links__system_secondary_menu', array( + 'links' => $variables['secondary_links'], + 'attributes' => array( + 'class' => array('links', 'secondary-menu'), + ), + 'heading' => array( + 'text' => t('Secondary menu'), + 'level' => 'h2', + 'class' => array('element-invisible'), + ) + )); + } + else { + $variables['secondary_navigation'] = FALSE; + } + if ($node = menu_get_object()) { $variables['node'] = $node; } Index: modules/menu/menu.install =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.install,v retrieving revision 1.25 diff -u -p -r1.25 menu.install --- modules/menu/menu.install 10 Jan 2010 17:55:19 -0000 1.25 +++ modules/menu/menu.install 23 Aug 2010 13:52:21 -0000 @@ -52,7 +52,6 @@ function menu_install() { 'user-menu' => $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.'), - 'secondary-menu' => $t('The Secondary menu is used on many sites for legal notices and contact pages.'), ); foreach ($system_menus as $menu_name => $title) { $menu = array( Index: modules/system/page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/system/page.tpl.php,v retrieving revision 1.45 diff -u -p -r1.45 page.tpl.php --- modules/system/page.tpl.php 8 Aug 2010 19:35:49 -0000 1.45 +++ modules/system/page.tpl.php 23 Aug 2010 13:52:21 -0000 @@ -27,10 +27,14 @@ * in theme settings. * * Navigation: - * - $main_menu (array): An array containing the Main menu links for the - * site, if they have been configured. - * - $secondary_menu (array): An array containing the Secondary menu links for - * the site, if they have been configured. + * - $primary_navigation: A themed string containing the Main menu links + * for the site, if they have been configured. + * - $primary_links (array): An array containing the Main menu links that can + * be altered and displayed using theme_link(). + * - $secondary_navigation: A themed string containing the Secondary menu links + * for the site, if they have been configured. + * - $secondary_links (array): An array containing the Secondary menu links that + * can be altered and displayed using theme_link(). * - $breadcrumb: The breadcrumb trail for the current page. * * Page content (in order of occurrence in the default page.tpl.php): @@ -102,9 +106,10 @@ - + @@ -144,7 +149,6 @@ Index: themes/bartik/templates/page.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/bartik/templates/page.tpl.php,v retrieving revision 1.4 diff -u -p -r1.4 page.tpl.php --- themes/bartik/templates/page.tpl.php 22 Aug 2010 13:57:02 -0000 1.4 +++ themes/bartik/templates/page.tpl.php 23 Aug 2010 13:52:22 -0000 @@ -123,10 +123,10 @@ - + Index: themes/garland/template.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/template.php,v retrieving revision 1.41 diff -u -p -r1.41 template.php --- themes/garland/template.php 30 Jul 2010 02:47:28 -0000 1.41 +++ themes/garland/template.php 23 Aug 2010 13:52:22 -0000 @@ -60,38 +60,6 @@ function garland_process_html(&$vars) { */ function garland_preprocess_page(&$vars) { $vars['tabs2'] = menu_secondary_local_tasks(); - if (isset($vars['main_menu'])) { - $vars['primary_nav'] = theme('links__system_main_menu', array( - 'links' => $vars['main_menu'], - 'attributes' => array( - 'class' => array('links', 'main-menu'), - ), - 'heading' => array( - 'text' => t('Main menu'), - 'level' => 'h2', - 'class' => array('element-invisible'), - ) - )); - } - else { - $vars['primary_nav'] = FALSE; - } - if (isset($vars['secondary_menu'])) { - $vars['secondary_nav'] = theme('links__system_secondary_menu', array( - 'links' => $vars['secondary_menu'], - 'attributes' => array( - 'class' => array('links', 'secondary-menu'), - ), - 'heading' => array( - 'text' => t('Secondary menu'), - 'level' => 'h2', - 'class' => array('element-invisible'), - ) - )); - } - else { - $vars['secondary_nav'] = FALSE; - } // Prepare header. $site_fields = array();