[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/templates/linux-at-work.de head.inc.php
From: |
Ralf Becker <address@hidden> |
Subject: |
[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 |
Date: |
Sat, 19 Apr 2003 17:10:09 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de
In directory subversions:/tmp/cvs-serv17853/linux-at-work.de
Modified Files:
Tag: Version-0_9_16-branch
head.inc.php head.tpl navbar.inc.php navbar.tpl
Log Message:
updated app-header
Index: head.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/head.inc.php,v
retrieving revision 1.3.2.1.2.1
retrieving revision 1.3.2.1.2.2
diff -C2 -r1.3.2.1.2.1 -r1.3.2.1.2.2
*** head.inc.php 28 Mar 2003 15:08:22 -0000 1.3.2.1.2.1
--- head.inc.php 19 Apr 2003 21:10:05 -0000 1.3.2.1.2.2
***************
*** 23,27 ****
}
! $app_css = '';
if(@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
--- 23,27 ----
}
! $app_css = $java_script = '';
if(@isset($GLOBALS['HTTP_GET_VARS']['menuaction']))
{
***************
*** 31,34 ****
--- 31,46 ----
$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'];
}
***************
*** 69,73 ****
'css_hovlink' => $csshover,
'refreshTime' => $refreshTime,
! 'app_css' => $app_css
);
$tpl->set_var($var);
--- 81,86 ----
'css_hovlink' => $csshover,
'refreshTime' => $refreshTime,
! 'app_css' => $app_css,
! 'java_script' => $java_script
);
$tpl->set_var($var);
Index: head.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/head.tpl,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.4.2.1
diff -C2 -r1.4.2.4 -r1.4.2.4.2.1
*** head.tpl 11 Mar 2003 00:08:24 -0000 1.4.2.4
--- head.tpl 19 Apr 2003 21:10:05 -0000 1.4.2.4.2.1
***************
*** 209,213 ****
//-->
</script>
!
<TITLE>{website_title} - {app_name}</TITLE>
</HEAD>
--- 209,213 ----
//-->
</script>
! {java_script}
<TITLE>{website_title} - {app_name}</TITLE>
</HEAD>
Index: navbar.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/navbar.inc.php,v
retrieving revision 1.6.2.6.2.1
retrieving revision 1.6.2.6.2.2
diff -C2 -r1.6.2.6.2.1 -r1.6.2.6.2.2
*** navbar.inc.php 28 Mar 2003 15:08:22 -0000 1.6.2.6.2.1
--- navbar.inc.php 19 Apr 2003 21:10:05 -0000 1.6.2.6.2.2
***************
*** 77,80 ****
--- 77,81 ----
}
$var['phpgw_version'] = lang("version").":
".$GLOBALS['phpgw_info']['server']['versions']['phpgwapi'];
+
$tpl->set_var($var);
***************
*** 102,106 ****
// 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')
--- 103,107 ----
// 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')
***************
*** 116,122 ****
if (isset($cd))
{
! $var['messages'] = $api_messages . '<br>' .
checkcode($cd);
}
- */
$tpl->set_var($var);
// check if user is allowed to change his prefs
--- 117,137 ----
if (isset($cd))
{
! $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'];
! $var['message_top'] = '30px';
! $var['app_top'] = '40px';
! }
! else
! {
! $tpl->set_block('navbar','app_header','app_header');
! $var['app_header'] = '';
! $var['message_top'] = '0px';
! $var['app_top'] = '15px';
}
$tpl->set_var($var);
// check if user is allowed to change his prefs
Index: navbar.tpl
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/templates/linux-at-work.de/navbar.tpl,v
retrieving revision 1.3.2.1.2.1
retrieving revision 1.3.2.1.2.2
diff -C2 -r1.3.2.1.2.1 -r1.3.2.1.2.2
*** navbar.tpl 28 Mar 2003 15:08:22 -0000 1.3.2.1.2.1
--- navbar.tpl 19 Apr 2003 21:10:05 -0000 1.3.2.1.2.2
***************
*** 46,50 ****
</div>
! <div class="main_body" style="position: absolute; padding: 0px; height:100%;
left:150px ; top :0px ;
right:0px; overflow : auto">
<!-- END navbar -->
--- 46,55 ----
</div>
! <!-- BEGIN app_header -->
! <div style="position: absolute; padding: 0px; left:150px; top: 2px;
font-weight: bold; color: #ffffff; font-size:
14px;"> {current_app_header}<hr noshade></div>
! <!-- END app_header -->
! <div style="position: absolute; padding: 0px; left:150px; top:
{message_top};"> {messages}</div>
!
! <div class="main_body" style="position: absolute; padding: 0px; height: 90%;
left: 150px ; top: {app_top};
right:0px; overflow : auto">
<!-- END navbar -->
[Prev in Thread] |
Current Thread |
[Next in 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,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idots/source navbar32.xcf,1.1.2.2,1.1.2.3
- Next by Date:
[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
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idots/source navbar32.xcf,1.1.2.2,1.1.2.3
- Next by 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
- Index(es):