diff options
| author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-20 04:03:51 +0000 |
|---|---|---|
| committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-20 04:03:51 +0000 |
| commit | 1a91990cae84f045b774e0eb308334dea1e97b28 (patch) | |
| tree | 8ce6d346117837a69d06850c132013eab6b3295d /themes/seven | |
| parent | aa10522336e69d462176e7505f3cdc00c3cf85d7 (diff) | |
| download | brdo-1a91990cae84f045b774e0eb308334dea1e97b28.tar.gz brdo-1a91990cae84f045b774e0eb308334dea1e97b28.tar.bz2 | |
#599706 follow-up by JohnAlbin, sun: Regression: Restore consistency to theme_menu_local_tasks() theme function
Diffstat (limited to 'themes/seven')
| -rw-r--r-- | themes/seven/page.tpl.php | 10 | ||||
| -rw-r--r-- | themes/seven/style.css | 1 | ||||
| -rw-r--r-- | themes/seven/template.php | 8 |
3 files changed, 8 insertions, 11 deletions
diff --git a/themes/seven/page.tpl.php b/themes/seven/page.tpl.php index 72fd6d02a..c8ff98abf 100644 --- a/themes/seven/page.tpl.php +++ b/themes/seven/page.tpl.php @@ -8,17 +8,11 @@ <h1 class="page-title"><?php print $title; ?></h1> <?php endif; ?> <?php print render($title_suffix); ?> - <?php if ($primary_local_tasks): ?> - <h2 class="element-invisible"><?php print t('Primary tabs'); ?></h2> - <ul class="tabs primary"><?php print render($primary_local_tasks); ?></ul> - <?php endif; ?> + <?php print render($primary_local_tasks); ?> </div> <div id="page"> - <?php if ($secondary_local_tasks): ?> - <h2 class="element-invisible"><?php print t('Secondary tabs'); ?></h2> - <ul class="tabs secondary"><?php print render($secondary_local_tasks); ?></ul> - <?php endif; ?> + <?php print render($secondary_local_tasks); ?> <div id="content" class="clearfix"> <div class="element-invisible"><a id="main-content"></a></div> diff --git a/themes/seven/style.css b/themes/seven/style.css index deca79bd9..df7f3de36 100644 --- a/themes/seven/style.css +++ b/themes/seven/style.css @@ -869,7 +869,6 @@ ol.task-list li.done { background-color: #fff; padding-top: 15px; } -.overlay .primary, .overlay #branding h1.page-title, .overlay #left, .overlay #footer { diff --git a/themes/seven/template.php b/themes/seven/template.php index 78d41f168..0b0afc192 100644 --- a/themes/seven/template.php +++ b/themes/seven/template.php @@ -27,8 +27,12 @@ function seven_preprocess_html(&$vars) { * Override or insert variables into the page template. */ function seven_preprocess_page(&$vars) { - $vars['primary_local_tasks'] = menu_primary_local_tasks(); - $vars['secondary_local_tasks'] = menu_secondary_local_tasks(); + $vars['primary_local_tasks'] = $vars['tabs']; + unset($vars['primary_local_tasks']['#secondary']); + $vars['secondary_local_tasks'] = array( + '#theme' => 'menu_local_tasks', + '#secondary' => $vars['tabs']['#secondary'], + ); } /** |