summaryrefslogtreecommitdiff
path: root/themes
diff options
context:
space:
mode:
authorGábor Hojtsy <gabor@hojtsy.hu>2008-01-07 13:49:38 +0000
committerGábor Hojtsy <gabor@hojtsy.hu>2008-01-07 13:49:38 +0000
commit408d4cafebd769baeea7b59bc09ffc74922d842b (patch)
treef6308c8628dca846dfa6cb705ce980283bbab94c /themes
parent19619d93542b4588e0d80f2a522cf4b08f2ac563 (diff)
downloadbrdo-408d4cafebd769baeea7b59bc09ffc74922d842b.tar.gz
brdo-408d4cafebd769baeea7b59bc09ffc74922d842b.tar.bz2
#202821 by marco.robotangel: display messages above help in all core themes for consistent user feedback (usability)
Diffstat (limited to 'themes')
-rw-r--r--themes/bluemarine/page.tpl.php2
-rw-r--r--themes/chameleon/chameleon.theme4
-rw-r--r--themes/garland/page.tpl.php2
-rw-r--r--themes/pushbutton/page.tpl.php8
4 files changed, 8 insertions, 8 deletions
diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php
index acd717bf7..c8d07c3e6 100644
--- a/themes/bluemarine/page.tpl.php
+++ b/themes/bluemarine/page.tpl.php
@@ -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>
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index aeac570d9..4536ec282 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -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();
diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php
index ec861fa41..eb88470d6 100644
--- a/themes/garland/page.tpl.php
+++ b/themes/garland/page.tpl.php
@@ -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>
diff --git a/themes/pushbutton/page.tpl.php b/themes/pushbutton/page.tpl.php
index b985acec1..946d11c9e 100644
--- a/themes/pushbutton/page.tpl.php
+++ b/themes/pushbutton/page.tpl.php
@@ -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; ?>