summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohnAlbin2009-08-12 22:17:26 (GMT)
committer JohnAlbin2009-08-12 22:17:26 (GMT)
commit72b2ad35d07b54aa7e49d983a380610eda28560d (patch)
treec551e0490a7fcd01fc3ec7a48ffbce4705c3f157
parent7f26cb6cb6d2faa93b679511f8d11320ad29db52 (diff)
#445814: Change primary/secondary link rendering and move secondary menu to footer
-rw-r--r--CHANGELOG.txt1
-rw-r--r--STARTERKIT/css/layout-fixed.css12
-rw-r--r--STARTERKIT/css/layout-liquid.css12
-rw-r--r--STARTERKIT/css/navigation.css6
-rw-r--r--templates/page.tpl.php22
5 files changed, 17 insertions, 36 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 1ae4e80..1c46c18 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -2,6 +2,7 @@
Zen 6.x-2.x-dev, xxxx-xx-xx (development release)
------------------------
+- #445814: Change primary/secondary link rendering and move secondary menu to footer
- #445822: Simplify wrapper divs around logo, site name, slogan
- #546862: Add D7's element-hidden and element-invisible for accessibility features
- #547382: Rename Zen's reset stylesheet to html-reset.css from html-elements.css
diff --git a/STARTERKIT/css/layout-fixed.css b/STARTERKIT/css/layout-fixed.css
index f45989b..76ac8f1 100644
--- a/STARTERKIT/css/layout-fixed.css
+++ b/STARTERKIT/css/layout-fixed.css
@@ -153,26 +153,20 @@ body {
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. */
- height: 3.6em; /* The navbar can have any arbritrary height. We picked one
- that is twice the line-height pluse 1em: 2 x 1.3 + 1 = 3.6
+ 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. */
}
.with-navbar #content,
.with-navbar #sidebar-first,
.with-navbar #sidebar-second {
- margin-top: 3.6em; /* Set this to the same value as the navbar height above. */
+ margin-top: 2.3em; /* Set this to the same value as the navbar height above. */
}
#navbar-inner {
}
-#primary {
-}
-
-#secondary {
-}
-
#navbar ul /* Primary and secondary links */ {
margin: 0;
padding: 0;
diff --git a/STARTERKIT/css/layout-liquid.css b/STARTERKIT/css/layout-liquid.css
index c92a325..e42d3d3 100644
--- a/STARTERKIT/css/layout-liquid.css
+++ b/STARTERKIT/css/layout-liquid.css
@@ -143,26 +143,20 @@ body {
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. */
- height: 3.6em; /* The navbar can have any arbritrary height. We picked one
- that is twice the line-height pluse 1em: 2 x 1.3 + 1 = 3.6
+ 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. */
}
.with-navbar #content,
.with-navbar #sidebar-first,
.with-navbar #sidebar-second {
- margin-top: 3.6em; /* Set this to the same value as the navbar height above. */
+ margin-top: 2.3em; /* Set this to the same value as the navbar height above. */
}
#navbar-inner {
}
-#primary {
-}
-
-#secondary {
-}
-
#navbar ul /* Primary and secondary links */ {
margin: 0;
padding: 0;
diff --git a/STARTERKIT/css/navigation.css b/STARTERKIT/css/navigation.css
index bc27ffc..1baea1d 100644
--- a/STARTERKIT/css/navigation.css
+++ b/STARTERKIT/css/navigation.css
@@ -23,12 +23,12 @@ li a.active {
}
/*
- * Primary and Secondary links
+ * Primary and Secondary menu links
*/
-#primary {
+#main-menu {
}
-#secondary {
+#secondary-menu {
}
/*
diff --git a/templates/page.tpl.php b/templates/page.tpl.php
index b00c1b3..1ff5059 100644
--- a/templates/page.tpl.php
+++ b/templates/page.tpl.php
@@ -100,7 +100,7 @@
<div id="page"><div id="page-inner">
- <?php if ($primary_links || $secondary_links || $navbar): ?>
+ <?php if ($primary_links || $navbar): ?>
<div id="skip-to-nav"><a href="#navigation"><?php print t('Skip to Navigation'); ?></a></div>
<?php endif; ?>
@@ -146,7 +146,7 @@
</div></div> <!-- /#header-inner, /#header -->
- <div id="main"><div id="main-inner" class="clearfix<?php if ($primary_links || $secondary_links || $navbar) { print ' with-navbar'; } ?>">
+ <div id="main"><div id="main-inner" class="clearfix<?php if ($primary_links || $navbar) { print ' with-navbar'; } ?>">
<div id="content"><div id="content-inner">
@@ -190,22 +190,12 @@
</div></div> <!-- /#content-inner, /#content -->
- <?php if ($primary_links || $secondary_links || $navbar): ?>
+ <?php if ($primary_links || $navbar): ?>
<div id="navbar"><div id="navbar-inner" class="clearfix region region-navbar">
<a name="navigation" id="navigation"></a>
- <?php if ($primary_links): ?>
- <div id="primary">
- <?php print theme('links', $primary_links); ?>
- </div> <!-- /#primary -->
- <?php endif; ?>
-
- <?php if ($secondary_links): ?>
- <div id="secondary">
- <?php print theme('links', $secondary_links); ?>
- </div> <!-- /#secondary -->
- <?php endif; ?>
+ <?php print theme('links', $primary_links, array('id' => 'main-menu', 'class' => 'links clearfix')); ?>
<?php print $navbar; ?>
@@ -226,9 +216,11 @@
</div></div> <!-- /#main-inner, /#main -->
- <?php if ($footer || $footer_message): ?>
+ <?php if ($footer || $footer_message || $secondary_links): ?>
<div id="footer"><div id="footer-inner" class="region region-footer">
+ <?php print theme('links', $secondary_links, array('id' => 'secondary-menu', 'class' => 'links clearfix')); ?>
+
<?php if ($footer_message): ?>
<div id="footer-message"><?php print $footer_message; ?></div>
<?php endif; ?>