Changeset 1415


Ignore:
Timestamp:
Jun 29, 2006, 1:02:24 AM (18 years ago)
Author:
rub
Message:

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

Location:
branches/branch-1_6
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/branch-1_6/include/common.inc.php

    r1413 r1415  
    112112$user = array();
    113113$lang = array();
    114 $warnings = array();
     114$header_msgs = array();
    115115
    116116@include(PHPWG_ROOT_PATH .'include/mysql.inc.php');
     
    148148  if (count(array_diff($existing, $applied)) > 0)
    149149  {
    150     $warnings[] = 'Some database upgrades are missing, '
     150    $header_msgs[] = 'Some database upgrades are missing, '
    151151      .'<a href="'.PHPWG_ROOT_PATH.'upgrade_feed.php">upgrade now</a>';
    152152  }
     
    171171if ($conf['gallery_locked'])
    172172{
    173   $warnings[] = $lang['gallery_locked_message']
     173  $header_msgs[] = $lang['gallery_locked_message']
    174174    . '<a href="'.PHPWG_ROOT_PATH.'identification.php">.</a>';
    175175
     
    215215if (is_adviser())
    216216{
    217   $warnings[] = $lang['adviser_mode_enabled'];
     217  $header_msgs[] = $lang['adviser_mode_enabled'];
    218218}
    219219
     
    221221$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']);
    222222
    223 if (count($warnings) > 0)
    224 {
    225   $template->assign_block_vars('warnings',array());
    226   foreach ($warnings as $warning)
    227   {
    228     $template->assign_block_vars('warnings.warning', array('WARNING'=>$warning));
     223if (count($header_msgs) > 0)
     224{
     225  $template->assign_block_vars('header_msgs',array());
     226  foreach ($header_msgs as $header_msg)
     227  {
     228    $template->assign_block_vars('header_msgs.header_msg', array('HEADER_MSG'=>$header_msg));
    229229  }
    230230}
  • branches/branch-1_6/template/yoga/default-colors.css

    r1262 r1415  
    6969}
    7070
     71/**
     72 * Header message like upgrade or adviser mode
     73 */
     74.header_msgs {
     75  text-align:center;
     76  font-weight: bold;
     77  color:#696969;        /* dimgray */
     78  background-color: #d3d3d3;
     79  margin: 5px;
     80}
     81
    7182LEGEND {
    7283  font-style: italic;
  • branches/branch-1_6/template/yoga/header.tpl

    r1381 r1415  
    3131<body id="{BODY_ID}">
    3232<div id="the_page">
    33 
     33<!-- BEGIN header_msgs -->
     34<div class="header_msgs">
     35  <table>
     36    <!-- BEGIN header_msg -->
     37    <tr><td>{header_msgs.header_msg.HEADER_MSG}</td></tr>
     38    <!-- END header_msg -->
     39  </table>
     40</div>
     41<!-- END header_msgs -->
    3442<div id="theHeader">{PAGE_BANNER}</div>
    35 <!-- BEGIN warnings -->
    36 <div class="infos">
    37   <ul>
    38     <!-- BEGIN warning -->
    39     <li>{warnings.warning.WARNING}</li>
    40     <!-- END warning -->
    41   </ul>
    42 </div>
    43 <!-- END warnings -->
Note: See TracChangeset for help on using the changeset viewer.