Minor formatting cleanup

This commit is contained in:
Miles Lott 2003-12-19 09:08:37 +00:00
parent e8dd639f65
commit 583ed7eede
10 changed files with 78 additions and 79 deletions

View File

@ -12,7 +12,7 @@
/* $Id$ */ /* $Id$ */
$bodyheader = 'BGCOLOR="'.$GLOBALS['phpgw_info']['theme']['bg_color'].'"'; $bodyheader = 'BGCOLOR="'.$GLOBALS['phpgw_info']['theme']['bg_color'].'"';
if ($GLOBALS['phpgw_info']['server']['htmlcompliant']) if($GLOBALS['phpgw_info']['server']['htmlcompliant'])
{ {
$bodyheader .= ' ALINK="'.$GLOBALS['phpgw_info']['theme']['alink'].'" LINK="'.$GLOBALS['phpgw_info']['theme']['link'].'" VLINK="'.$GLOBALS['phpgw_info']['theme']['vlink'].'"'; $bodyheader .= ' ALINK="'.$GLOBALS['phpgw_info']['theme']['alink'].'" LINK="'.$GLOBALS['phpgw_info']['theme']['link'].'" VLINK="'.$GLOBALS['phpgw_info']['theme']['vlink'].'"';
} }

View File

@ -119,9 +119,9 @@
} }
$tpl->pfp('out','navbar'); $tpl->pfp('out','navbar');
// If the application has a header include, we now include it // If the application has a header include, we now include it
if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($GLOBALS['HTTP_GET_VARS']['menuaction'])) if (!@$GLOBALS['phpgw_info']['flags']['noappheader'] && @isset($_GET['menuaction']))
{ {
list($app,$class,$method) = explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']); list($app,$class,$method) = explode('.',$_GET['menuaction']);
if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header']) if (is_array($GLOBALS[$class]->public_functions) && $GLOBALS[$class]->public_functions['header'])
{ {
$GLOBALS[$class]->header(); $GLOBALS[$class]->header();

View File

@ -39,8 +39,8 @@
{ {
$title = $GLOBALS['phpgw_info']['apps'][$app]['title']; $title = $GLOBALS['phpgw_info']['apps'][$app]['title'];
$icon = '<img src="' . $app_data['icon'] . '" alt="' . $title . $icon = '<img src="' . $app_data['icon'] . '" alt="' . $title
'" title="'. $title . '" border="0" height="60">'; . '" title="'. $title . '" border="0" height="60">';
$app_icons .= '<TD align="center"><a href="' . $app_data['url'] . '"'; $app_icons .= '<TD align="center"><a href="' . $app_data['url'] . '"';
if (isset($GLOBALS['phpgw_info']['flags']['navbar_target']) && if (isset($GLOBALS['phpgw_info']['flags']['navbar_target']) &&
@ -94,7 +94,7 @@
. '<br> Click this image on the navbar: <img src="' . '<br> Click this image on the navbar: <img src="'
. $GLOBALS['phpgw']->common->image('preferences','navbar.gif').'">'; . $GLOBALS['phpgw']->common->image('preferences','navbar.gif').'">';
} }
else if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < time() - (86400*30)) elseif($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < time() - (86400*30))
{ {
$api_messages = lang('it has been more then %1 days since you changed your password',30); $api_messages = lang('it has been more then %1 days since you changed your password',30);
} }
@ -145,7 +145,6 @@
function display_sidebox($appname,$menu_title,$file) function display_sidebox($appname,$menu_title,$file)
{ {
if(!$appname || ($appname==$GLOBALS['phpgw_info']['flags']['currentapp'] && $file)) if(!$appname || ($appname==$GLOBALS['phpgw_info']['flags']['currentapp'] && $file))
{ {
$var['lang_title']=$menu_title;//$appname.' '.lang('Menu'); $var['lang_title']=$menu_title;//$appname.' '.lang('Menu');

View File

@ -112,7 +112,7 @@
. '<br> Click this image on the navbar: <img src="' . '<br> Click this image on the navbar: <img src="'
. $GLOBALS['phpgw']->common->image('preferences','navbar.gif').'">'; . $GLOBALS['phpgw']->common->image('preferences','navbar.gif').'">';
} }
else if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < time() - (86400*30)) elseif($GLOBALS['phpgw_info']['user']['lastpasswd_change'] < time() - (86400*30))
{ {
$api_messages = lang('it has been more then %1 days since you changed your password',30); $api_messages = lang('it has been more then %1 days since you changed your password',30);
} }