3 files changed, 24 insertions, 24 deletions
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;
 }