mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-24 11:51:43 +02:00
Minor formatting cleanup
This commit is contained in:
parent
e8dd639f65
commit
583ed7eede
@ -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'].'"';
|
||||||
}
|
}
|
||||||
@ -31,7 +31,7 @@
|
|||||||
'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
|
'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
|
||||||
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'] . $app,
|
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'] . $app,
|
||||||
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
|
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
|
||||||
'css' => $GLOBALS['phpgw']->common->get_css(),
|
'css' => $GLOBALS['phpgw']->common->get_css(),
|
||||||
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
|
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
|
||||||
);
|
);
|
||||||
$tpl->set_var($var);
|
$tpl->set_var($var);
|
||||||
|
@ -11,15 +11,15 @@
|
|||||||
|
|
||||||
/* $Id$ */
|
/* $Id$ */
|
||||||
|
|
||||||
function parse_navbar($force = False)
|
function parse_navbar($force = False)
|
||||||
{
|
{
|
||||||
$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
|
$tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
|
||||||
$tpl->set_unknowns('remove');
|
$tpl->set_unknowns('remove');
|
||||||
|
|
||||||
$tpl->set_file(
|
$tpl->set_file(
|
||||||
array(
|
array(
|
||||||
'navbar' => 'navbar.tpl',
|
'navbar' => 'navbar.tpl',
|
||||||
'navbar_app' => 'navbar_app.tpl'
|
'navbar_app' => 'navbar_app.tpl'
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -146,7 +146,7 @@
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
$var = Array(
|
$var = Array(
|
||||||
'table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
'table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
||||||
);
|
);
|
||||||
$var['powered_by'] = lang('Powered by phpGroupWare version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
|
$var['powered_by'] = lang('Powered by phpGroupWare version %1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
|
||||||
if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
|
if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
|
||||||
@ -156,8 +156,8 @@
|
|||||||
}
|
}
|
||||||
$now = time();
|
$now = time();
|
||||||
$var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
|
$var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
|
||||||
. lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
|
. lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
|
||||||
. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
|
. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
|
||||||
$tpl->set_var($var);
|
$tpl->set_var($var);
|
||||||
$GLOBALS['phpgw']->hooks->process('navbar_end');
|
$GLOBALS['phpgw']->hooks->process('navbar_end');
|
||||||
$tpl->pfp('out','footer');
|
$tpl->pfp('out','footer');
|
||||||
|
@ -23,11 +23,11 @@
|
|||||||
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
||||||
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
||||||
'charset' => $GLOBALS['phpgw']->translation->charset(),
|
'charset' => $GLOBALS['phpgw']->translation->charset(),
|
||||||
'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
|
'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
|
||||||
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'] . $app,
|
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'] . $app,
|
||||||
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
|
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
|
||||||
'css' => $GLOBALS['phpgw']->common->get_css(),
|
'css' => $GLOBALS['phpgw']->common->get_css(),
|
||||||
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
|
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
|
||||||
);
|
);
|
||||||
$tpl->set_var($var);
|
$tpl->set_var($var);
|
||||||
$tpl->pfp('out','head');
|
$tpl->pfp('out','head');
|
||||||
|
@ -165,7 +165,7 @@
|
|||||||
if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
|
if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
|
||||||
{
|
{
|
||||||
$var['current_users'] = '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
|
$var['current_users'] = '<a href="' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
|
||||||
. '"> ' . lang('Current users') . ': ' . $GLOBALS['phpgw']->session->total() . '</a>';
|
. '"> ' . lang('Current users') . ': ' . $GLOBALS['phpgw']->session->total() . '</a>';
|
||||||
$tpl->set_var($var);
|
$tpl->set_var($var);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -177,8 +177,8 @@
|
|||||||
$var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname();
|
$var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname();
|
||||||
$now = time();
|
$now = time();
|
||||||
$var['user_info_date'] =
|
$var['user_info_date'] =
|
||||||
lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
|
lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
|
||||||
. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
|
. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
|
||||||
$var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date'];
|
$var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date'];
|
||||||
$var['user_info_size'] = '2';
|
$var['user_info_size'] = '2';
|
||||||
$var['user_info_color'] = '#000000';
|
$var['user_info_color'] = '#000000';
|
||||||
@ -248,11 +248,11 @@
|
|||||||
if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'bottom')
|
if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'bottom')
|
||||||
{
|
{
|
||||||
$var = Array(
|
$var = Array(
|
||||||
'powered' => lang('Powered by phpGroupWare version %1', $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
|
'powered' => lang('Powered by phpGroupWare version %1', $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']),
|
||||||
'img_root' => PHPGW_IMAGES_DIR,
|
'img_root' => PHPGW_IMAGES_DIR,
|
||||||
'power_backcolor' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
'power_backcolor' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
||||||
'power_textcolor' => $GLOBALS['phpgw_info']['theme']['navbar_text']
|
'power_textcolor' => $GLOBALS['phpgw_info']['theme']['navbar_text']
|
||||||
// 'version' => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
|
// 'version' => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
|
||||||
);
|
);
|
||||||
$tpl->set_var($var);
|
$tpl->set_var($var);
|
||||||
$tpl->parse('V_powered_bottom','B_powered_bottom');
|
$tpl->parse('V_powered_bottom','B_powered_bottom');
|
||||||
|
@ -23,19 +23,19 @@
|
|||||||
$var = Array (
|
$var = Array (
|
||||||
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
||||||
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
||||||
'webserver_url' => $GLOBALS['phpgw_info']['server']['webserver_url'],
|
'webserver_url' => $GLOBALS['phpgw_info']['server']['webserver_url'],
|
||||||
'home' => $GLOBALS['phpgw']->link('/index.php'),
|
'home' => $GLOBALS['phpgw']->link('/index.php'),
|
||||||
'appt' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uicalendar.day')),
|
'appt' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uicalendar.day')),
|
||||||
'todo' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'todo.uitodo.add')),
|
'todo' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'todo.uitodo.add')),
|
||||||
'prefs' => $GLOBALS['phpgw']->link('/preferences/index.php'),
|
'prefs' => $GLOBALS['phpgw']->link('/preferences/index.php'),
|
||||||
'email' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'email.uipreferences.preferences')),
|
'email' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'email.uipreferences.preferences')),
|
||||||
'calendar' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uipreferences.preferences')),
|
'calendar' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'calendar.uipreferences.preferences')),
|
||||||
'addressbook' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'addressbook.uiaddressbook.preferences')),
|
'addressbook' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'addressbook.uiaddressbook.preferences')),
|
||||||
'charset' => $GLOBALS['phpgw']->translation->charset(),
|
'charset' => $GLOBALS['phpgw']->translation->charset(),
|
||||||
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'] . $app,
|
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'] . $app,
|
||||||
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
|
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
|
||||||
'css' => $GLOBALS['phpgw']->common->get_css(),
|
'css' => $GLOBALS['phpgw']->common->get_css(),
|
||||||
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
|
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
|
||||||
);
|
);
|
||||||
$tpl->set_var($var);
|
$tpl->set_var($var);
|
||||||
$tpl->pfp('out','head');
|
$tpl->pfp('out','head');
|
||||||
|
@ -21,7 +21,7 @@
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
$tpl->set_block('navbar','preferences','preferences_icon');
|
$tpl->set_block('navbar','preferences','preferences_icon');
|
||||||
|
|
||||||
$var['img_root'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/justweb/images';
|
$var['img_root'] = $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/justweb/images';
|
||||||
$var['table_bg_color'] = $GLOBALS['phpgw_info']['theme']['navbar_bg'];
|
$var['table_bg_color'] = $GLOBALS['phpgw_info']['theme']['navbar_bg'];
|
||||||
|
|
||||||
@ -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();
|
||||||
@ -141,10 +141,10 @@
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
$var = Array(
|
$var = Array(
|
||||||
'img_root' => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/justweb/images',
|
'img_root' => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/justweb/images',
|
||||||
'table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
'table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
||||||
'version' => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],
|
'version' => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi'],
|
||||||
'user_info' => $GLOBALS['phpgw']->common->display_fullname() . ' - '
|
'user_info' => $GLOBALS['phpgw']->common->display_fullname() . ' - '
|
||||||
. lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' '
|
. lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' '
|
||||||
. lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' '
|
. lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' '
|
||||||
. $GLOBALS['phpgw']->common->show_date(time(),'d, Y')
|
. $GLOBALS['phpgw']->common->show_date(time(),'d, Y')
|
||||||
|
@ -12,8 +12,8 @@
|
|||||||
/* $Id$ */
|
/* $Id$ */
|
||||||
|
|
||||||
$bodyheader = ' bgcolor="' . $GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
|
$bodyheader = ' bgcolor="' . $GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
|
||||||
. $GLOBALS['phpgw_info']['theme']['alink'] . '" link="' . $GLOBALS['phpgw_info']['theme']['link'] . '" vlink="'
|
. $GLOBALS['phpgw_info']['theme']['alink'] . '" link="' . $GLOBALS['phpgw_info']['theme']['link'] . '" vlink="'
|
||||||
. $GLOBALS['phpgw_info']['theme']['vlink'] . '"';
|
. $GLOBALS['phpgw_info']['theme']['vlink'] . '"';
|
||||||
|
|
||||||
if (! $GLOBALS['phpgw_info']['server']['htmlcompliant'])
|
if (! $GLOBALS['phpgw_info']['server']['htmlcompliant'])
|
||||||
{
|
{
|
||||||
@ -36,12 +36,12 @@
|
|||||||
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
||||||
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
||||||
'charset' => $GLOBALS['phpgw']->translation->charset(),
|
'charset' => $GLOBALS['phpgw']->translation->charset(),
|
||||||
'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
|
'font_family' => $GLOBALS['phpgw_info']['theme']['font'],
|
||||||
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'].$app,
|
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'].$app,
|
||||||
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
|
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
|
||||||
'theme_css' => $theme_css,
|
'theme_css' => $theme_css,
|
||||||
'css' => $GLOBALS['phpgw']->common->get_css(),
|
'css' => $GLOBALS['phpgw']->common->get_css(),
|
||||||
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
|
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
|
||||||
);
|
);
|
||||||
$tpl->set_var($var);
|
$tpl->set_var($var);
|
||||||
$tpl->pfp('out','head');
|
$tpl->pfp('out','head');
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
'navbar' => 'navbar.tpl'
|
'navbar' => 'navbar.tpl'
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
|
||||||
$GLOBALS['idots_tpl']->set_block('navbar','navbar_header','navbar_header');
|
$GLOBALS['idots_tpl']->set_block('navbar','navbar_header','navbar_header');
|
||||||
$GLOBALS['idots_tpl']->set_block('navbar','extra_blocks_header','extra_block_header');
|
$GLOBALS['idots_tpl']->set_block('navbar','extra_blocks_header','extra_block_header');
|
||||||
$GLOBALS['idots_tpl']->set_block('navbar','extra_block_row','extra_block_row');
|
$GLOBALS['idots_tpl']->set_block('navbar','extra_block_row','extra_block_row');
|
||||||
@ -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']) &&
|
||||||
@ -80,21 +80,21 @@
|
|||||||
if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
|
if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
|
||||||
{
|
{
|
||||||
$var['current_users'] = '<a href="'
|
$var['current_users'] = '<a href="'
|
||||||
. $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions') . '">'
|
. $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions') . '">'
|
||||||
. lang('Current users') . ': ' . $GLOBALS['phpgw']->session->total() . '</a>';
|
. lang('Current users') . ': ' . $GLOBALS['phpgw']->session->total() . '</a>';
|
||||||
}
|
}
|
||||||
$now = time();
|
$now = time();
|
||||||
$var['user_info'] = '<b>'.$GLOBALS['phpgw']->common->display_fullname() .'</b>'. ' - '
|
$var['user_info'] = '<b>'.$GLOBALS['phpgw']->common->display_fullname() .'</b>'. ' - '
|
||||||
. lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
|
. lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
|
||||||
. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
|
. $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
|
||||||
|
|
||||||
if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
|
if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
|
||||||
{
|
{
|
||||||
$api_messages = lang('You are required to change your password during your first login')
|
$api_messages = lang('You are required to change your password during your first login')
|
||||||
. '<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);
|
||||||
}
|
}
|
||||||
@ -125,7 +125,7 @@
|
|||||||
);
|
);
|
||||||
|
|
||||||
display_sidebox('',$menu_title,$file);
|
display_sidebox('',$menu_title,$file);
|
||||||
|
|
||||||
$GLOBALS['phpgw']->hooks->single('sidebox_menu',$GLOBALS['phpgw_info']['flags']['currentapp']);
|
$GLOBALS['phpgw']->hooks->single('sidebox_menu',$GLOBALS['phpgw_info']['flags']['currentapp']);
|
||||||
|
|
||||||
$GLOBALS['idots_tpl']->pparse('out','navbar_footer');
|
$GLOBALS['idots_tpl']->pparse('out','navbar_footer');
|
||||||
@ -145,13 +145,12 @@
|
|||||||
|
|
||||||
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');
|
||||||
$GLOBALS['idots_tpl']->set_var($var);
|
$GLOBALS['idots_tpl']->set_var($var);
|
||||||
$GLOBALS['idots_tpl']->pfp('out','extra_blocks_header');
|
$GLOBALS['idots_tpl']->pfp('out','extra_blocks_header');
|
||||||
|
|
||||||
while(list($text,$url) = each($file))
|
while(list($text,$url) = each($file))
|
||||||
{
|
{
|
||||||
sidebox_menu_item($url,$text);
|
sidebox_menu_item($url,$text);
|
||||||
@ -172,11 +171,11 @@
|
|||||||
$var['icon_or_star']='<font color="#ff9933">*</font>';
|
$var['icon_or_star']='<font color="#ff9933">*</font>';
|
||||||
$var['lang_item']=lang($item_text);
|
$var['lang_item']=lang($item_text);
|
||||||
$var['item_link']=$item_link;
|
$var['item_link']=$item_link;
|
||||||
$GLOBALS['idots_tpl']->set_var($var);
|
$GLOBALS['idots_tpl']->set_var($var);
|
||||||
$GLOBALS['idots_tpl']->pparse('out','extra_block_row');
|
$GLOBALS['idots_tpl']->pparse('out','extra_block_row');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function parse_navbar_end()
|
function parse_navbar_end()
|
||||||
{
|
{
|
||||||
$GLOBALS['idots_tpl'] = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
|
$GLOBALS['idots_tpl'] = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
|
||||||
@ -187,9 +186,9 @@
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
$var = Array(
|
$var = Array(
|
||||||
'img_root' => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/images',
|
'img_root' => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/images',
|
||||||
'table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
'table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
||||||
'version' => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
|
'version' => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
|
||||||
);
|
);
|
||||||
$GLOBALS['phpgw']->hooks->process('navbar_end');
|
$GLOBALS['phpgw']->hooks->process('navbar_end');
|
||||||
|
|
||||||
|
@ -12,8 +12,8 @@
|
|||||||
/* $Id$ */
|
/* $Id$ */
|
||||||
|
|
||||||
$bodyheader = ' bgcolor="' . $GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
|
$bodyheader = ' bgcolor="' . $GLOBALS['phpgw_info']['theme']['bg_color'] . '" alink="'
|
||||||
. $GLOBALS['phpgw_info']['theme']['alink'] . '" link="' . $GLOBALS['phpgw_info']['theme']['link'] . '" vlink="'
|
. $GLOBALS['phpgw_info']['theme']['alink'] . '" link="' . $GLOBALS['phpgw_info']['theme']['link'] . '" vlink="'
|
||||||
. $GLOBALS['phpgw_info']['theme']['vlink'] . '"';
|
. $GLOBALS['phpgw_info']['theme']['vlink'] . '"';
|
||||||
|
|
||||||
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
|
$app = $GLOBALS['phpgw_info']['flags']['currentapp'];
|
||||||
$app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ? $GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
|
$app = $app ? ' ['.(isset($GLOBALS['phpgw_info']['apps'][$app]) ? $GLOBALS['phpgw_info']['apps'][$app]['title'] : lang($app)).']':'';
|
||||||
@ -25,10 +25,10 @@
|
|||||||
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
'img_icon' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
||||||
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
'img_shortcut' => PHPGW_IMAGES_DIR . '/favicon.ico',
|
||||||
'charset' => $GLOBALS['phpgw']->translation->charset(),
|
'charset' => $GLOBALS['phpgw']->translation->charset(),
|
||||||
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'] . $app,
|
'website_title' => $GLOBALS['phpgw_info']['server']['site_title'] . $app,
|
||||||
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
|
'body_tags' => $bodyheader .' '. $GLOBALS['phpgw']->common->get_body_attribs(),
|
||||||
'css' => $GLOBALS['phpgw']->common->get_css(),
|
'css' => $GLOBALS['phpgw']->common->get_css(),
|
||||||
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
|
'java_script' => $GLOBALS['phpgw']->common->get_java_script(),
|
||||||
);
|
);
|
||||||
$tpl->set_var($var);
|
$tpl->set_var($var);
|
||||||
$tpl->pfp('out','head');
|
$tpl->pfp('out','head');
|
||||||
|
@ -109,10 +109,10 @@
|
|||||||
if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
|
if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
|
||||||
{
|
{
|
||||||
$api_messages = lang('You are required to change your password during your first login')
|
$api_messages = lang('You are required to change your password during your first login')
|
||||||
. '<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);
|
||||||
}
|
}
|
||||||
@ -167,9 +167,9 @@
|
|||||||
)
|
)
|
||||||
);
|
);
|
||||||
$var = Array(
|
$var = Array(
|
||||||
'img_root' => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/verdilak/images',
|
'img_root' => $GLOBALS['phpgw_info']['server']['webserver_url'] . '/phpgwapi/templates/verdilak/images',
|
||||||
'table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
'table_bg_color' => $GLOBALS['phpgw_info']['theme']['navbar_bg'],
|
||||||
'version' => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
|
'version' => $GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
|
||||||
);
|
);
|
||||||
if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
|
if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && $GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user