[Phpgroupware-cvs] CVS: phpgwapi/inc class.common.inc.php,1.204,1.205 class.nextmatchs.inc.php,1.57,1.58

[Bettina Gille <address@hidden>]

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

Modified Files:
        class.common.inc.php class.nextmatchs.inc.php 
Log Message:
update img

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.204
retrieving revision 1.205
diff -C2 -r1.204 -r1.205
*** class.common.inc.php        26 Apr 2003 20:52:59 -0000      1.204
--- class.common.inc.php        27 Apr 2003 14:10:15 -0000      1.205
***************
*** 820,826 ****
                }
  
!               function find_image($appname,$image,$navbar=False)
                {
                        static $imgpref;
                        if(! @$imgpref)
                        {
--- 820,832 ----
                }
  
!               function find_image($appname,$image,$force_layout=False)
                {
                        static $imgpref;
+ 
+                       if ($GLOBALS['phpgw_info']['server']['template_set'] == 
'idsociety' || $GLOBALS['phpgw_info']['server']['template_set'] == 'funkwerk')
+                       {
+                               $force_layout = True;
+                       }
+ 
                        if(! @$imgpref)
                        {
***************
*** 842,846 ****
                                $imagedir = 
'/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';
  
!                               if (!$navbar)
                                {
                                        $imagedir_olddefault = 
'/'.$appname.'/images';
--- 848,852 ----
                                $imagedir = 
'/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';
  
!                               if (!$force_layout)
                                {
                                        $imagedir_olddefault = 
'/'.$appname.'/images';
***************
*** 927,931 ****
                }
  
!               function 
image($appname,$image='',$ext='',$navbar=False,$use_lang=True)
                {
                        if (!is_array($image))
--- 933,937 ----
                }
  
!               function 
image($appname,$image='',$ext='',$force_layout=False,$use_lang=True)
                {
                        if (!is_array($image))
***************
*** 954,958 ****
                                else
                                {
!                                       $image_found = 
$this->find_image($appname,$img.$ext,$navbar);
                                }
                        }
--- 960,964 ----
                                else
                                {
!                                       $image_found = 
$this->find_image($appname,$img.$ext,$force_layout);
                                }
                        }
***************
*** 960,964 ****
                }
  
!               function 
image_on($appname,$image,$extension='_on',$navbar=False)
                {
                        $with_extension = 
$this->image($appname,$image,$extension,$navbar);
--- 966,970 ----
                }
  
!               function 
image_on($appname,$image,$extension='_on',$force_layout=False)
                {
                        $with_extension = 
$this->image($appname,$image,$extension,$navbar);
***************
*** 1414,1426 ****
                        unset($newarray);
  
-                       if ($GLOBALS['phpgw_info']['server']['template_set'] == 
'idsociety' || $GLOBALS['phpgw_info']['server']['template_set'] == 'funkwerk')
-                       {
-                               $navbar = True;
-                       }
-                       else
-                       {
-                               $navbar = False;
-                       }
- 
                        foreach($GLOBALS['phpgw_info']['user']['apps'] as $app 
=> $data)
                        {
--- 1420,1423 ----
***************
*** 1438,1448 ****
                                        if ($app != 
$GLOBALS['phpgw_info']['flags']['currentapp'])
                                        {
!                                               
$GLOBALS['phpgw_info']['navbar'][$app]['icon']                  = 
$this->image($app,Array('navbar','nonav'),'',$navbar);
!                                               
$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover']    = 
$this->image_on($app,Array('navbar','nonav'),'-over',$navbar);
                                        }
                                        else
                                        {
!                                               
$GLOBALS['phpgw_info']['navbar'][$app]['icon']                  = 
$this->image_on($app,Array('navbar','nonav'),'-over',$navbar);
!                                               
$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover']    = 
$this->image($app,Array('navbar','nonav'),'',$navbar);
                                        }
                                }
--- 1435,1445 ----
                                        if ($app != 
$GLOBALS['phpgw_info']['flags']['currentapp'])
                                        {
!                                               
$GLOBALS['phpgw_info']['navbar'][$app]['icon']                  = 
$this->image($app,Array('navbar','nonav'));
!                                               
$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover']    = 
$this->image_on($app,Array('navbar','nonav'),'-over');
                                        }
                                        else
                                        {
!                                               
$GLOBALS['phpgw_info']['navbar'][$app]['icon']                  = 
$this->image_on($app,Array('navbar','nonav'),'-over');
!                                               
$GLOBALS['phpgw_info']['navbar'][$app]['icon_hover']    = 
$this->image($app,Array('navbar','nonav'));
                                        }
                                }
***************
*** 1644,1648 ****
                        if(is_array($file))
                        {
!                               $icon = 
$GLOBALS['phpgw']->common->image($appname,'navbar','',True);
  
                                while(is_array($file) && list($text,$url) = 
each($file))
--- 1641,1645 ----
                        if(is_array($file))
                        {
!                               $icon = $this->image($appname,'navbar');
  
                                while(is_array($file) && list($text,$url) = 
each($file))

Index: class.nextmatchs.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.nextmatchs.inc.php,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -r1.57 -r1.58
*** class.nextmatchs.inc.php    26 Apr 2003 01:19:45 -0000      1.57
--- class.nextmatchs.inc.php    27 Apr 2003 14:10:16 -0000      1.58
***************
*** 763,767 ****
                function template_alternate_row_color(&$tpl)
                {
!                       $tpl->set_var('tr_color',$this->alternate_row_color());
                }
  
--- 763,767 ----
                function template_alternate_row_color(&$tpl)
                {
!                       
$this->template->set_var('tr_color',$this->alternate_row_color());
                }