### Eclipse Workspace Patch 1.0
#P nitobe
Index: page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/nitobe/page.tpl.php,v
retrieving revision 1.16.2.1
diff -u -r1.16.2.1 page.tpl.php
--- page.tpl.php	19 Jun 2009 02:36:38 -0000	1.16.2.1
+++ page.tpl.php	19 Feb 2010 15:01:21 -0000
@@ -70,17 +70,19 @@
 			        	<div id="search-top" class="grid-4"><?php print $search_box; ?></div>
 			        <?php endif; ?>
           		<hr/>
-          		<?php if (isset($nitobe_primary_links)): ?>
-            		<div id="header-links" class="grid-16">
-            		    <?php if (isset($nitobe_primary_links)) { print $nitobe_primary_links; } ?>
-            		    <?php if (isset($nitobe_secondary_links)) : ?>
-              			<hr/>
-            		    <?php print $nitobe_secondary_links; ?>
-            		    <?php endif; ?>
-          			</div><!-- #header-links -->
-          		<?php else: ?>
-          			<hr id="no-menu-rule" class="rule-bottom grid-16"/>
-          		<?php endif; ?>
+          		<?php if (isset($nitobe_primary_links) || (isset($nitobe_secondary_links))): ?>
+                <?php if (isset($nitobe_secondary_links)): ?>
+                  <?php print $nitobe_secondary_links; ?>
+                <?php endif; ?>
+                <?php if (isset($nitobe_primary_links)): ?>
+                  <div id="header-links" class="grid-16">
+                      <?php print $nitobe_primary_links; ?>
+                  </div>
+                <?php endif; ?>
+                <!-- #header-links -->
+              <?php else: ?>
+                <hr id="no-menu-rule" class="rule-bottom grid-16"/>
+              <?php endif; ?>
           		<div id="masthead" class="grid-16">
           		    <?php if (isset($masthead)) { print $masthead; } ?>
           		</div><!-- /masthead -->
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/nitobe/template.php,v
retrieving revision 1.21.2.4
diff -u -r1.21.2.4 template.php
--- template.php	18 Oct 2009 14:20:42 -0000	1.21.2.4
+++ template.php	19 Feb 2010 15:01:22 -0000
@@ -434,7 +434,7 @@
   if (isset($vars['secondary_links'])) {
     $props = array(
     	'id'    => 'secondary-nav',
-    	'class' => 'links secondary-links grid-16'
+    	'class' => 'links secondary-links'
     );
 
     $vars['nitobe_secondary_links'] = theme('links', $vars['secondary_links'], $props);
Index: styles/style.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/nitobe/styles/Attic/style.css,v
retrieving revision 1.1.2.2
diff -u -r1.1.2.2 style.css
--- styles/style.css	1 Aug 2009 17:58:31 -0000	1.1.2.2
+++ styles/style.css	19 Feb 2010 15:01:22 -0000
@@ -263,7 +263,6 @@
 /* ****************************************************************************
  * Secondary tabs
  * ************************************************************************* */
-ul#secondary-nav,
 .tabs.secondary {
   background: #333 url(images/background-dark.gif) repeat;
   border-bottom: 1px solid #333;
@@ -279,6 +278,10 @@
   white-space: normal;
 }
 
+ul#secondary-nav {
+  float: right;
+}
+
 ul#secondary-nav li,
 .tabs.secondary li {
   border: none;
@@ -287,6 +290,14 @@
   padding: 0;
 }
 
+ul#secondary-nav li {
+  border-right: 1px solid #ccc;
+}
+
+ul#secondary-nav li.last {
+  border-right: 0px;
+}
+
 ul#secondary-nav li a,
 .tabs.secondary li a {
   background: transparent;
@@ -296,16 +307,16 @@
   padding: 0 10px;
 }
 
-ul#secondary-nav li a.active,
+ul#secondary-nav li a.active { color: #000;}
 .tabs.secondary li a.active { color: #fff;}
 
+ul#secondary-nav li.active a:hover,
 ul#secondary-nav li a:hover,
 .tabs.secondary li a:hover {
   color: #4cf;
   text-decoration: none;
 }
 
-ul#secondary-nav li.active a:hover,
 .tabs.secondary li.active a:hover { color: #fff; }
 
 /* ****************************************************************************