aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2006-06-28 22:50:30 +0000
committerrub <rub@piwigo.org>2006-06-28 22:50:30 +0000
commit48779cfaaaf763c510420cd3c419aa5de5463424 (patch)
tree1c7052768387f7dc073a924ad388c7241f97ef6a
parentbe4c4b31c8880fa2dd4d949d1d6675ac6965f42d (diff)
Issue ID 0000375:
o Keep same format display o Add css class o rename warning to header_msg Merge BSF r1411:1412 into branch-1_6 git-svn-id: http://piwigo.org/svn/trunk@1414 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/common.inc.php16
-rw-r--r--template/yoga/default-colors.css11
-rw-r--r--template/yoga/header.tpl18
3 files changed, 28 insertions, 17 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 929724a1d..9fb16455f 100644
--- a/template/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -30,13 +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>
+<!-- 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 -->
+{PAGE_BANNER}