[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.201,1.202

[Bettina Gille <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv5337

Modified Files:
        class.common.inc.php 
Log Message:
update js and css

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.201
retrieving revision 1.202
diff -C2 -r1.201 -r1.202
*** class.common.inc.php        22 Apr 2003 22:30:38 -0000      1.201
--- class.common.inc.php        24 Apr 2003 01:34:44 -0000      1.202
***************
*** 1323,1332 ****
  
                        $menuaction     = get_var('menuaction',Array('GET'));
!                       if ($menuaction && 
$GLOBALS['phpgw_info']['flags']['xslt_app'])
                        {
                                list($app,$class,$method) = 
explode('.',$menuaction);
                                $var['app_tpl'] = $method;
-                               //$app_function = strrchr($menuaction,'.');
-                               //$var['app_tpl']       = 
substr($app_function,1,strlen($app_function));
                        }
  
--- 1323,1330 ----
  
                        $menuaction     = get_var('menuaction',Array('GET'));
!                       if ($menuaction && 
isset($GLOBALS['phpgw_info']['flags']['xslt_app']))
                        {
                                list($app,$class,$method) = 
explode('.',$menuaction);
                                $var['app_tpl'] = $method;
                        }
  
***************
*** 1342,1347 ****
                                $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']);
--- 1340,1347 ----
                                $var['app_header'] = 
$GLOBALS['phpgw_info']['flags']['app_header'];
                        }
! 
!                       $var['app_java_script'] = $var['app_css'] = 
$var['app_java_script_url'] = $var['app_css_url'] = '';
! 
!                       if (isset($_GET['menuaction']) && 
isset($GLOBALS['phpgw_info']['flags']['etemplate_app']))
                        {
                                list($app,$class,$method) = 
explode('.',$_GET['menuaction']);
***************
*** 1353,1360 ****
                                if 
(isset($class->public_functions['java_script']))
                                {
!                                       $var['java_script'] = 
$class->java_script();
                                }
                                unset($class);
                        }
                        if (isset($GLOBALS['phpgw_info']['flags']['css']))
                        {
--- 1353,1361 ----
                                if 
(isset($class->public_functions['java_script']))
                                {
!                                       $var['app_java_script'] = 
$class->java_script();
                                }
                                unset($class);
                        }
+ 
                        if (isset($GLOBALS['phpgw_info']['flags']['css']))
                        {
***************
*** 1363,1368 ****
                        if 
(isset($GLOBALS['phpgw_info']['flags']['java_script']))
                        {
!                               $var['java_script'] .= 
$GLOBALS['phpgw_info']['flags']['java_script'];
                        }
                        $GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var);
                }
--- 1364,1379 ----
                        if 
(isset($GLOBALS['phpgw_info']['flags']['java_script']))
                        {
!                               $var['app_java_script'] .= 
$GLOBALS['phpgw_info']['flags']['java_script'];
                        }
+ 
+                       if (isset($GLOBALS['phpgw_info']['flags']['css_url']))
+                       {
+                               $var['app_css_url'] = 
$GLOBALS['phpgw_info']['flags']['css_url'];
+                       }
+                       if 
(isset($GLOBALS['phpgw_info']['flags']['java_script_url']))
+                       {
+                               $var['app_java_script_url'] = 
$GLOBALS['phpgw_info']['flags']['java_script_url'];
+                       }
+ 
                        $GLOBALS['phpgw']->xslttpl->set_var('phpgw',$var);
                }