[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.197,1.198 fu
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.197,1.198 functions.inc.php,1.167,1.168 |
Date: |
Sun, 20 Apr 2003 16:41:08 -0400 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv4315/inc
Modified Files:
class.common.inc.php functions.inc.php
Log Message:
added app_header via $GLOBALS['phpgw_info']['flags']['app_header']
Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.197
retrieving revision 1.198
diff -C2 -r1.197 -r1.198
*** class.common.inc.php 20 Apr 2003 02:16:22 -0000 1.197
--- class.common.inc.php 20 Apr 2003 20:41:06 -0000 1.198
***************
*** 1237,1241 ****
$var['help_statustext'] =
$GLOBALS['phpgw_info']['navbar']['help']['title'];
! if (isset($GLOBALS['phpgw_ifo']['navbar']['admin']) &&
isset($GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers']))
{
$var['current_users'] = lang('Current
users') . ': ' . $GLOBALS['phpgw']->session->total();
--- 1237,1241 ----
$var['help_statustext'] =
$GLOBALS['phpgw_info']['navbar']['help']['title'];
! if (isset($GLOBALS['phpgw_info']['navbar']['admin']) &&
$GLOBALS['phpgw_info']['user']['preferences']['common']['show_currentusers'])
{
$var['current_users'] = lang('Current
users') . ': ' . $GLOBALS['phpgw']->session->total();
***************
*** 1320,1324 ****
$menuaction = get_var('menuaction',Array('GET'));
-
if ($menuaction &&
$GLOBALS['phpgw_info']['flags']['xslt_app'])
{
--- 1320,1323 ----
***************
*** 1336,1339 ****
--- 1335,1365 ----
$var['navbar_format'] =
$GLOBALS['phpgw_info']['user']['preferences']['common']['navbar_format'];
+ if
(isset($GLOBALS['phpgw_info']['flags']['app_header']))
+ {
+ $var['app_header'] =
$GLOBALS['phpgw_info']['flags']['app_header'];
+ }
+ $var['java_script'] = $var['app_css'] = '';
+ if (isset($_GET['menuaction']))
+ {
+ list($app,$class,$method) =
explode('.',$_GET['menuaction']);
+ $class = CreateObject("$app.$class");
+ if (isset($class->public_functions['css']))
+ {
+ $var['app_css'] = $class->css();
+ }
+ if
(isset($class->public_functions['java_script']))
+ {
+ $var['java_script'] =
$class->java_script();
+ }
+ unset($class);
+ }
+ if (isset($GLOBALS['phpgw_info']['flags']['css']))
+ {
+ $var['app_css'] .=
$GLOBALS['phpgw_info']['flags']['css'];
+ }
+ if
(isset($GLOBALS['phpgw_info']['flags']['java_script']))
+ {
+ $var['java_script'] .=
$GLOBALS['phpgw_info']['flags']['java_script'];
+ }
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var);
}
***************
*** 1627,1630 ****
--- 1653,1657 ----
}
+ $this->framework();
$GLOBALS['phpgw']->xslttpl->pp();
$GLOBALS['phpgw']->db->disconnect();
Index: functions.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/functions.inc.php,v
retrieving revision 1.167
retrieving revision 1.168
diff -C2 -r1.167 -r1.168
*** functions.inc.php 31 Mar 2003 16:50:49 -0000 1.167
--- functions.inc.php 20 Apr 2003 20:41:06 -0000 1.168
***************
*** 405,410 ****
}
- $GLOBALS['phpgw']->common->framework();
-
$GLOBALS['phpgw']->template->set_root(PHPGW_APP_TPL);
--- 405,408 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.197,1.198 functions.inc.php,1.167,1.168,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety phpgw.xsl,1.14,1.15
- Next by Date:
[Phpgroupware-cvs] CVS: phpgwapi/templates/funkwerk/css funkwerk.css,1.3,1.4 phpgw.css,1.4,1.5 werft.css,1.1,1.2
- Previous by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/idsociety phpgw.xsl,1.14,1.15
- Next by thread:
[Phpgroupware-cvs] CVS: phpgwapi/templates/funkwerk/css funkwerk.css,1.3,1.4 phpgw.css,1.4,1.5 werft.css,1.1,1.2
- Index(es):