Commit a61ac857 authored by Dries's avatar Dries

- Rollback of #997408.

parent db5ac75c
......@@ -2172,13 +2172,17 @@ function menu_local_tabs() {
function theme_menu_local_tasks(&$variables) {
$output = '';
if ($primary = drupal_render($variables['primary'])) {
$output .= '<h2 class="element-invisible">' . t('Primary tabs') . '</h2>';
$output .= '<ul class="tabs primary">' . $primary . '</ul>';
}
if ($secondary = drupal_render($variables['secondary'])) {
$output .= '<h2 class="element-invisible">' . t('Secondary tabs') . '</h2>';
$output .= '<ul class="tabs secondary">' . $secondary . '</ul>';
if (!empty($variables['primary'])) {
$variables['primary']['#prefix'] = '<h2 class="element-invisible">' . t('Primary tabs') . '</h2>';
$variables['primary']['#prefix'] .= '<ul class="tabs primary">';
$variables['primary']['#suffix'] = '</ul>';
$output .= drupal_render($variables['primary']);
}
if (!empty($variables['secondary'])) {
$variables['secondary']['#prefix'] = '<h2 class="element-invisible">' . t('Secondary tabs') . '</h2>';
$variables['secondary']['#prefix'] .= '<ul class="tabs secondary">';
$variables['secondary']['#suffix'] = '</ul>';
$output .= drupal_render($variables['secondary']);
}
return $output;
......
......@@ -124,7 +124,7 @@
<?php print render($title_prefix); ?>
<?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
<?php print render($title_suffix); ?>
<?php if ($tabs = render($tabs)): ?><div class="tabs"><?php print $tabs; ?></div><?php endif; ?>
<?php if ($tabs): ?><div class="tabs"><?php print render($tabs); ?></div><?php endif; ?>
<?php print render($page['help']); ?>
<?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
<?php print render($page['content']); ?>
......
......@@ -192,9 +192,9 @@
</h1>
<?php endif; ?>
<?php print render($title_suffix); ?>
<?php if ($tabs = render($tabs)): ?>
<?php if ($tabs): ?>
<div class="tabs">
<?php print $tabs; ?>
<?php print render($tabs); ?>
</div>
<?php endif; ?>
<?php print render($page['help']); ?>
......
......@@ -46,7 +46,7 @@
<h1<?php print $tabs ? ' class="with-tabs"' : '' ?>><?php print $title ?></h1>
<?php endif; ?>
<?php print render($title_suffix); ?>
<?php if ($tabs = render($tabs)): ?><?php print $tabs; ?></div><?php endif; ?>
<?php if ($tabs): ?><?php print render($tabs); ?></div><?php endif; ?>
<?php print render($tabs2); ?>
<?php print $messages; ?>
<?php print render($page['help']); ?>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment