diff options
| author | nikrou <nikrou@piwigo.org> | 2006-06-22 21:28:54 +0000 |
|---|---|---|
| committer | nikrou <nikrou@piwigo.org> | 2006-06-22 21:28:54 +0000 |
| commit | 3ec2f102b5776b2b2f36d0a23d02ff4b34319f83 (patch) | |
| tree | 5cdd35516fdee1c44053806dd8397e6d714bee5b | |
| parent | 17d13cef8dd4c6c365bdb2ac8db8bedafa2e35dc (diff) | |
fix bug 375: html bug; warnings are displayed outside from the html tree.
git-svn-id: http://piwigo.org/svn/trunk@1380 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/common.inc.php | 39 | ||||
| -rw-r--r-- | template/yoga/header.tpl | 10 |
2 files changed, 24 insertions, 25 deletions
diff --git a/include/common.inc.php b/include/common.inc.php index 2c9364d38..35b6dd187 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -111,7 +111,7 @@ $conf = array(); $page = array(); $user = array(); $lang = array(); - +$warnings = array(); @include(PHPWG_ROOT_PATH .'include/mysql.inc.php'); if (!defined('PHPWG_INSTALLED')) @@ -147,14 +147,8 @@ SELECT id // which upgrades need to be applied? if (count(array_diff($existing, $applied)) > 0) { - ob_start();// buffer output so that cookies work - - echo - '<p>' - .'Some database upgrades are missing, ' - .'<a href="'.PHPWG_ROOT_PATH.'upgrade_feed.php">upgrade now</a>' - .'</p>' - ; + $warnings[] = 'Some database upgrades are missing, ' + .'<a href="'.PHPWG_ROOT_PATH.'upgrade_feed.php">upgrade now</a>'; } } @@ -176,12 +170,8 @@ if (defined('IN_ADMIN') and IN_ADMIN) if ($conf['gallery_locked']) { - ob_start(); // make sure we can send cookies - echo - '<div style="text-align:center;">' - .$lang['gallery_locked_message']; - echo '<a href="'.PHPWG_ROOT_PATH.'identification.php">.</a>'; - echo '</div>'; + $warnings[] = $lang['gallery_locked_message'] + . '<a href="'.PHPWG_ROOT_PATH.'identification.php">.</a>'; if ( basename($_SERVER["PHP_SELF"]) != 'identification.php' and !is_admin() ) @@ -218,17 +208,18 @@ include( if (is_adviser()) { - ob_start();// buffer output so that cookies work - echo ' - <div class="titrePage"> - <h2> - <div style="text-align:center;">'.$lang['adviser_mode_enabled'].' - </div> - </h2> - </div> - '; + $warnings[] = $lang['adviser_mode_enabled']; } // template instance $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']); + +if (count($warnings) > 0) +{ + $template->assign_block_vars('warnings',array()); + foreach ($warnings as $warning) + { + $template->assign_block_vars('warnings.warning', array('WARNING'=>$warning)); + } +} ?> diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl index 8ba0ce6b3..929724a1d 100644 --- a/template/yoga/header.tpl +++ b/template/yoga/header.tpl @@ -30,5 +30,13 @@ the "text/nonsense" prevents gecko based browsers to load it --> <body id="{BODY_ID}"> <div id="the_page"> - {PAGE_BANNER} +<!-- BEGIN warnings --> +<div class="infos"> + <ul> + <!-- BEGIN warning --> + <li>{warnings.warning.WARNING}</li> + <!-- END warning --> + </ul> +</div> +<!-- END warnings --> |