7 files changed, 62 insertions, 94 deletions
diff --git a/includes/menu.inc b/includes/menu.inc
index ac035dc0d..59ccdcde8 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -445,10 +445,10 @@ function theme_menu_local_tasks() {
         $output .= theme('menu_local_task', $mid, $active);
         $output .= implode($tabs);
         $output .= "</ul>\n";
+        $output .= theme('menu_local_subtasks', $mid);
       }
     }
   }
-
   return $output;
 }
 
@@ -462,7 +462,7 @@ function theme_menu_local_tasks() {
  */
 function theme_menu_local_task($mid, $active) {
   if ($active) {
-    return '<li class="active">'. theme('menu_item', $mid) . theme('menu_local_subtasks', $mid) ."</li>\n";
+    return '<li class="active">'. theme('menu_item', $mid)  ."</li>\n";
   }
   else {
     return '<li>'. theme('menu_item', $mid) ."</li>\n";
diff --git a/misc/drupal.css b/misc/drupal.css
index 4d3ac13fa..b8e9cc15a 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -382,4 +382,56 @@ td.watchdog-httpd {
 td.watchdog-error {
   background: #e44;
   border: 1px solid #c22;
-}
-\ No newline at end of file
+}
+
+/* Tab navigation */
+ul.primary {
+  border-collapse: collapse;
+  padding: 0em 0em 0em 1em;
+  white-space: nowrap;
+  list-style: none;
+  margin: 5px;
+  height: auto;
+  line-height: normal;
+  border-bottom: 1px solid #bbb;
+}
+ul.primary li {
+  display: inline;
+}
+ul.primary li a {
+  background-color: #ddd;
+  border-color: #bbb;
+  border-width: 1px;
+  border-style: solid solid none solid;
+  height: auto;
+  margin-right: 0.5em;
+  padding: 0em 1em;
+  text-decoration: none;
+  text-transform: lowercase;
+}
+ul.primary li.active a {
+  background-color: #fff;
+  border: 1px solid #bbb;
+  border-bottom: #fff 1px solid;
+}
+ul.primary li a:hover {
+  background-color: #eee;
+  border-color: #ccc;
+  border-bottom-color: #eee;
+}
+ul.secondary {
+  padding: 0;
+  margin: 0.5em 2em 1em;
+}
+ul.secondary li {
+  display: inline;
+  padding: 0 1em;
+  border-right: 1px solid #ccc;
+}
+ul.secondary a {
+  padding: 0;
+  text-decoration: none;
+}
+ul.secondary a.active {
+  border-bottom: 4px solid #999;
+}
diff --git a/modules/comment.module b/modules/comment.module
index 09fa1801a..4dc82d346 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -1660,4 +1660,4 @@ function _comment_per_page() {
   return drupal_map_assoc(array(10, 30, 50, 70, 90));
 }
 
-?>
-\ No newline at end of file
+?>
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 09fa1801a..4dc82d346 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -1660,4 +1660,4 @@ function _comment_per_page() {
   return drupal_map_assoc(array(10, 30, 50, 70, 90));
 }
 
-?>
-\ No newline at end of file
+?>
diff --git a/themes/xtemplate/default/xtemplate.css b/themes/xtemplate/default/xtemplate.css
index 6b2ff09a3..5e2e7b2c2 100644
--- a/themes/xtemplate/default/xtemplate.css
+++ b/themes/xtemplate/default/xtemplate.css
@@ -186,93 +186,6 @@ table {
 .links a {
   font-weight: bold;
 }
-
-.tabs {
-  width: 100%;
-  diplay: block;
-  margin: 0;
-  padding: 0;
-  white-space: nowrap;
-}
-
-.tabs ul {
-  float: left;
-  diplay: block;
-  width: 100%;
-  margin: 0;
-  padding: 0;
-  list-style-type: none;
-}
-
-.tabs li {
-  float: left;
-  diplay: block;
-  width: auto;
-  margin: 0 0.2em 0 0.2em;
-  padding: 0;
-  list-style-type: none;
-}
-
-.tabs li a {
-  position: relative;
-  display: block;
-  margin: 0;
-  padding: 0 0.9em;
-  background-color: #eee;
-  border-top: 1px solid #888;
-  border-right: 1px solid #888;
-  border-bottom: 2px solid #fff;
-  border-left: 1px solid #888;
-  background-color: #fff;
-  text-align: center;
- }
-
-.tabs li.active a, .tabs li.active {
-  background-color: #eee;
-  border-top: 1px solid #bbb;
-  border-right: 1px solid #bbb;
-  border-bottom: 2px solid #eee;
-  border-left: 1px solid #ccc;
-  z-index: 2;
-}
-
-.tabs li.active ul {
-  display: inline;
-  float: none;
-  position: absolute;
-  padding: 0;
-  margin: 0;
-  border-top: 2px solid #888;
-  border-left: 2px solid #bbb;
-  background-color: none;
-  white-space: nowrap;
-}
-
-.tabs li.active ul li {
-  width: auto;
-  display: inline;
-  list-style: none;
-  margin: 0;
-  border: 0;
-  z-index: 1;
-}
-
-.tabs li.active ul li a {
-  width: auto;
-  margin: 0;
-  padding: 0;
-  background-color: #eee;
-  border-top: none;
-  border-right: 1px solid #bbb;
-  border-bottom: none;
-  border-left: none;
-  z-index: 2;
-}
-
-.clear-tabs {
-  clear: both;
-}
-
 .block, .box {
   padding: 0 0 1.5em 0;
 }
diff --git a/themes/xtemplate/default/xtemplate.xtmpl b/themes/xtemplate/default/xtemplate.xtmpl
index 2c8db0eef..c05d34534 100644
--- a/themes/xtemplate/default/xtemplate.xtmpl
+++ b/themes/xtemplate/default/xtemplate.xtmpl
@@ -47,7 +47,6 @@
         <h1 class="title">{title}</h1>
         <!-- BEGIN: tabs -->
         <div class="tabs">{tabs}</div>
-        <div class="clear-tabs"></div>
         <!-- END: tabs -->
         <!-- END: title -->
         <!-- BEGIN: help -->
diff --git a/themes/xtemplate/pushbutton/xtemplate.xtmpl b/themes/xtemplate/pushbutton/xtemplate.xtmpl
index 7b5bb0db6..47cfdec03 100644
--- a/themes/xtemplate/pushbutton/xtemplate.xtmpl
+++ b/themes/xtemplate/pushbutton/xtemplate.xtmpl
@@ -50,8 +50,12 @@
         <!-- BEGIN: title -->
         {breadcrumb}
         <h1 class="title">{title}</h1>
+        <!-- BEGIN: tabs -->
+        <div class="tabs">{tabs}</div>
+        <!-- END: tabs -->
+
         <!-- END: title -->
-        <!-- BEGIN: help -->
+          <!-- BEGIN: help -->
         <div id="help">{help}</div>
         <!-- END: help -->
         <!-- BEGIN: message -->