Index: themes/garland/page.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/page.tpl.php,v
retrieving revision 1.1
diff -u -r1.1 page.tpl.php
--- themes/garland/page.tpl.php	29 Oct 2006 13:17:38 -0000	1.1
+++ themes/garland/page.tpl.php	18 Nov 2006 22:30:00 -0000
@@ -1,6 +1,18 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language ?>" lang="<?php print $language ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language ?>" lang="<?php print $language ?>"><?php
+global $_menu;
+$primary = $_menu['items'][variable_get('menu_primary_menu',0)]['children'];
+$primary_links = '<ul class="links primary-links">';
+foreach ($primary as $link_id)
+  {
+  $primary_links .= '<li>'
+    . theme('menu_item_link', $_menu['items'][$link_id], $_menu['items'][$link_id])
+    . "</li>\n";
+  }
+$primary_links .= "</ul>\n";
+//dprint_r($primary_links);
+?>
   <head>
     <title><?php print $head_title ?></title>
     <?php print $head ?>
@@ -44,12 +56,11 @@
         </div>
 
         <?php if (isset($primary_links)) : ?>
-          <?php print theme('links', $primary_links, array('class' => 'links primary-links')) ?>
+          <?php print $primary_links /* theme('links', $primary_links, array('class' => 'links primary-links')) */ ?>
         <?php endif; ?>
         <?php if (isset($secondary_links)) : ?>
           <?php print theme('links', $secondary_links, array('class' => 'links secondary-links')) ?>
         <?php endif; ?>
-
       </div> <!-- /header -->
 
       <?php if ($sidebar_left): ?>
@@ -60,8 +71,9 @@
       <?php endif; ?>
 
       <div id="center"><div id="squeeze"><div class="right-corner"><div class="left-corner">
-          <?php if ($breadcrumb): print $breadcrumb; endif; ?>
           <?php if ($mission): print '<div id="mission">'. $mission .'</div>'; endif; ?>
+          <?php if ($header): print '<div id="header-region">'. $header .'</div>'; endif; ?>
+          <?php if ($breadcrumb): print $breadcrumb; endif; ?>
 
           <?php if ($tabs): print '<div id="tabs-wrapper" class="clear-block">'; endif; ?>
           <?php if ($title): print '<h2'. ($tabs ? ' class="with-tabs"' : '') .'>'. $title .'</h2>'; endif; ?>
@@ -82,11 +94,11 @@
           <?php print $sidebar_right ?>
         </div>
       <?php endif; ?>
-
+    <div style="clear:both" />
     </div> <!-- /container -->
   </div>
 <!-- /layout -->
 
   <?php print $closure ?>
   </body>
-</html>
\ No newline at end of file
+</html>
Index: themes/garland/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style.css,v
retrieving revision 1.5
diff -u -r1.5 style.css
--- themes/garland/style.css	12 Nov 2006 17:25:45 -0000	1.5
+++ themes/garland/style.css	18 Nov 2006 22:16:00 -0000
@@ -456,7 +456,7 @@
   padding: 1em;
   background-color: #fff;
   border: 1px solid #e0e5fb;
-  margin-bottom: 2em;
+  margin-bottom: 1em;
 }
 
 /**
@@ -711,10 +711,11 @@
 tr.even td.menu-disabled {
   background-color: #fff;
 }
+/*
 td.menu-disabled {
   opacity: 0.5;
 }
-
+*/
 /**
  * Poll.module
  */
@@ -940,3 +941,7 @@
   background-color: #dfd;
   border-color: #beb;
 }
+
+.clear-block {
+  display: block;
+}
