summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnAlbin2009-10-15 15:48:21 (GMT)
committer JohnAlbin2009-10-15 15:48:21 (GMT)
commitfdb523d3e75e322a2140aa7aacf6713a6e36f582 (patch)
tree14a9a62d92f32fb81f97ea061f88055049ce11ed
parent94f892798029746150f79f55465f575e5fdd462b (diff)
Simplified header, content_top, content_bottom, navbar, and footer region markup
-rw-r--r--CHANGELOG.txt1
-rw-r--r--STARTERKIT/css/layout-fixed.css8
-rw-r--r--STARTERKIT/css/layout-liquid.css8
-rw-r--r--STARTERKIT/css/navigation.css2
-rw-r--r--STARTERKIT/css/page-backgrounds.css2
-rw-r--r--STARTERKIT/css/pages.css8
-rw-r--r--STARTERKIT/css/wireframes.css4
-rw-r--r--templates/maintenance-page.tpl.php26
-rw-r--r--templates/page.tpl.php26
9 files changed, 31 insertions, 54 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index c440de2..24dc489 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,7 @@
Zen 6.x-2.x-dev, xxxx-xx-xx (development release)
------------------------
+- Simplified header, content_top, content_bottom, navbar, and footer region markup
- Add region.tpl.php template
- Render $edit_links_array in zen_process_block
- #546858: Add THEME_process_HOOK functions to Zen
diff --git a/STARTERKIT/css/layout-fixed.css b/STARTERKIT/css/layout-fixed.css
index 76ac8f1..da93b61 100644
--- a/STARTERKIT/css/layout-fixed.css
+++ b/STARTERKIT/css/layout-fixed.css
@@ -95,7 +95,7 @@ body {
#search-box {
}
-#header-blocks {
+.region-header {
clear: both; /* Clear the logo */
}
@@ -152,7 +152,7 @@ body {
width: 100%;
margin-left: 0; /* LTR */
margin-right: -100%; /* LTR */ /* Negative value of #navbar's width + left margin. */
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */
+ padding: 0; /* DO NOT CHANGE. Add padding or margin to .region-navbar. */
height: 2.3em; /* The navbar can have any arbritrary height. We picked one
that is the line-height plus 1em: 1.3 + 1 = 2.3
Set this to the same value as the margin-top below. */
@@ -164,7 +164,7 @@ body {
margin-top: 2.3em; /* Set this to the same value as the navbar height above. */
}
-#navbar-inner {
+.region-navbar {
}
#navbar ul /* Primary and secondary links */ {
@@ -216,7 +216,7 @@ body {
#footer {
}
-#footer-inner {
+.region-footer {
}
/*
diff --git a/STARTERKIT/css/layout-liquid.css b/STARTERKIT/css/layout-liquid.css
index e42d3d3..dca46ce 100644
--- a/STARTERKIT/css/layout-liquid.css
+++ b/STARTERKIT/css/layout-liquid.css
@@ -88,7 +88,7 @@ body {
#search-box {
}
-#header-blocks {
+.region-header {
clear: both; /* Clear the logo */
}
@@ -142,7 +142,7 @@ body {
width: 100%;
margin-left: 0; /* LTR */
margin-right: -100%; /* LTR */ /* Negative value of #navbar's width + left margin. */
- padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */
+ padding: 0; /* DO NOT CHANGE. Add padding or margin to .region-navbar. */
height: 2.3em; /* The navbar can have any arbritrary height. We picked one
that is the line-height plus 1em: 1.3 + 1 = 2.3
Set this to the same value as the margin-top below. */
@@ -154,7 +154,7 @@ body {
margin-top: 2.3em; /* Set this to the same value as the navbar height above. */
}
-#navbar-inner {
+.region-navbar {
}
#navbar ul /* Primary and secondary links */ {
@@ -206,7 +206,7 @@ body {
#footer {
}
-#footer-inner {
+.region-footer {
}
/*
diff --git a/STARTERKIT/css/navigation.css b/STARTERKIT/css/navigation.css
index 1baea1d..5922fdd 100644
--- a/STARTERKIT/css/navigation.css
+++ b/STARTERKIT/css/navigation.css
@@ -19,7 +19,7 @@ li a.active {
#navbar {
}
-#navbar-inner {
+.region-navbar {
}
/*
diff --git a/STARTERKIT/css/page-backgrounds.css b/STARTERKIT/css/page-backgrounds.css
index f821870..bfae75d 100644
--- a/STARTERKIT/css/page-backgrounds.css
+++ b/STARTERKIT/css/page-backgrounds.css
@@ -36,5 +36,5 @@ body {
#footer {
}
-#footer-inner {
+.region-footer {
}
diff --git a/STARTERKIT/css/pages.css b/STARTERKIT/css/pages.css
index e637776..b0c59ef 100644
--- a/STARTERKIT/css/pages.css
+++ b/STARTERKIT/css/pages.css
@@ -62,7 +62,7 @@ div#site-name /* The name of the website */ {
#site-slogan /* The slogan (or tagline) of a website */ {
}
-#header-blocks /* Wrapper for any blocks placed in the header region */ {
+.region-header /* Wrapper for any blocks placed in the header region */ {
}
/*
@@ -86,7 +86,7 @@ div#site-name /* The name of the website */ {
#mission /* The mission statement of the site (displayed on homepage) */ {
}
-#content-top /* Wrapper for any blocks placed in the "content top" region */ {
+.region-content-top /* Wrapper for any blocks placed in the "content top" region */ {
}
#content-header /* Wrapper for breadcrumb, title, messages, tabs, and help */ {
@@ -183,7 +183,7 @@ ul.links li {
text-align: right; /* LTR */
}
-#content-bottom /* Wrapper for any blocks placed in the "content bottom" region */ {
+.region-content-bottom /* Wrapper for any blocks placed in the "content bottom" region */ {
}
/*
@@ -216,7 +216,7 @@ ul.links li {
#footer {
}
-#footer-inner {
+.region-footer {
}
#footer-message /* Wrapper for the footer message from Drupal's "Site information"
diff --git a/STARTERKIT/css/wireframes.css b/STARTERKIT/css/wireframes.css
index e7e16c3..c9c5d4b 100644
--- a/STARTERKIT/css/wireframes.css
+++ b/STARTERKIT/css/wireframes.css
@@ -11,10 +11,10 @@
.with-wireframes #header-inner,
.with-wireframes #content-inner,
.with-wireframes #content-inner>*,
-.with-wireframes #navbar-inner,
+.with-wireframes .region-navbar,
.with-wireframes #sidebar-first-inner,
.with-wireframes #sidebar-second-inner,
-.with-wireframes #footer-inner {
+.with-wireframes .region-footer {
margin: 1px;
padding: 2px;
border: 1px solid #ccc;
diff --git a/templates/maintenance-page.tpl.php b/templates/maintenance-page.tpl.php
index 69d893e..cb9141d 100644
--- a/templates/maintenance-page.tpl.php
+++ b/templates/maintenance-page.tpl.php
@@ -52,11 +52,7 @@
</div> <!-- /#name-and-slogan -->
<?php endif; ?>
- <?php if ($header): ?>
- <div id="header-blocks" class="region region-header">
- <?php print $header; ?>
- </div> <!-- /#header-blocks -->
- <?php endif; ?>
+ <?php print $header; ?>
</div></div> <!-- /#header-inner, /#header -->
@@ -64,11 +60,7 @@
<div id="content"><div id="content-inner">
- <?php if ($content_top): ?>
- <div id="content-top" class="region region-content_top">
- <?php print $content_top; ?>
- </div> <!-- /#content-top -->
- <?php endif; ?>
+ <?php print $content_top; ?>
<?php if ($title || $messages): ?>
<div id="content-header">
@@ -83,21 +75,17 @@
<?php print $content; ?>
</div>
- <?php if ($content_bottom): ?>
- <div id="content-bottom" class="region region-content_bottom">
- <?php print $content_bottom; ?>
- </div> <!-- /#content-bottom -->
- <?php endif; ?>
+ <?php print $content_bottom; ?>
</div></div> <!-- /#content-inner, /#content -->
<?php if ($navbar): ?>
- <div id="navbar"><div id="navbar-inner" class="clearfix region region-navbar">
+ <div id="navbar">
<a name="navigation" id="navigation"></a>
<?php print $navbar; ?>
- </div></div> <!-- /#navbar-inner, /#navbar -->
+ </div> <!-- /#navbar -->
<?php endif; ?>
<?php if ($left): ?>
@@ -115,7 +103,7 @@
</div></div> <!-- /#main-inner, /#main -->
<?php if ($footer || $footer_message): ?>
- <div id="footer"><div id="footer-inner" class="region region-footer">
+ <div id="footer">
<?php if ($footer_message): ?>
<div id="footer-message"><?php print $footer_message; ?></div>
@@ -123,7 +111,7 @@
<?php print $footer; ?>
- </div></div> <!-- /#footer-inner, /#footer -->
+ </div> <!-- /#footer -->
<?php endif; ?>
</div></div> <!-- /#page-inner, /#page -->
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index 0698770..b0d86c3 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -138,11 +138,7 @@
<div id="search-box"><?php print $search_box; ?></div>
<?php endif; ?>
- <?php if ($header): ?>
- <div id="header-blocks" class="region region-header">
- <?php print $header; ?>
- </div> <!-- /#header-blocks -->
- <?php endif; ?>
+ <?php print $header; ?>
</div></div> <!-- /#header-inner, /#header -->
@@ -154,11 +150,7 @@
<div id="mission"><?php print $mission; ?></div>
<?php endif; ?>
- <?php if ($content_top): ?>
- <div id="content-top" class="region region-content_top">
- <?php print $content_top; ?>
- </div> <!-- /#content-top -->
- <?php endif; ?>
+ <?php print $content_top; ?>
<?php if ($breadcrumb || $title || $tabs || $help || $messages): ?>
<div id="content-header">
@@ -182,16 +174,12 @@
<div class="feed-icons"><?php print $feed_icons; ?></div>
<?php endif; ?>
- <?php if ($content_bottom): ?>
- <div id="content-bottom" class="region region-content_bottom">
- <?php print $content_bottom; ?>
- </div> <!-- /#content-bottom -->
- <?php endif; ?>
+ <?php print $content_bottom; ?>
</div></div> <!-- /#content-inner, /#content -->
<?php if ($primary_links || $navbar): ?>
- <div id="navbar"><div id="navbar-inner" class="clearfix region region-navbar">
+ <div id="navbar">
<a name="navigation" id="navigation"></a>
@@ -199,7 +187,7 @@
<?php print $navbar; ?>
- </div></div> <!-- /#navbar-inner, /#navbar -->
+ </div> <!-- /#navbar -->
<?php endif; ?>
<?php if ($left): ?>
@@ -217,7 +205,7 @@
</div></div> <!-- /#main-inner, /#main -->
<?php if ($footer || $footer_message || $secondary_links): ?>
- <div id="footer"><div id="footer-inner" class="region region-footer">
+ <div id="footer">
<?php print theme('links', $secondary_links, array('id' => 'secondary-menu', 'class' => 'links clearfix')); ?>
@@ -227,7 +215,7 @@
<?php print $footer; ?>
- </div></div> <!-- /#footer-inner, /#footer -->
+ </div> <!-- /#footer -->
<?php endif; ?>
</div></div> <!-- /#page-inner, /#page -->