From e12e0864ad8b85de25c009b8a868ebbc4f4b2c40 Mon Sep 17 00:00:00 2001 From: angles Date: Wed, 19 Sep 2001 05:44:16 +0000 Subject: [PATCH] modify and bug fix idsociety navbar files --- phpgwapi/templates/idsociety/navbar.inc.php | 32 ++++++++---- phpgwapi/templates/idsociety/navbar.tpl | 54 +++++++++------------ 2 files changed, 46 insertions(+), 40 deletions(-) diff --git a/phpgwapi/templates/idsociety/navbar.inc.php b/phpgwapi/templates/idsociety/navbar.inc.php index 1581740dbe..d620ac94b8 100644 --- a/phpgwapi/templates/idsociety/navbar.inc.php +++ b/phpgwapi/templates/idsociety/navbar.inc.php @@ -22,7 +22,8 @@ ) ); - $tpl->set_block('navbar','B_powered_top','V_powered_top'); + //$tpl->set_block('navbar','B_powered_top','V_powered_top'); + //$tpl->set_block('navbar','B_num_users','V_num_users'); $var['img_root'] = PHPGW_IMAGES_DIR; $var['img_root_roll'] = PHPGW_IMAGES_DIR . '/rollover'; @@ -55,7 +56,7 @@ { $applications .= ' onMouseOut="' . $app[0] . '.src=\'' . $img_src_out . '\'"'; } - $applications .= '>'.$title.''."\n"; + $applications .= '>'.$title.''."\r\n"; } $img_src_over = $GLOBALS['phpgw']->common->image($app[0],'navbar-over.gif'); if($img_src_over) @@ -92,16 +93,18 @@ } $var['logout_img'] = PHPGW_IMAGES_DIR . '/logout-grey.gif'; + // "powered_by_color" and "_size" are is also used by number of current users thing + $var['powered_by_size'] = '2'; + $var['powered_by_color'] = '#ffffff'; if ($GLOBALS['phpgw_info']['server']['showpoweredbyon'] == 'top') { $var['powered_by'] = lang('Powered by phpGroupWare version x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']); - $var['power_size'] = '2'; $tpl->set_var($var); - $tpl->parse('V_powered_top','B_powered_top'); } else { - $var['V_powered_top'] = ''; + $var['powered_by'] = ''; + $tpl->set_var($var); } if (isset($GLOBALS['phpgw_info']['navbar']['admin']) && isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])) @@ -111,11 +114,22 @@ $db->next_record(); $var['current_users'] = ' ' . lang('Current users') . ': ' . $db->f(0) . ''; + $tpl->set_var($var); } - $var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - ' - . lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' ' - . lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' ' - . $GLOBALS['phpgw']->common->show_date(time(),'d, Y'); + else + { + $var['current_users'] = ''; + $tpl->set_var($var); + } + + $var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname(); + $var['user_info_date'] = + lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' ' + . lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' ' + . $GLOBALS['phpgw']->common->show_date(time(),'d, Y'); + $var['user_info'] = $var['user_info_name'] .' - ' .$var['user_info_date']; + $var['user_info_size'] = '2'; + $var['user_info_color'] = '#000000'; // Maybe we should create a common function in the phpgw_accounts_shared.inc.php file // to get rid of duplicate code. diff --git a/phpgwapi/templates/idsociety/navbar.tpl b/phpgwapi/templates/idsociety/navbar.tpl index 1eb4fdfff1..3b05bb3981 100755 --- a/phpgwapi/templates/idsociety/navbar.tpl +++ b/phpgwapi/templates/idsociety/navbar.tpl @@ -11,13 +11,18 @@ -
- + -
+ + - + - + {applications} @@ -26,14 +31,22 @@
+ +
+ +
- - +
+ + + - + + - - - - - - - - - -
+ + {user_info_name}
{user_info_date} + 		+ {powered_by} 
{current_users}  +
+ + @@ -44,28 +57,7 @@
-  {powered_by} -
- - - - - -
- {user_info} - -  {current_users} -
-
+