[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/templates/verdilak footer.tpl,1.5,1.5.8
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/templates/verdilak footer.tpl,1.5,1.5.8.1 head.inc.php,1.12.4.2,1.12.4.3 head.tpl,1.6.2.1,1.6.2.1.2.1 navbar.inc.php,1.27.2.6.2.1,1.27.2.6.2.2 navbar.tpl,1.12.2.1.2.1,1.12.2.1.2.2 |
|
Date: |
Sat, 19 Apr 2003 17:10:09 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/templates/verdilak
In directory subversions:/tmp/cvs-serv17853/verdilak
Modified Files:
Tag: Version-0_9_16-branch
footer.tpl head.inc.php head.tpl navbar.inc.php navbar.tpl
Log Message:
updated app-header
Index: footer.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/verdilak/Attic/footer.tpl,v
retrieving revision 1.5
retrieving revision 1.5.8.1
diff -C2 -r1.5 -r1.5.8.1
*** footer.tpl 31 Mar 2001 11:17:30 -0000 1.5
--- footer.tpl 19 Apr 2003 21:10:05 -0000 1.5.8.1
***************
*** 11,15 ****
<table border="0" cellspacing="0" cellpadding="0" width="100%"
bgcolor="{table_bg_color}">
<tr>
! <td background="{img_root}/bg_filler.gif"> </td>
</tr>
</table>
--- 11,17 ----
<table border="0" cellspacing="0" cellpadding="0" width="100%"
bgcolor="{table_bg_color}">
<tr>
! <td background="{img_root}/bg_filler.gif"><font
color=white>{user_info}</font> </td>
! <td background="{img_root}/bg_filler.gif"
align="center">{current_users}</td>
! <td background="{img_root}/bg_filler.gif" align="right"><font
color=white>{powered_by}</font></td>
</tr>
</table>
Index: head.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/verdilak/Attic/head.inc.php,v
retrieving revision 1.12.4.2
retrieving revision 1.12.4.3
diff -C2 -r1.12.4.2 -r1.12.4.3
*** head.inc.php 28 Mar 2003 15:08:22 -0000 1.12.4.2
--- head.inc.php 19 Apr 2003 21:10:05 -0000 1.12.4.3
***************
*** 12,16 ****
/* $Id$ */
! $app_css = '';
if(@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
--- 12,16 ----
/* $Id$ */
! $app_css = $java_script = '';
if(@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
***************
*** 20,23 ****
--- 20,35 ----
$app_css = $GLOBALS[$class]->css();
}
+ if(is_array($GLOBALS[$class]->public_functions) &&
$GLOBALS[$class]->public_functions['java_script'])
+ {
+ $java_script = $GLOBALS[$class]->java_script();
+ }
+ }
+ if (isset($GLOBALS['phpgw_info']['flags']['css']))
+ {
+ $app_css .= $GLOBALS['phpgw_info']['flags']['css'];
+ }
+ if (isset($GLOBALS['phpgw_info']['flags']['java_script']))
+ {
+ $java_script .= $GLOBALS['phpgw_info']['flags']['java_script'];
}
***************
*** 44,48 ****
'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
'body_tags' => $bodyheader,
! 'app_css' => $app_css
);
$tpl->set_var($var);
--- 56,61 ----
'website_title' =>
$GLOBALS['phpgw_info']['server']['site_title'] . $app,
'body_tags' => $bodyheader,
! 'app_css' => $app_css,
! 'java_script' => $java_script
);
$tpl->set_var($var);
Index: head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/verdilak/Attic/head.tpl,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.1.2.1
diff -C2 -r1.6.2.1 -r1.6.2.1.2.1
*** head.tpl 28 Mar 2002 18:56:56 -0000 1.6.2.1
--- head.tpl 19 Apr 2003 21:10:05 -0000 1.6.2.1.2.1
***************
*** 22,25 ****
--- 22,26 ----
-->
</STYLE>
+ {java_script}
<TITLE>{website_title}</TITLE>
</HEAD>
Index: navbar.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/templates/verdilak/Attic/navbar.inc.php,v
retrieving revision 1.27.2.6.2.1
retrieving revision 1.27.2.6.2.2
diff -C2 -r1.27.2.6.2.1 -r1.27.2.6.2.2
*** navbar.inc.php 28 Mar 2003 15:08:22 -0000 1.27.2.6.2.1
--- navbar.inc.php 19 Apr 2003 21:10:05 -0000 1.27.2.6.2.2
***************
*** 120,123 ****
--- 120,133 ----
$var['messages'] = $api_messages . '<br>' .
checkcode($cd);
}
+ if (isset($GLOBALS['phpgw_info']['flags']['app_header']))
+ {
+ $var['current_app_header'] =
$GLOBALS['phpgw_info']['flags']['app_header'];
+ $var['th_bg'] =
$GLOBALS['phpgw_info']['theme']['th_bg'];
+ }
+ else
+ {
+ $tpl->set_block('navbar','app_header','app_header');
+ $var['app_header'] = '';
+ }
$tpl->set_var($var);
// check if user is allowed to change his prefs
***************
*** 158,161 ****
--- 168,183 ----
'version' =>
$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']
);
+ if (isset($GLOBALS['phpgw_info']['navbar']['admin']) &&
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
+ {
+ $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')
. '"> '
+ . '<font color="white">'.lang('Current users')
. ': ' . $GLOBALS['phpgw']->session->total() . '</font></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']);
+ $var['powered_by'] = lang('Powered by phpGroupWare version
%1',$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
+
$tpl->set_var($var);
$GLOBALS['phpgw']->hooks->process('navbar_end');
Index: navbar.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/verdilak/Attic/navbar.tpl,v
retrieving revision 1.12.2.1.2.1
retrieving revision 1.12.2.1.2.2
diff -C2 -r1.12.2.1.2.1 -r1.12.2.1.2.2
*** navbar.tpl 28 Mar 2003 15:08:22 -0000 1.12.2.1.2.1
--- navbar.tpl 19 Apr 2003 21:10:06 -0000 1.12.2.1.2.2
***************
*** 5,9 ****
<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>{preferences_icon}<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">
--- 5,9 ----
<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>{preferences_icon}<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">
***************
*** 17,34 ****
</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 -->
--- 17,27 ----
</td>
<td width="100%">
! <!-- BEGIN app_header -->
! <div style="text-align: center; font-weight: bold; background-color: {th_bg};
padding:5px">{current_app_header}</div>
! <!-- END app_header -->
! <div align="center">{messages}</div>
<table border="0" cellpadding="5" width="100%">
<tr>
<td>
<!-- END navbar -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/templates/verdilak footer.tpl,1.5,1.5.8.1 head.inc.php,1.12.4.2,1.12.4.3 head.tpl,1.6.2.1,1.6.2.1.2.1 navbar.inc.php,1.27.2.6.2.1,1.27.2.6.2.2 navbar.tpl,1.12.2.1.2.1,1.12.2.1.2.2,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/linux-at-work.de head.inc.php,1.3.2.1.2.1,1.3.2.1.2.2 head.tpl,1.4.2.4,1.4.2.4.2.1 navbar.inc.php,1.6.2.6.2.1,1.6.2.6.2.2navbar.tpl,1.3.2.1.2.1,1.3.2.1.2.2
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idots head.inc.php,1.1.2.1,1.1.2.2 navbar.inc.php,1.1.2.3,1.1.2.4
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/linux-at-work.de head.inc.php,1.3.2.1.2.1,1.3.2.1.2.2 head.tpl,1.4.2.4,1.4.2.4.2.1 navbar.inc.php,1.6.2.6.2.1,1.6.2.6.2.2navbar.tpl,1.3.2.1.2.1,1.3.2.1.2.2
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idots head.inc.php,1.1.2.1,1.1.2.2 navbar.inc.php,1.1.2.3,1.1.2.4
- Index(es):