Commit 408d4caf authored by Gábor Hojtsy's avatar Gábor Hojtsy

#202821 by marco.robotangel: display messages above help in all core themes...

#202821 by marco.robotangel: display messages above help in all core themes for consistent user feedback (usability)
parent 19619d93
......@@ -42,8 +42,8 @@
<?php print $breadcrumb ?>
<h1 class="title"><?php print $title ?></h1>
<div class="tabs"><?php print $tabs ?></div>
<?php print $help ?>
<?php if ($show_messages) { print $messages; } ?>
<?php print $help ?>
<?php print $content; ?>
<?php print $feed_icons; ?>
</div>
......
......@@ -80,12 +80,12 @@ function chameleon_page($content, $show_blocks = TRUE, $show_messages = TRUE) {
$output .= $tabs;
}
$output .= theme('help');
if ($show_messages) {
$output .= theme('status_messages');
}
$output .= theme('help');
$output .= "\n<!-- begin content -->\n";
$output .= $content;
$output .= drupal_get_feeds();
......
......@@ -70,8 +70,8 @@
<?php if ($title): print '<h2'. ($tabs ? ' class="with-tabs"' : '') .'>'. $title .'</h2>'; endif; ?>
<?php if ($tabs): print '<ul class="tabs primary">'. $tabs .'</ul></div>'; endif; ?>
<?php if ($tabs2): print '<ul class="tabs secondary">'. $tabs2 .'</ul>'; endif; ?>
<?php print $help; ?>
<?php if ($show_messages && $messages): print $messages; endif; ?>
<?php print $help; ?>
<div class="clear-block">
<?php print $content ?>
</div>
......
......@@ -74,14 +74,14 @@
<?php endif; ?>
<?php if ($help != ""): ?>
<div id="help"><?php print $help ?></div>
<?php endif; ?>
<?php if ($show_messages && $messages != ""): ?>
<?php print $messages ?>
<?php endif; ?>
<?php if ($help != ""): ?>
<div id="help"><?php print $help ?></div>
<?php endif; ?>
<!-- start main content -->
<?php print $content; ?>
<?php print $feed_icons; ?>
......
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