#93187: Add header region to Garland theme

3 files changed, 43 insertions, 5 deletions

diff --git a/themes/garland/fix-ie.css b/themes/garland/fix-ie.css
index c45020c95..bc5cd7c4f 100644
--- a/themes/garland/fix-ie.css
+++ b/themes/garland/fix-ie.css
@@ -12,7 +12,7 @@ body {
   font-size: 80%;
 }
 
-#wrapper #container {
+#header-region, #wrapper #container {
   /* Reset text alignment */
   text-align: left;
 }
@@ -52,3 +52,8 @@ td.menu-disabled {
   /* Use filter to emulate CSS3 opacity */
   filter: alpha(opacity=50);
 }
+
+#header-region {
+  /* Because of the lack of min-height, we use height as an alternative */
+  height: 1em;
+}
\ No newline at end of file
diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php
index e4682228f..df2c95e31 100644
--- a/themes/garland/page.tpl.php
+++ b/themes/garland/page.tpl.php
@@ -13,7 +13,7 @@
   <body<?php print phptemplate_body_class($sidebar_left, $sidebar_right); ?>>
 
 <!-- Layout -->
-  <div id="navigation"></div>
+  <div id="header-region" class="clear-block"><?php print $header; ?></div>
 
     <div id="wrapper">
     <div id="container" class="clear-block">
diff --git a/themes/garland/style.css b/themes/garland/style.css
index 62bae8625..6fb3bd007 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -263,10 +263,43 @@ table .form-button, table .form-submit {
 /**
  * Layout
  */
+#header-region {
+  min-height: 1em;
+  background: #d2e6f3 url("images/bg-navigation.png") repeat-x 50% 100%;
+}
+
+#header-region .block {
+  display: block;
+  margin: 0 1em;
+}
+
+#header-region .block-region {
+  display: block;
+  margin: 0 0.5em 1em;
+  padding: 0.5em;
+  position: relative;
+  top: 0.5em;
+}
 
-#navigation {
-  height: 1em;
-  background: url(images/bg-navigation.png) repeat-x 50% 100%;
+#header-region * {
+  display: inline;
+  line-height: 1.5em;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+#header-region p, #header-region img {
+  margin-top: 0.5em;
+}
+
+#header-region h2 {
+  margin: 0 1em 0 0;
+}
+
+#header-region h3, #header-region label, #header-region li {
+  margin: 0 1em;
+  padding: 0;
+  background: none;
 }
 
 #wrapper {