[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.165,1.166

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.common.inc.php 
Log Message:
update themes

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.165
retrieving revision 1.166
diff -C2 -r1.165 -r1.166
*** class.common.inc.php        18 Oct 2002 21:45:03 -0000      1.165
--- class.common.inc.php        19 Oct 2002 20:46:35 -0000      1.166
***************
*** 618,622 ****
                        while ($file = readdir($dh))
                        {
!                               if (eregi("\.css$", $file))
                                {
                                        $list[] = 
substr($file,0,strpos($file,'.'));
--- 618,622 ----
                        while ($file = readdir($dh))
                        {
!                               if (eregi("\.css$", $file) && $file != 
'phpgw.css')
                                {
                                        $list[] = 
substr($file,0,strpos($file,'.'));
***************
*** 1292,1296 ****
                                $css_file =  
$GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP . 
'templates' . SEP . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set'] . SEP . 
'css' . SEP . 'submarine.css';
                        }
- 
                        else
                        {
--- 1292,1295 ----
***************
*** 1300,1304 ****
                                
$GLOBALS['phpgw']->log->write(array('text'=>'F-Abort, No themes found'));
                        }
!                       $GLOBALS['phpgw']->template->set_var('phpgw_css','<link 
rel="stylesheet" type="text/css" href="' . $css_file . '">');
                }
  
--- 1299,1307 ----
                                
$GLOBALS['phpgw']->log->write(array('text'=>'F-Abort, No themes found'));
                        }
!                       $phpgw_css_file = 
$GLOBALS['phpgw_info']['server']['webserver_url'] . SEP . 'phpgwapi' . SEP . 
'templates' . SEP . 
$GLOBALS['phpgw_info']['user']['preferences']['common']['template_set']
!                                                       . SEP . 'css' . SEP . 
'phpgw.css';
! 
!                       $GLOBALS['phpgw']->template->set_var('phpgw_css','<link 
rel="stylesheet" type="text/css" href="' . $phpgw_css_file . '">' . "\n"
!                                                                               
                                        . '<link rel="stylesheet" 
type="text/css" href="' . $css_file . '">');
                }