From c740ac7fd58b5f4597bde987ae9263f3d05febd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Fri, 4 May 2007 09:41:37 +0000
Subject: #127539: progressive operation support, refactoring update.php code
 to a generic batch API to support runnning operations in multiple HTTP
 requests   - update.php is already on the batch API   - node access
 rebuilding is in the works   - automatic locale importing is in the works

 Thanks to Yves Chedemois (yched) for the good code quality, very wide awareness of issues related to batches,
 and the fantastic turnaround times. Hats off.
---
 themes/bluemarine/page.tpl.php   | 2 +-
 themes/chameleon/chameleon.theme | 6 ++++--
 themes/garland/page.tpl.php      | 2 +-
 themes/pushbutton/page.tpl.php   | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'themes')

diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php
index fce977e5f..2f101ddf1 100644
--- a/themes/bluemarine/page.tpl.php
+++ b/themes/bluemarine/page.tpl.php
@@ -41,7 +41,7 @@
         <h1 class="title"><?php print $title ?></h1>
         <div class="tabs"><?php print $tabs ?></div>
         <?php print $help ?>
-        <?php print $messages ?>
+        <?php if ($show_messages) { print $messages; } ?>
         <?php print $content; ?>
         <?php print $feed_icons; ?>
       </div>
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index 7d3134b86..1c87653d3 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -23,7 +23,7 @@ function chameleon_theme($existing) {
   return $templates;
 }
 
-function chameleon_page($content, $show_blocks = TRUE) {
+function chameleon_page($content, $show_blocks = TRUE, $show_messages = TRUE) {
   $language = isset($GLOBALS['language']) ? $GLOBALS['language']->language : NULL;
 
   if (theme_get_setting('toggle_favicon')) {
@@ -94,7 +94,9 @@ function chameleon_page($content, $show_blocks = TRUE) {
 
   $output .= theme('help');
 
-  $output .= theme('status_messages');
+  if ($show_messages) {
+    $output .= theme('status_messages');
+  }
 
   $output .= "\n<!-- begin content -->\n";
   $output .= $content;
diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php
index 3663f6586..5f6078228 100644
--- a/themes/garland/page.tpl.php
+++ b/themes/garland/page.tpl.php
@@ -71,7 +71,7 @@
           <?php if (isset($tabs2)): print $tabs2; endif; ?>
 
           <?php if ($help): print $help; endif; ?>
-          <?php if ($messages): print $messages; endif; ?>
+          <?php if ($show_messages && $messages): print $messages; endif; ?>
           <?php print $content ?>
           <span class="clear"></span>
           <?php print $feed_icons ?>
diff --git a/themes/pushbutton/page.tpl.php b/themes/pushbutton/page.tpl.php
index acf27949b..027bd026c 100644
--- a/themes/pushbutton/page.tpl.php
+++ b/themes/pushbutton/page.tpl.php
@@ -76,7 +76,7 @@
             <div id="help"><?php print $help ?></div>
         <?php endif; ?>
 
-        <?php if ($messages != ""): ?>
+        <?php if ($show_messages && $messages != ""): ?>
           <?php print $messages ?>
         <?php endif; ?>
 
-- 
cgit v1.2.3