archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix bug 375: html bug; warnings are displayed outside from the html tree.

Browse source 
svn merge -r1379:1380 from trunk into branch 1.6


git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1381 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
nikrou 2006-06-22 21:34:23 +00:00
parent 2f077a3c97
commit 887bbb6ddb
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
include/common.inc.php
View file

@ -111,7 +111,7 @@ $conf = array();
$page = array(); $page = array();
$user = array(); $user = array();
$lang = array(); $lang = array();
$warnings = array();
@include(PHPWG_ROOT_PATH .'include/mysql.inc.php'); @include(PHPWG_ROOT_PATH .'include/mysql.inc.php');
if (!defined('PHPWG_INSTALLED')) if (!defined('PHPWG_INSTALLED'))
@ -147,14 +147,8 @@ SELECT id
// which upgrades need to be applied? // which upgrades need to be applied?
if (count(array_diff($existing, $applied)) > 0) if (count(array_diff($existing, $applied)) > 0)
{ {
ob_start();// buffer output so that cookies work $warnings[] = 'Some database upgrades are missing, '
.'<a href="'.PHPWG_ROOT_PATH.'upgrade_feed.php">upgrade now</a>';
echo
'<p>'
.'Some database upgrades are missing, '
.'<a href="'.PHPWG_ROOT_PATH.'upgrade_feed.php">upgrade now</a>'
.'</p>'
;
} }
} }
@ -176,12 +170,8 @@ if (defined('IN_ADMIN') and IN_ADMIN)
if ($conf['gallery_locked']) if ($conf['gallery_locked'])
{ {
ob_start(); // make sure we can send cookies $warnings[] = $lang['gallery_locked_message']
echo . '<a href="'.PHPWG_ROOT_PATH.'identification.php">.</a>';
'<div style="text-align:center;">'
.$lang['gallery_locked_message'];
echo '<a href="'.PHPWG_ROOT_PATH.'identification.php">.</a>';
echo '</div>';
if ( basename($_SERVER["PHP_SELF"]) != 'identification.php' if ( basename($_SERVER["PHP_SELF"]) != 'identification.php'
and !is_admin() ) and !is_admin() )
@ -218,17 +208,18 @@ include(
if (is_adviser()) if (is_adviser())
{ {
ob_start();// buffer output so that cookies work $warnings[] = $lang['adviser_mode_enabled'];
echo '
<div class="titrePage">
<h2>
<div style="text-align:center;">'.$lang['adviser_mode_enabled'].'
</div>
</h2>
</div>
';
} }
// template instance // template instance
$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']); $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));
}
}
?> ?>

9
template/yoga/header.tpl
View file

@ -32,3 +32,12 @@ the "text/nonsense" prevents gecko based browsers to load it -->
<div id="the_page"> <div id="the_page">
<div id="theHeader">{PAGE_BANNER}</div> <div id="theHeader">{PAGE_BANNER}</div>
<!-- BEGIN warnings -->
<div class="infos">
<ul>
<!-- BEGIN warning -->
<li>{warnings.warning.WARNING}</li>
<!-- END warning -->
</ul>
</div>
<!-- END warnings -->