[Fusionforge-commits] r12149 - in branches/Branch_5_1/src/www: include themes/funky themes/gforge

Alain Peyrat aljeux at libremir.placard.fr.eu.org
Fri Feb 4 11:01:03 CET 2011


Author: aljeux
Date: 2011-02-04 11:01:02 +0100 (Fri, 04 Feb 2011)
New Revision: 12149

Modified:
   branches/Branch_5_1/src/www/include/html.php
   branches/Branch_5_1/src/www/themes/funky/Theme.class.php
   branches/Branch_5_1/src/www/themes/gforge/Theme.class.php
Log:
Restore banner messages on top of pages

Modified: branches/Branch_5_1/src/www/include/html.php
===================================================================
--- branches/Branch_5_1/src/www/include/html.php	2011-02-04 10:00:54 UTC (rev 12148)
+++ branches/Branch_5_1/src/www/include/html.php	2011-02-04 10:01:02 UTC (rev 12149)
@@ -677,16 +677,6 @@
 		Check to see if logged in
 	*/
 	echo $HTML->header($params);
-
-	if(isset($GLOBALS['error_msg']) && $GLOBALS['error_msg']) {
-		echo html_error_top($GLOBALS['error_msg']);
-	}
-	if(isset($GLOBALS['warning_msg']) && $GLOBALS['warning_msg']) {
-		echo html_warning_top($GLOBALS['warning_msg']);
-	}
-	if(isset($GLOBALS['feedback']) && $GLOBALS['feedback']) {
-		echo html_feedback_top($GLOBALS['feedback']);
-	}
 }
 
 /**

Modified: branches/Branch_5_1/src/www/themes/funky/Theme.class.php
===================================================================
--- branches/Branch_5_1/src/www/themes/funky/Theme.class.php	2011-02-04 10:00:54 UTC (rev 12148)
+++ branches/Branch_5_1/src/www/themes/funky/Theme.class.php	2011-02-04 10:01:02 UTC (rev 12149)
@@ -114,6 +114,16 @@
         echo '</div>' . "\n";
         echo '<div id="maindiv">' . "\n";
 
+        if(isset($GLOBALS['error_msg']) && $GLOBALS['error_msg']) {
+            echo $this->error_msg($GLOBALS['error_msg']);
+        }
+        if(isset($GLOBALS['warning_msg']) && $GLOBALS['warning_msg']) {
+            echo $this->warning_msg($GLOBALS['warning_msg']);
+        }
+        if(isset($GLOBALS['feedback']) && $GLOBALS['feedback']) {
+            echo $this->feedback($GLOBALS['feedback']);
+        }
+
         if ($params['h1']) {
             echo '<h1>'.$params['h1'].'</h1>';
         } else {

Modified: branches/Branch_5_1/src/www/themes/gforge/Theme.class.php
===================================================================
--- branches/Branch_5_1/src/www/themes/gforge/Theme.class.php	2011-02-04 10:00:54 UTC (rev 12148)
+++ branches/Branch_5_1/src/www/themes/gforge/Theme.class.php	2011-02-04 10:01:02 UTC (rev 12149)
@@ -105,6 +105,16 @@
 ';
 //		        echo '<div class="printheader">'. forge_get_config('forge_name') . ' ' . util_make_url('/') .'</div>';
 
+				if(isset($GLOBALS['error_msg']) && $GLOBALS['error_msg']) {
+					echo $this->error_msg($GLOBALS['error_msg']);
+				}
+				if(isset($GLOBALS['warning_msg']) && $GLOBALS['warning_msg']) {
+					echo $this->warning_msg($GLOBALS['warning_msg']);
+				}
+				if(isset($GLOBALS['feedback']) && $GLOBALS['feedback']) {
+					echo $this->feedback($GLOBALS['feedback']);
+				}
+
 				if ($params['h1']) {
 					echo '<h1>'.$params['h1'].'</h1>';
 				} else {




More information about the Fusionforge-commits mailing list