adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Issue ID 0000375:

Browse Source 
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
This commit is contained in:
rub
2006-06-28 22:50:30 +00:00
parent be4c4b31c8
commit 48779cfaaa
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/common.inc.php
+8 -8
View File
@@ -111,7 +111,7 @@ $conf = array();
$page = array(); $page = array();
$user = array(); $user = array();
$lang = array(); $lang = array();
$warnings = array(); $header_msgs = 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,7 +147,7 @@ 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)
{ {
$warnings[] = 'Some database upgrades are missing, ' $header_msgs[] = 'Some database upgrades are missing, '
.'<a href="'.PHPWG_ROOT_PATH.'upgrade_feed.php">upgrade now</a>'; .'<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']) if ($conf['gallery_locked'])
{ {
$warnings[] = $lang['gallery_locked_message'] $header_msgs[] = $lang['gallery_locked_message']
. '<a href="'.PHPWG_ROOT_PATH.'identification.php">.</a>'; . '<a href="'.PHPWG_ROOT_PATH.'identification.php">.</a>';
if ( basename($_SERVER["PHP_SELF"]) != 'identification.php' if ( basename($_SERVER["PHP_SELF"]) != 'identification.php'
@@ -214,18 +214,18 @@ include(
if (is_adviser()) if (is_adviser())
{ {
$warnings[] = $lang['adviser_mode_enabled']; $header_msgs[] = $lang['adviser_mode_enabled'];
} }
// 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) if (count($header_msgs) > 0)
{ {
$template->assign_block_vars('warnings',array()); $template->assign_block_vars('header_msgs',array());
foreach ($warnings as $warning) 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));
} }
} }
?> ?>
template/yoga/default-colors.css
+11
View File
@@ -68,6 +68,17 @@ INPUT[type="radio"] { /* for Opera */
padding: 10px 50px 10px 10px; 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 { LEGEND {
font-style: italic; font-style: italic;
} }
template/yoga/header.tpl
+9 -9
View File
@@ -30,13 +30,13 @@ the "text/nonsense" prevents gecko based browsers to load it -->
<body id="{BODY_ID}"> <body id="{BODY_ID}">
<div id="the_page"> <div id="the_page">
{PAGE_BANNER} <!-- BEGIN header_msgs -->
<!-- BEGIN warnings --> <div class="header_msgs">
<div class="infos"> <table>
<ul> <!-- BEGIN header_msg -->
<!-- BEGIN warning --> <tr><td>{header_msgs.header_msg.HEADER_MSG}</td></tr>
<li>{warnings.warning.WARNING}</li> <!-- END header_msg -->
<!-- END warning --> </table>
</ul>
</div> </div>
<!-- END warnings --> <!-- END header_msgs -->
{PAGE_BANNER}