diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-09-09 15:27:08 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-09-09 15:27:08 +0000 |
| commit | b1099651988afe22ee1bb7a21dbc87b70072e9e1 (patch) | |
| tree | ccaf4732277b541f865fd382f723a52c3fd636ce /themes/bartik/templates | |
| parent | 13bd2f972b5e6807fbd5cf379a39b429eb0e880e (diff) | |
| download | brdo-b1099651988afe22ee1bb7a21dbc87b70072e9e1.tar.gz brdo-b1099651988afe22ee1bb7a21dbc87b70072e9e1.tar.bz2 | |
#889982 by Jeff Burn: Move secondary links to the header in Bartik.
Diffstat (limited to 'themes/bartik/templates')
| -rw-r--r-- | themes/bartik/templates/page.tpl.php | 42 |
1 files changed, 23 insertions, 19 deletions
diff --git a/themes/bartik/templates/page.tpl.php b/themes/bartik/templates/page.tpl.php index 1d487bdd2..1727dff6b 100644 --- a/themes/bartik/templates/page.tpl.php +++ b/themes/bartik/templates/page.tpl.php @@ -124,11 +124,11 @@ <?php print render($page['header']); ?> <?php if ($main_menu): ?> - <div id="navigation"><div class="section clearfix"> + <div id="main-menu" class="navigation"> <?php print theme('links__system_main_menu', array( 'links' => $main_menu, 'attributes' => array( - 'id' => 'main-menu', + 'id' => 'main-menu-links', 'class' => array('links', 'clearfix'), ), 'heading' => array( @@ -137,7 +137,24 @@ 'class' => array('element-invisible'), ), )); ?> - </div></div> <!-- /.section, /#navigation --> + </div> <!-- /#main-menu --> + <?php endif; ?> + + <?php if ($secondary_menu): ?> + <div id="secondary-menu" class="navigation"> + <?php print theme('links__system_secondary_menu', array( + 'links' => $secondary_menu, + 'attributes' => array( + 'id' => 'secondary-menu-links', + 'class' => array('links', 'clearfix'), + ), + 'heading' => array( + 'text' => t('Secondary menu'), + 'level' => 'h2', + 'class' => array('element-invisible'), + ), + )); ?> + </div> <!-- /#secondary-menu --> <?php endif; ?> </div></div> <!-- /.section, /#header --> @@ -166,7 +183,6 @@ </div></div> <!-- /.section, /#sidebar-first --> <?php endif; ?> - <div id="content" class="column"><div class="section"> <?php if ($page['highlighted']): ?><div id="highlighted"><?php print render($page['highlighted']); ?></div><?php endif; ?> <a id="main-content"></a> @@ -217,25 +233,13 @@ <?php print render($page['footer_secondcolumn']); ?> <?php print render($page['footer_thirdcolumn']); ?> <?php print render($page['footer_fourthcolumn']); ?> - </div><!-- /#footer-columns --> + </div> <!-- /#footer-columns --> <?php endif; ?> - <?php if ($page['footer'] || $secondary_menu): ?> + <?php if ($page['footer']): ?> <div id="footer" class="clearfix"> - <?php print theme('links__system_secondary_menu', array( - 'links' => $secondary_menu, - 'attributes' => array( - 'id' => 'secondary-menu', - 'class' => array('links', 'clearfix'), - ), - 'heading' => array( - 'text' => t('Secondary menu'), - 'level' => 'h2', - 'class' => array('element-invisible'), - ), - )); ?> <?php print render($page['footer']); ?> - </div><!-- /#footer --> + </div> <!-- /#footer --> <?php endif; ?> </div></div> <!-- /.section, /#footer-wrapper --> |