- Patch #270917 by catch, Bojhan, et al: renamed 'primary links' and 'secondary links' to 'main menu' and 'secondary menu' respectively. Based on usability study conducted with the help of Bojhan.

9 files changed, 48 insertions, 48 deletions

diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php
index 73b3229f8..b279cd42a 100644
--- a/themes/bluemarine/page.tpl.php
+++ b/themes/bluemarine/page.tpl.php
@@ -19,8 +19,8 @@
     <?php if ($site_slogan) { ?><div class='site-slogan'><?php print $site_slogan ?></div><?php } ?>
 
     <div id="menu">
-      <?php if (isset($secondary_links)) { ?><?php print theme('links', $secondary_links, array('class' => 'links', 'id' => 'subnavlist')); ?><?php } ?>
-      <?php if (isset($primary_links)) { ?><?php print theme('links', $primary_links, array('class' => 'links', 'id' => 'navlist')) ?><?php } ?>
+      <?php if (isset($secondary_menu)) { ?><?php print theme('links', $secondary_menu, array('class' => 'links', 'id' => 'subnavlist')); ?><?php } ?>
+      <?php if (isset($main_menu)) { ?><?php print theme('links', $main_menu, array('class' => 'links', 'id' => 'navlist')) ?><?php } ?>
     </div>
 
     <div id="header-region"><?php print $header ?></div>
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index 7725035f4..dc9d7d738 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -50,15 +50,15 @@ function chameleon_page($content, $show_blocks = TRUE, $show_messages = TRUE) {
 
   $output .= "</div>\n";
 
-  $primary_links = theme('links', menu_primary_links(), array('class' => 'links', 'id' => 'navlist'));
-  $secondary_links = theme('links', menu_secondary_links(), array('class' => 'links', 'id' => 'subnavlist'));
-  if (isset($primary_links) || isset($secondary_links)) {
+  $main_menu = theme('links', menu_main_menu(), array('class' => 'links', 'id' => 'navlist'));
+  $secondary_menu = theme('links', menu_secondary_menu(), array('class' => 'links', 'id' => 'subnavlist'));
+  if (isset($main_menu) || isset($secondary_menu)) {
     $output .= ' <div class="navlinks">';
-    if (isset($primary_links)) {
-      $output .= $primary_links;
+    if (isset($main_menu)) {
+      $output .= $main_menu;
     }
-    if (isset($secondary_links)) {
-      $output .= $secondary_links;
+    if (isset($secondary_menu)) {
+      $output .= $secondary_menu;
     }
     $output .= " </div>\n";
   }
diff --git a/themes/garland/print.css b/themes/garland/print.css
index bdd895818..36d7f2b20 100644
--- a/themes/garland/print.css
+++ b/themes/garland/print.css
@@ -7,7 +7,7 @@ body, input, textarea, select {
   font-size: 11pt;
 }
 
-ul.primary-links, ul.secondary-links,
+ul.main-menu, ul.secondary-menu,
 #header-region, .sidebar {
   display: none;
 }
diff --git a/themes/garland/style-rtl.css b/themes/garland/style-rtl.css
index ec6432d99..431359490 100644
--- a/themes/garland/style-rtl.css
+++ b/themes/garland/style-rtl.css
@@ -129,24 +129,24 @@ dl dd {
 /**
  * Primary navigation
  */
-ul.primary-links {
+ul.main-menu {
   float: left;
 width:70%;
 }
 
-ul.primary-links li {
+ul.main-menu li {
   float: right;
 }
 
 /**
  * Secondary navigation
  */
-ul.secondary-links {
+ul.secondary-menu {
   float: left;
   clear: left;
 }
 
-ul.secondary-links li {
+ul.secondary-menu li {
   float: right;
 }
 
diff --git a/themes/garland/style.css b/themes/garland/style.css
index 9f4fb07aa..033979163 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -545,7 +545,7 @@ body.two-sidebars #footer {
 /**
  * Primary navigation
  */
-ul.primary-links {
+ul.main-menu {
   margin: 0;
   padding: 0;
   float: right; /* LTR */
@@ -553,14 +553,14 @@ ul.primary-links {
   z-index: 4;
 }
 
-ul.primary-links li {
+ul.main-menu li {
   margin: 0;
   padding: 0;
   float: left; /* LTR */
   background-image: none;
 }
 
-ul.primary-links li a, ul.primary-links li a:link, ul.primary-links li a:visited {
+ul.main-menu li a, ul.main-menu li a:link, ul.main-menu li a:visited {
   display: block;
   margin: 0 1em;
   padding: .75em 0 0;
@@ -568,7 +568,7 @@ ul.primary-links li a, ul.primary-links li a:link, ul.primary-links li a:visited
   background: transparent url(images/bg-navigation-item.png) no-repeat 50% 0;
 }
 
-ul.primary-links li a:hover, ul.primary-links li a.active {
+ul.main-menu li a:hover, ul.main-menu li a.active {
   color: #fff;
   background: transparent url(images/bg-navigation-item-hover.png) no-repeat 50% 0;
 }
@@ -576,7 +576,7 @@ ul.primary-links li a:hover, ul.primary-links li a.active {
 /**
  * Secondary navigation
  */
-ul.secondary-links {
+ul.secondary-menu {
   margin: 0;
   padding: 18px 0 0;
   float: right; /* LTR */
@@ -585,14 +585,14 @@ ul.secondary-links {
   z-index: 4;
 }
 
-ul.secondary-links li {
+ul.secondary-menu li {
   margin: 0;
   padding: 0;
   float: left; /* LTR */
   background-image: none;
 }
 
-ul.secondary-links li a, ul.secondary-links li a:link, ul.secondary-links li a:visited {
+ul.secondary-menu li a, ul.secondary-menu li a:link, ul.secondary-menu li a:visited {
   display: block;
   margin: 0 1em;
   padding: .75em 0 0;
@@ -600,7 +600,7 @@ ul.secondary-links li a, ul.secondary-links li a:link, ul.secondary-links li a:v
   background: transparent;
 }
 
-ul.secondary-links li a:hover, ul.secondary-links li a.active {
+ul.secondary-menu li a:hover, ul.secondary-menu li a.active {
   color: #cde3f1;
   background: transparent;
 }
diff --git a/themes/garland/template.php b/themes/garland/template.php
index 36c45c21f..016a1e4e7 100644
--- a/themes/garland/template.php
+++ b/themes/garland/template.php
@@ -31,8 +31,8 @@ function garland_comment_wrapper($content, $node) {
  */
 function garland_preprocess_page(&$vars) {
   $vars['tabs2'] = menu_secondary_local_tasks();
-  $vars['primary_nav'] = isset($vars['primary_links']) ? theme('links', $vars['primary_links'], array('class' => 'links primary-links')) : FALSE;
-  $vars['secondary_nav'] = isset($vars['secondary_links']) ? theme('links', $vars['secondary_links'], array('class' => 'links secondary-links')) : FALSE;
+  $vars['primary_nav'] = isset($vars['main_menu']) ? theme('links', $vars['main_menu'], array('class' => 'links main-menu')) : FALSE;
+  $vars['secondary_nav'] = isset($vars['secondary_menu']) ? theme('links', $vars['secondary_menu'], array('class' => 'links secondary-menu')) : FALSE;
   $vars['ie_styles'] = garland_get_ie_styles();
 
   // Prepare header
diff --git a/themes/pushbutton/page.tpl.php b/themes/pushbutton/page.tpl.php
index 8fd960d66..e32aaafec 100644
--- a/themes/pushbutton/page.tpl.php
+++ b/themes/pushbutton/page.tpl.php
@@ -14,7 +14,7 @@
 
 <div class="hide"><a href="#content" title="<?php print t('Skip navigation') ?>." accesskey="2"><?php print t('Skip navigation') ?></a>.</div>
 
-<table id="primary-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%">
+<table id="main-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%">
   <tr>
     <td id="home" width="10%">
       <?php if ($logo) : ?>
@@ -30,16 +30,16 @@
         <div class='site-slogan'><?php print($site_slogan) ?></div>
       <?php endif;?>
     </td>
-    <td class="primary-links" width="70%" align="center" valign="middle">
-      <?php print theme('links', $primary_links, array('class' => 'links', 'id' => 'navlist')) ?>
+    <td class="main-menu" width="70%" align="center" valign="middle">
+      <?php print theme('links', $main_menu, array('class' => 'links', 'id' => 'navlist')) ?>
     </td>
   </tr>
 </table>
 
 <table id="secondary-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%">
   <tr>
-    <td class="secondary-links" width="75%"  align="center" valign="middle">
-      <?php print theme('links', $secondary_links, array('class' => 'links', 'id' => 'subnavlist')) ?>
+    <td class="secondary-menu" width="75%"  align="center" valign="middle">
+      <?php print theme('links', $secondary_menu, array('class' => 'links', 'id' => 'subnavlist')) ?>
     </td>
     <td width="25%" align="center" valign="middle">
       <?php print $search_box ?>
@@ -100,11 +100,11 @@
 <table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%">
   <tr>
     <td align="center" valign="middle">
-    <?php if (isset($primary_links)) : ?>
-      <?php print theme('links', $primary_links, array('class' => 'links primary-links')) ?>
+    <?php if (isset($main_menu)) : ?>
+      <?php print theme('links', $main_menu, array('class' => 'links main-menu')) ?>
     <?php endif; ?>
-    <?php if (isset($secondary_links)) : ?>
-      <?php print theme('links', $secondary_links, array('class' => 'links secondary-links')) ?>
+    <?php if (isset($secondary_menu)) : ?>
+      <?php print theme('links', $secondary_menu, array('class' => 'links secondary-menu')) ?>
     <?php endif; ?>
     </td>
   </tr>
diff --git a/themes/pushbutton/style-rtl.css b/themes/pushbutton/style-rtl.css
index 9a7bfb538..428f95a8a 100644
--- a/themes/pushbutton/style-rtl.css
+++ b/themes/pushbutton/style-rtl.css
@@ -11,7 +11,7 @@ blockquote {
   text-align: right;
 }
 
-#primary-menu tr {
+#main-menu tr {
   background: transparent url(header-a.jpg) right bottom repeat;
 }
 
@@ -27,7 +27,7 @@ td#home a:hover img {
   background: transparent url(logo-hover-rtl.jpg) repeat;
 }
 
-#primary-menu .primary-links {
+#main-menu .main-menu {
   background: transparent url(header-b-rtl.jpg) right top no-repeat;
 }
 
@@ -41,7 +41,7 @@ ul.links li {
   border-left: none;
 }
 
-#subnavlist li, ul.primary-links li, ul.secondary-links li {
+#subnavlist li, ul.main-menu li, ul.secondary-menu li {
   border-right: 1px solid #fff;
   border-left: none;
 }
diff --git a/themes/pushbutton/style.css b/themes/pushbutton/style.css
index 47e0d5bd7..848015fb2 100644
--- a/themes/pushbutton/style.css
+++ b/themes/pushbutton/style.css
@@ -75,12 +75,12 @@ pre {
 /*
 ** Page layout blocks / IDs
 */
-#primary-menu {
+#main-menu {
   border-collapse: separate;
   background-color: #e0edfb;
   border-bottom: 3px solid #69c;
 }
-#primary-menu tr {
+#main-menu tr {
   background: transparent url(header-a.jpg) left bottom repeat; /* LTR */
 }
 td#home {
@@ -96,17 +96,17 @@ td#home a:hover img {
   width: 144px;
   height: 63px;
 }
-.primary-links, .primary-links a:link, .primary-links a:visited {
+.main-menu, .main-menu a:link, .main-menu a:visited {
   color: #369;
 }
-.primary-links a:hover {
+.main-menu a:hover {
   color: #000;
 }
-#primary-menu .primary-links {
+#main-menu .main-menu {
   background: transparent url(header-b.jpg) left top no-repeat; /* LTR */
   font-size: 0.79em;
 }
-#primary-menu .primary-links h1, #primary-menu .primary-links h2, #primary-menu .primary-links h3 {
+#main-menu .main-menu h1, #main-menu .main-menu h2, #main-menu .main-menu h3 {
   font-size: 2.3em;
   color: #369;
 }
@@ -115,14 +115,14 @@ td#home a:hover img {
   background-color: #369;
   border-bottom: 3px solid #69c;
 }
-.secondary-links, .secondary-links a:link, .secondary-links a:visited {
+.secondary-menu, .secondary-menu a:link, .secondary-menu a:visited {
   color: #e4e9eb;
 }
-.secondary-links a:hover {
+.secondary-menu a:hover {
   color: #fff;
   text-decoration: underline;
 }
-#secondary-menu .secondary-links {
+#secondary-menu .secondary-menu {
   font-size: 0.85em;
 }
 ul.links li {
@@ -131,7 +131,7 @@ ul.links li {
 #navlist li {
   border-left: 1px solid #369; /* LTR */
 }
-#subnavlist li, ul.primary-links li, ul.secondary-links li {
+#subnavlist li, ul.main-menu li, ul.secondary-menu li {
   border-left: 1px solid #fff; /* LTR */
 }
 #navlist li.first, #subnavlist li.first, ul.links li.first {
@@ -330,14 +330,14 @@ table#footer-menu {
   padding: 5px;
   font-size: 0.75em;
 }
-#footer-menu .primary-links, #footer-menu a:link, #footer-menu a:visited {
+#footer-menu .main-menu, #footer-menu a:link, #footer-menu a:visited {
   color: #e4e9eb;
 }
 #footer-menu a:hover {
   color: #fff;
   text-decoration: underline;
 }
-#footer-menu .primary-links h1, #footer-menu .primary-links h2, #footer-menu .primary-links h3 {
+#footer-menu .main-menu h1, #footer-menu .main-menu h2, #footer-menu .main-menu h3 {
   font-size: 1.3em;
   color: #e4e9eb;
 }