#60552 by JohnAlbin: Added Add region.tpl.php for all regions in themes.

4 files changed, 26 insertions, 17 deletions

diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php
index fffc233b1..ca3b563b8 100644
--- a/themes/garland/page.tpl.php
+++ b/themes/garland/page.tpl.php
@@ -1,7 +1,7 @@
 <?php
 // $Id$
 ?>
-  <div id="header-region" class="clearfix"><?php print render($page['header']); ?></div>
+  <?php print render($page['header']); ?>
 
   <div id="wrapper">
     <div id="container" class="clearfix">
@@ -42,7 +42,7 @@
             <?php print render($page['content']); ?>
           </div>
           <?php print $feed_icons ?>
-          <div id="footer"><?php print render($page['footer']) ?></div>
+          <?php print render($page['footer']) ?>
       </div></div></div></div> <!-- /.left-corner, /.right-corner, /#squeeze, /#center -->
 
       <?php if ($page['sidebar_second']): ?>
diff --git a/themes/garland/style-rtl.css b/themes/garland/style-rtl.css
index 71fb9be81..729f9fad9 100644
--- a/themes/garland/style-rtl.css
+++ b/themes/garland/style-rtl.css
@@ -72,7 +72,7 @@ dl dd {
   margin: 2em 0 1em 0.5em;
 }
 
-#header-region h2 {
+.region-header h2 {
   margin: 0 0 0 1em;
 }
 
diff --git a/themes/garland/style.css b/themes/garland/style.css
index 801ed1a47..2b1f7d54a 100644
--- a/themes/garland/style.css
+++ b/themes/garland/style.css
@@ -218,7 +218,7 @@ tr.even td.active {
   background-color: #e6f1f7;
 }
 
-td.region, td.module, td.container, td.category {
+td.region-title, td.module, td.container, td.category {
   border-top: 1.5em solid #fff;
   border-bottom: 1px solid #b4d7f0;
   background-color: #d4e7f3;
@@ -226,7 +226,7 @@ td.region, td.module, td.container, td.category {
   font-weight: bold;
 }
 
-tr:first-child td.region, tr:first-child td.module, tr:first-child td.container, tr:first-child td.category {
+tr:first-child td.region-title, tr:first-child td.module, tr:first-child td.container, tr:first-child td.category {
   border-top-width: 0;
 }
 
@@ -293,17 +293,17 @@ table .form-button, table .form-submit {
 /**
  * Layout
  */
-#header-region {
+.region-header {
   min-height: 1em;
   background: #d2e6f3 url(images/bg-navigation.png) repeat-x 50% 100%;
 }
 
-#header-region .block {
+.region-header .block {
   display: block;
   margin: 0 1em;
 }
 
-#header-region .block-region {
+.region-header .block-region {
   display: block;
   margin: 0 0.5em 1em;
   padding: 0.5em;
@@ -311,7 +311,7 @@ table .form-button, table .form-submit {
   top: 0.5em;
 }
 
-#header-region * {
+.region-header * {
   display: inline;
   line-height: 1.5em;
   margin-top: 0;
@@ -319,19 +319,19 @@ table .form-button, table .form-submit {
 }
 
 /* Prevent the previous directive from showing the content of script elements in Mozilla browsers. */
-#header-region script {
+.region-header script {
   display: none;
 }
 
-#header-region p, #header-region img {
+.region-header p, .region-header img {
   margin-top: 0.5em;
 }
 
-#header-region h2 {
+.region-header h2 {
   margin: 0 1em 0 0; /* LTR */
 }
 
-#header-region h3, #header-region label, #header-region li {
+.region-header h3, .region-header label, .region-header li {
   margin: 0 1em;
   padding: 0;
   background: none;
@@ -471,7 +471,7 @@ body.two-sidebars #squeeze {
   min-height: 400px;
 }
 
-#wrapper #container #footer {
+#wrapper #container .region-footer {
   float: none;
   clear: both;
   text-align: center;
@@ -486,15 +486,15 @@ body.two-sidebars #squeeze {
   z-index: 3;
 }
 
-body.sidebar-first #footer {
+body.sidebar-first .region-footer {
   margin-left: -210px;
 }
 
-body.sidebar-second #footer {
+body.sidebar-second .region-footer {
   margin-right: -210px;
 }
 
-body.two-sidebars #footer {
+body.two-sidebars .region-footer {
   margin: 0 -210px;
 }
 
diff --git a/themes/garland/template.php b/themes/garland/template.php
index 560020315..154216c41 100644
--- a/themes/garland/template.php
+++ b/themes/garland/template.php
@@ -93,6 +93,15 @@ function garland_process_page(&$vars) {
 }
 
 /**
+ * Override or insert variables into the region template.
+ */
+function garland_preprocess_region(&$vars) {
+  if ($vars['region'] == 'header') {
+    $vars['classes_array'][] = 'clearfix';
+  }
+}
+
+/**
  * Returns the rendered local tasks. The default implementation renders
  * them as tabs. Overridden to split the secondary tasks.
  */