diff options
| author | rub <rub@piwigo.org> | 2006-05-07 22:59:14 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2006-05-07 22:59:14 +0000 |
| commit | b1c336f7bc3ba99145a7624efb7041664406bd8e (patch) | |
| tree | b2308d8e398f05e311e6678e02ecdce4109bd323 | |
| parent | b09f4b11b506d6fa9310888c5461d482dbce0388 (diff) | |
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
| -rw-r--r-- | include/common.inc.php | 13 | ||||
| -rw-r--r-- | include/page_header.php | 12 | ||||
| -rw-r--r-- | template/yoga/header.tpl | 3 |
3 files changed, 14 insertions, 14 deletions
diff --git a/include/common.inc.php b/include/common.inc.php index 005297d25..8aeafb7bf 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -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']); ?> diff --git a/include/page_header.php b/include/page_header.php index c807a5250..7d22e8e01 100644 --- a/include/page_header.php +++ b/include/page_header.php @@ -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 ) ) { diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl index 43d63cd6a..d432d7b63 100644 --- a/template/yoga/header.tpl +++ b/template/yoga/header.tpl @@ -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} |