Issue ID 0000371:

o Sorry but reverse r1299/1300

Issue ID 0000356:
  o Add new html properties tags on adviser mode

Merge BSF r1302:1303 into branch-1_6

git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1304 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub
2006-05-07 22:59:14 +00:00
parent b09f4b11b5
commit b1c336f7bc
3 changed files with 14 additions and 14 deletions
+13
View File
@@ -208,6 +208,19 @@ include(
.'/themeconf.inc.php'
);
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>
';
}
// template instance
$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']);
?>
+1 -11
View File
@@ -53,19 +53,9 @@ $template->assign_vars(
'DIR'=>$lang_info['direction'],
'T_STYLE' => $css,
'TAG_INPUT_ENABLED' => ((is_adviser()) ? 'disabled' : '')
'TAG_INPUT_ENABLED' => ((is_adviser()) ? 'disabled onclick="return false;"' : '')
));
if (is_adviser())
{
$template->assign_vars(
array(
'ADVISER_ENABLED' => $lang['adviser_mode_enabled']
)
);
}
// refresh
if ( isset( $refresh ) and intval($refresh) >= 0 and isset( $url_link ) and isset( $redirect_msg ) )
{
-3
View File
@@ -29,8 +29,5 @@ the "text/nonsense" prevents gecko based browsers to load it -->
<body id="{BODY_ID}">
<div id="the_page">
<div class="titrePage">
<h2 style="text-align:center">{ADVISER_ENABLED}</h2>
</div>
{PAGE_BANNER}