diff options
| author | rub <rub@piwigo.org> | 2006-06-28 23:02:24 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2006-06-28 23:02:24 +0000 |
| commit | cb74c6f67eb5c67a7f41c1cab5bb46d01043bea1 (patch) | |
| tree | 4e8fdc64780a7550a19345521cb4a9243237509d | |
| parent | 7a929a917105c24471b695745e7daf1604ea0b84 (diff) | |
Issue ID 0000375:
o Keep same format display
o Add css class
o rename warning to header_msg
Merge BSF r1413:1414 into branch-1_6
git-svn-id: http://piwigo.org/svn/branches/branch-1_6@1415 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | include/common.inc.php | 16 | ||||
| -rw-r--r-- | template/yoga/default-colors.css | 11 | ||||
| -rw-r--r-- | template/yoga/header.tpl | 19 |
3 files changed, 28 insertions, 18 deletions
diff --git a/include/common.inc.php b/include/common.inc.php index f5abf1ee7..1cde9ae28 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(); +$header_msgs = array(); @include(PHPWG_ROOT_PATH .'include/mysql.inc.php'); if (!defined('PHPWG_INSTALLED')) @@ -147,7 +147,7 @@ SELECT id // which upgrades need to be applied? if (count(array_diff($existing, $applied)) > 0) { - $warnings[] = 'Some database upgrades are missing, ' + $header_msgs[] = 'Some database upgrades are missing, ' .'<a href="'.PHPWG_ROOT_PATH.'upgrade_feed.php">upgrade now</a>'; } } @@ -170,7 +170,7 @@ if (defined('IN_ADMIN') and IN_ADMIN) if ($conf['gallery_locked']) { - $warnings[] = $lang['gallery_locked_message'] + $header_msgs[] = $lang['gallery_locked_message'] . '<a href="'.PHPWG_ROOT_PATH.'identification.php">.</a>'; if ( basename($_SERVER["PHP_SELF"]) != 'identification.php' @@ -214,18 +214,18 @@ include( if (is_adviser()) { - $warnings[] = $lang['adviser_mode_enabled']; + $header_msgs[] = $lang['adviser_mode_enabled']; } // template instance $template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']); -if (count($warnings) > 0) +if (count($header_msgs) > 0) { - $template->assign_block_vars('warnings',array()); - foreach ($warnings as $warning) + $template->assign_block_vars('header_msgs',array()); + foreach ($header_msgs as $header_msg) { - $template->assign_block_vars('warnings.warning', array('WARNING'=>$warning)); + $template->assign_block_vars('header_msgs.header_msg', array('HEADER_MSG'=>$header_msg)); } } ?> diff --git a/template/yoga/default-colors.css b/template/yoga/default-colors.css index 8b73f966b..05753658a 100644 --- a/template/yoga/default-colors.css +++ b/template/yoga/default-colors.css @@ -68,6 +68,17 @@ INPUT[type="radio"] { /* for Opera */ padding: 10px 50px 10px 10px; } +/** + * Header message like upgrade or adviser mode + */ +.header_msgs { + text-align:center; + font-weight: bold; + color:#696969; /* dimgray */ + background-color: #d3d3d3; + margin: 5px; +} + LEGEND { font-style: italic; } diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl index 3e01c9fe9..d3685e3c0 100644 --- a/template/yoga/header.tpl +++ b/template/yoga/header.tpl @@ -30,14 +30,13 @@ the "text/nonsense" prevents gecko based browsers to load it --> <body id="{BODY_ID}"> <div id="the_page"> - -<div id="theHeader">{PAGE_BANNER}</div> -<!-- BEGIN warnings --> -<div class="infos"> - <ul> - <!-- BEGIN warning --> - <li>{warnings.warning.WARNING}</li> - <!-- END warning --> - </ul> +<!-- BEGIN header_msgs --> +<div class="header_msgs"> + <table> + <!-- BEGIN header_msg --> + <tr><td>{header_msgs.header_msg.HEADER_MSG}</td></tr> + <!-- END header_msg --> + </table> </div> -<!-- END warnings --> +<!-- END header_msgs --> +<div id="theHeader">{PAGE_BANNER}</div> |