holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for bug/enhancement #486048.

Browse Source
This commit is contained in:
skeeter 2001-12-01 00:54:58 +00:00
parent c03544e09b
commit 056149ea4c
5 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
phpgwapi/templates/default/navbar.inc.php
View File

@ -84,10 +84,12 @@
$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')
. '">&nbsp;' . lang('Current users') . ': ' . $db->f(0) . '</a>'; . '">&nbsp;' . lang('Current users') . ': ' . $db->f(0) . '</a>';
} }
$now = time();
$var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - ' $var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
. lang($GLOBALS['phpgw']->common->show_date(time(),"l")) . ' ' . lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
. lang($GLOBALS['phpgw']->common->show_date(time(),"F")) . ' ' . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
. $GLOBALS['phpgw']->common->show_date(time(),"d, Y"); // . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
// . $GLOBALS['phpgw']->common->show_date($now,'d, Y');
// Maybe we should create a common function in the phpgw_accounts_shared.inc.php file // Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
// to get rid of duplicate code. // to get rid of duplicate code.

8
phpgwapi/templates/idsociety/navbar.inc.php
View File

@ -123,10 +123,12 @@
} }
$var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname(); $var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname();
$now = time();
$var['user_info_date'] = $var['user_info_date'] =
lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' ' lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
. lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' ' . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
. $GLOBALS['phpgw']->common->show_date(time(),'d, Y'); // . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
// . $GLOBALS['phpgw']->common->show_date($now,'d, Y');
$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';

8
phpgwapi/templates/justweb/navbar.inc.php
View File

@ -83,10 +83,12 @@
. lang('Current users') . ': ' . $db->f(0) . '</a>'; . lang('Current users') . ': ' . $db->f(0) . '</a>';
} }
*/ */
$now = time();
$var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - ' $var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
. lang($GLOBALS['phpgw']->common->show_date(time(),"l")) . ' ' . lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
. lang($GLOBALS['phpgw']->common->show_date(time(),"F")) . ' ' . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
. $GLOBALS['phpgw']->common->show_date(time(),"d, Y"); // . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
// . $GLOBALS['phpgw']->common->show_date($now,'d, Y');
/* /*
* Maybe we should create a common function in the phpgw_accounts_shared.inc.php file * Maybe we should create a common function in the phpgw_accounts_shared.inc.php file

8
phpgwapi/templates/linux-at-work.de/navbar.inc.php
View File

@ -95,10 +95,12 @@
} }
$var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname(); $var['user_info_name'] = $GLOBALS['phpgw']->common->display_fullname();
$now = time();
$var['user_info_date'] = $var['user_info_date'] =
lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' ' lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
. lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' ' . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
. $GLOBALS['phpgw']->common->show_date(time(),'d, Y'); // . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
// . $GLOBALS['phpgw']->common->show_date($now,'d, Y');
$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';

8
phpgwapi/templates/verdilak/navbar.inc.php
View File

@ -95,10 +95,12 @@
. $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions') . '">&nbsp;' . $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions') . '">&nbsp;'
. lang('Current users') . ': ' . $db->f(0) . '</a>'; . lang('Current users') . ': ' . $db->f(0) . '</a>';
} }
$now = time();
$var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - ' $var['user_info'] = $GLOBALS['phpgw']->common->display_fullname() . ' - '
. lang($GLOBALS['phpgw']->common->show_date(time(),'l')) . ' ' . lang($GLOBALS['phpgw']->common->show_date($now,'l')) . ' '
. lang($GLOBALS['phpgw']->common->show_date(time(),'F')) . ' ' . $GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
. $GLOBALS['phpgw']->common->show_date(time(),'d, Y'); // . lang($GLOBALS['phpgw']->common->show_date($now,'F')) . ' '
// . $GLOBALS['phpgw']->common->show_date($now,'d, Y');
// Maybe we should create a common function in the phpgw_accounts_shared.inc.php file // Maybe we should create a common function in the phpgw_accounts_shared.inc.php file
// to get rid of duplicate code. // to get rid of duplicate code.