[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/templates/verdilak navbar.inc.php,1.27
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/templates/verdilak navbar.inc.php,1.27.2.2,1.27.2.3 navbar.tpl,1.12,1.12.2.1 |
|
Date: |
Mon, 10 Mar 2003 17:47:41 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/templates/verdilak
In directory subversions:/tmp/cvs-serv32743
Modified Files:
Tag: Version-0_9_14-branch
navbar.inc.php navbar.tpl
Log Message:
skwashd's navbar-patch, was not useing the navbar_text value
Index: navbar.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/templates/verdilak/Attic/navbar.inc.php,v
retrieving revision 1.27.2.2
retrieving revision 1.27.2.3
diff -C2 -r1.27.2.2 -r1.27.2.3
*** navbar.inc.php 5 Mar 2003 00:13:07 -0000 1.27.2.2
--- navbar.inc.php 10 Mar 2003 22:47:39 -0000 1.27.2.3
***************
*** 1,154 ****
! <?php
!
/**************************************************************************\
! * phpGroupWare
*
! * http://www.phpgroupware.org
*
! * --------------------------------------------
*
! * This program is free software; you can redistribute it and/or modify
it *
! * under the terms of the GNU General Public License as published by
the *
! * Free Software Foundation; either version 2 of the License, or (at
your *
! * option) any later version.
*
!
\**************************************************************************/
!
! /* $Id$ */
!
! function parse_navbar($force = False)
! {
! $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
!
! $tpl->set_file(
! array(
! 'navbar' => 'navbar.tpl'
! )
! );
!
! $var['img_root'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/verdilak/images';
! $var['table_bg_color'] =
$GLOBALS['phpgw_info']['theme']['navbar_bg'];
! $applications = '';
! while ($app = each($GLOBALS['phpgw_info']['navbar']))
! {
! if ($app[1]['title'] != 'Home' && $app[1]['title'] !=
'preferences' && ! ereg('About',$app[1]['title']) && $app[1]['title'] !=
'Logout')
! {
! if
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] !=
'text')
! {
! $title = '<img src="' . $app[1]['icon']
. '" alt="' . lang($app[1]['title']) . '" title="'
! . lang($app[1]['title']) . '"
border="0">';
! }
!
! if
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] !=
'icons')
! {
! $title .= '<br>' .
lang($app[1]['title']);
! }
! $applications .= '<br><a href="' .
$app[1]['url'] . '"';
! if
(isset($GLOBALS['phpgw_info']['flags']['navbar_target']) &&
!
$GLOBALS['phpgw_info']['flags']['navbar_target'])
! {
! $applications .= ' target="' .
$GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
! }
! $applications .= '>' . $title . '</a>';
! unset($title);
! }
! }
! $var['applications'] = $applications;
!
! if (isset($GLOBALS['phpgw_info']['theme']['special_logo']))
! {
! $var['logo'] =
$GLOBALS['phpgw_info']['theme']['special_logo'];
! }
! else
! {
! $var['logo'] = 'logo.gif';
! }
!
! $var['home_link'] =
$GLOBALS['phpgw_info']['navbar']['home']['url'];
! $var['preferences_link'] =
$GLOBALS['phpgw_info']['navbar']['preferences']['url'];
! $var['logout_link'] =
$GLOBALS['phpgw_info']['navbar']['logout']['url'];
! $var['help_link'] =
$GLOBALS['phpgw_info']['navbar']['about']['url'];
!
! if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home')
! {
! $var['welcome_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','welcome-red');
! }
! else
! {
! $var['welcome_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','welcome-grey');
! }
!
! if ($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'preferences')
! {
! $var['preferences_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','preferences-red');
! }
! else
! {
! $var['preferences_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','preferences-grey');
! }
! $var['logout_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','logout-grey');
!
! $var['powered_by'] = lang('Powered by phpGroupWare version
%1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
!
! if (isset($GLOBALS['phpgw_info']['navbar']['admin']) &&
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
! {
! $db = $GLOBALS['phpgw']->db;
! $db->query("select count(session_id) from
phpgw_sessions where session_flags != 'A'");
! $db->next_record();
! $var['current_users'] = '<a style="font-family:
Geneva,Arial,Helvetica,sans-serif; font-size: 12pt;" href="'
! .
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
. '"> '
! . lang('Current users') . ': ' . $db->f(0) .
'</a>';
! }
! $now = time();
! $var['user_info'] =
$GLOBALS['phpgw']->common->display_fullname() . ' - '
! . lang($GLOBALS['phpgw']->common->show_date($now,'l'))
. ' '
! .
$GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! // . 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
! // to get rid of duplicate code.
! if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
! {
! $api_messages = lang('You are required to change your
password during your first login')
! . '<br> Click this image on the navbar: <img src="'
! .
$GLOBALS['phpgw']->common->image('preferences','navbar.gif').'">';
! }
! else if ($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);
! }
!
! // This is gonna change
! if (isset($cd))
! {
! $var['messages'] = $api_messages . '<br>' .
checkcode($cd);
! }
! $tpl->set_var($var);
! $tpl->pfp('out','navbar');
! // If the application has a header include, we now include it
! if (address@hidden'phpgw_info']['flags']['noappheader'] &&
@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
! {
! list($app,$class,$method) =
explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
! if (is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['header'])
! {
! $GLOBALS[$class]->header();
! }
! }
! $GLOBALS['phpgw']->hooks->process('after_navbar');
! return;
! }
!
! function parse_navbar_end()
! {
! $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
!
! $tpl->set_file(
! array(
! 'footer' => 'footer.tpl'
! )
! );
! $var = Array(
! 'img_root' =>
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/verdilak/images',
! 'table_bg_color' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
! 'version' =>
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
! );
! $tpl->set_var($var);
! $GLOBALS['phpgw']->hooks->process('navbar_end');
! echo $tpl->pfp('out','footer');
! }
--- 1,155 ----
! <?php
!
/**************************************************************************\
! * phpGroupWare
*
! * http://www.phpgroupware.org
*
! * --------------------------------------------
*
! * This program is free software; you can redistribute it and/or modify
it *
! * under the terms of the GNU General Public License as published by
the *
! * Free Software Foundation; either version 2 of the License, or (at
your *
! * option) any later version.
*
!
\**************************************************************************/
!
! /* $Id$ */
!
! function parse_navbar($force = False)
! {
! $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
!
! $tpl->set_file(
! array(
! 'navbar' => 'navbar.tpl'
! )
! );
!
! $var['img_root'] =
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/verdilak/images';
! $var['table_bg_color'] =
$GLOBALS['phpgw_info']['theme']['navbar_bg'];
! $var['navbar_text'] =
$GLOBALS['phpgw_info']['theme']['navbar_text'];
! $applications = '';
! while ($app = each($GLOBALS['phpgw_info']['navbar']))
! {
! if ($app[1]['title'] != 'Home' && $app[1]['title'] !=
'preferences' && ! ereg('About',$app[1]['title']) && $app[1]['title'] !=
'Logout')
! {
! if
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] !=
'text')
! {
! $title = '<img src="' . $app[1]['icon']
. '" alt="' . lang($app[1]['title']) . '" title="'
! . lang($app[1]['title']) . '"
border="0">';
! }
!
! if
($GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'] !=
'icons')
! {
! $title .= '<br>' .
lang($app[1]['title']);
! }
! $applications .= '<br><a href="' .
$app[1]['url'] . '"';
! if
(isset($GLOBALS['phpgw_info']['flags']['navbar_target']) &&
!
$GLOBALS['phpgw_info']['flags']['navbar_target'])
! {
! $applications .= ' target="' .
$GLOBALS['phpgw_info']['flags']['navbar_target'] . '"';
! }
! $applications .= '>' . $title . '</a>';
! unset($title);
! }
! }
! $var['applications'] = $applications;
!
! if (isset($GLOBALS['phpgw_info']['theme']['special_logo']))
! {
! $var['logo'] =
$GLOBALS['phpgw_info']['theme']['special_logo'];
! }
! else
! {
! $var['logo'] = 'logo.gif';
! }
!
! $var['home_link'] =
$GLOBALS['phpgw_info']['navbar']['home']['url'];
! $var['preferences_link'] =
$GLOBALS['phpgw_info']['navbar']['preferences']['url'];
! $var['logout_link'] =
$GLOBALS['phpgw_info']['navbar']['logout']['url'];
! $var['help_link'] =
$GLOBALS['phpgw_info']['navbar']['about']['url'];
!
! if ($GLOBALS['phpgw_info']['flags']['currentapp'] == 'home')
! {
! $var['welcome_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','welcome-red');
! }
! else
! {
! $var['welcome_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','welcome-grey');
! }
!
! if ($GLOBALS['phpgw_info']['flags']['currentapp'] ==
'preferences')
! {
! $var['preferences_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','preferences-red');
! }
! else
! {
! $var['preferences_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','preferences-grey');
! }
! $var['logout_img'] =
$GLOBALS['phpgw']->common->image('phpgwapi','logout-grey');
!
! $var['powered_by'] = lang('Powered by phpGroupWare version
x',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
!
! if (isset($GLOBALS['phpgw_info']['navbar']['admin']) &&
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
! {
! $db = $GLOBALS['phpgw']->db;
! $db->query("select count(session_id) from
phpgw_sessions where session_flags != 'A'");
! $db->next_record();
! $var['current_users'] = '<a style="font-family:
Geneva,Arial,Helvetica,sans-serif; font-size: 12pt;" href="'
! .
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uicurrentsessions.list_sessions')
. '"> '
! . lang('Current users') . ': ' . $db->f(0) .
'</a>';
! }
! $now = time();
! $var['user_info'] =
$GLOBALS['phpgw']->common->display_fullname() . ' - '
! . lang($GLOBALS['phpgw']->common->show_date($now,'l'))
. ' '
! .
$GLOBALS['phpgw']->common->show_date($now,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
! // . 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
! // to get rid of duplicate code.
! if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] == 0)
! {
! $api_messages = lang('You are required to change your
password during your first login')
! . '<br> Click this image on the navbar: <img src="'
! .
$GLOBALS['phpgw']->common->image('preferences','navbar.gif').'">';
! }
! else if ($GLOBALS['phpgw_info']['user']['lastpasswd_change'] <
time() - (86400*30))
! {
! $api_messages = lang('it has been more then x days
since you changed your password',30);
! }
!
! // This is gonna change
! if (isset($cd))
! {
! $var['messages'] = $api_messages . '<br>' .
checkcode($cd);
! }
! $tpl->set_var($var);
! $tpl->pfp('out','navbar');
! // If the application has a header include, we now include it
! if (address@hidden'phpgw_info']['flags']['noappheader'] &&
@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
! {
! list($app,$class,$method) =
explode('.',$GLOBALS['HTTP_GET_VARS']['menuaction']);
! if (is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['header'])
! {
! $GLOBALS[$class]->header();
! }
! }
! $GLOBALS['phpgw']->hooks->process('after_navbar');
! return;
! }
!
! function parse_navbar_end()
! {
! $tpl = createobject('phpgwapi.Template',PHPGW_TEMPLATE_DIR);
!
! $tpl->set_file(
! array(
! 'footer' => 'footer.tpl'
! )
! );
! $var = Array(
! 'img_root' =>
$GLOBALS['phpgw_info']['server']['webserver_url'] .
'/phpgwapi/templates/verdilak/images',
! 'table_bg_color' =>
$GLOBALS['phpgw_info']['theme']['navbar_bg'],
! 'version' =>
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
! );
! $tpl->set_var($var);
! $GLOBALS['phpgw']->hooks->process('navbar_end');
! echo $tpl->pfp('out','footer');
! }
Index: navbar.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/verdilak/Attic/navbar.tpl,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -r1.12 -r1.12.2.1
*** navbar.tpl 8 Sep 2001 14:38:20 -0000 1.12
--- navbar.tpl 10 Mar 2003 22:47:39 -0000 1.12.2.1
***************
*** 1,33 ****
!
! <!-- BEGIN navbar -->
!
! <table border="0" cellspacing="0" cellpadding="0" width="100%"
bgcolor="{table_bg_color}">
! <tr background="{img_root}/bg_filler.gif">
! <td background="{img_root}/bg_filler.gif" align="left" valign="bottom"><a
href="http://www.phpgroupware.org"; target="_new"><img src="{img_root}/{logo}"
border="0" alt="phpGroupWare"></a></td>
! <td background="{img_root}/bg_filler.gif" align="center" valign="bottom"
width="100%"><font color="FFFFFF" size="-1">{user_info}</font></td>
! <td background="{img_root}/bg_filler.gif" align="right" valign="bottom"
rowspan="2" nowrap><a href="{home_link}"><img src="{welcome_img}" border="0"
alt="Welcome"></a><a href="{preferences_link}"><img src="{preferences_img}"
border="0" alt="Preferences"></a><a href="{logout_link}"><img
src="{logout_img}" border="0" alt="Logout"></a><a href="{help_link}"><img
src="{img_root}/help.gif" border="0" alt="Help"></a></td></tr>
! <tr background="{img_root}/bg_filler.gif">
! <td align="center" width="100%" valign="bottom" colspan="2"><img
src="{img_root}/greybar.jpg" height="6" width="100%" alt="bar"></td></tr>
! </table>
!
! <table border="0" cellspacing="0" cellpadding="0" width="100%">
! <tr valign="top">
! <td background="{img_root}/navbar_filler.jpg" align="left">
! {applications}
! </td>
! <td width="100%">
! <table border="0" cellspacing="1" cellpadding="1" width="100%">
! <tr>
! <td align="left">
! {current_users}
! </td>
! <td align="right">
! <font style="font-family: Geneva,Arial,Helvetica,sans-serif; font-size:
12pt;">{powered_by}</font>
! </td>
! </tr>
! </table>
! <table border="0" cellpadding="5" width="100%">
! <tr>
! <td>
! <center>{messages}</center>
! <!-- END navbar -->
--- 1,33 ----
!
! <!-- BEGIN navbar -->
!
! <table border="0" cellspacing="0" cellpadding="0" width="100%"
bgcolor="{table_bg_color}">
! <tr background="{img_root}/bg_filler.gif">
! <td background="{img_root}/bg_filler.gif" align="left" valign="bottom"><a
href="http://www.phpgroupware.org"; target="_new"><img src="{img_root}/{logo}"
border="0" alt="phpGroupWare"></a></td>
! <td background="{img_root}/bg_filler.gif" align="center" valign="bottom"
width="100%"><font color="{navbar_text}" size="-1">{user_info}</font></td>
! <td background="{img_root}/bg_filler.gif" align="right" valign="bottom"
rowspan="2" nowrap><a href="{home_link}"><img src="{welcome_img}" border="0"
alt="Welcome"></a><a href="{preferences_link}"><img src="{preferences_img}"
border="0" alt="Preferences"></a><a href="{logout_link}"><img
src="{logout_img}" border="0" alt="Logout"></a><a href="{help_link}"><img
src="{img_root}/help.gif" border="0" alt="Help"></a></td></tr>
! <tr background="{img_root}/bg_filler.gif">
! <td align="center" width="100%" valign="bottom" colspan="2"><img
src="{img_root}/greybar.jpg" height="6" width="100%" alt="bar"></td></tr>
! </table>
!
! <table border="0" cellspacing="0" cellpadding="0" width="100%">
! <tr valign="top">
! <td background="{img_root}/navbar_filler.jpg" align="left">
! {applications}
! </td>
! <td width="100%">
! <table border="0" cellspacing="1" cellpadding="1" width="100%">
! <tr>
! <td align="left">
! {current_users}
! </td>
! <td align="right">
! <font style="font-family: Geneva,Arial,Helvetica,sans-serif; font-size:
12pt;">{powered_by}</font>
! </td>
! </tr>
! </table>
! <table border="0" cellpadding="5" width="100%">
! <tr>
! <td>
! <center>{messages}</center>
! <!-- END navbar -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/templates/verdilak navbar.inc.php,1.27.2.2,1.27.2.3 navbar.tpl,1.12,1.12.2.1,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/themes purple.theme,1.2.4.1,1.2.4.2 yellows.theme,1.2,1.2.4.1
- Next by Date:
[Phpgroupware-cvs] CVS: calendar/setup holidays.DE,NONE,1.1.2.1
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/themes purple.theme,1.2.4.1,1.2.4.2 yellows.theme,1.2,1.2.4.1
- Next by thread:
[Phpgroupware-cvs] CVS: calendar/setup holidays.DE,NONE,1.1.2.1
- Index(es):