[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.31,1.66.2.32

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv7404

Modified Files:
      Tag: Version-0_9_14-branch
        class.uicalendar.inc.php 
Log Message:
corrected in planner color for holidays and added the holiday-name

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.31
retrieving revision 1.66.2.32
diff -C2 -r1.66.2.31 -r1.66.2.32
*** class.uicalendar.inc.php    29 Oct 2002 14:47:22 -0000      1.66.2.31
--- class.uicalendar.inc.php    30 Oct 2002 14:07:35 -0000      1.66.2.32
***************
*** 1394,1404 ****
                                                                $color = 
$GLOBALS[\'phpgw_info\'][\'theme\'][\'cal_today\'];
                                                        }
!                                                       elseif ($dow == 0 || 
$dow == 6 || $this->bo->cached_holidays[$date])
                                                        {
!                                                               $color = 
$this->theme[\'holiday_color\'];
                                                        }
  
                                                        $hdr[2][\'.\'.$index] 
.= " bgcolor=\"$color\"";
!                                                       
                                                        $hdr[2][$index] = \'<a 
href="\'.$this->planner_html->link(\'/index.php\',
                                                                                
array(
--- 1394,1409 ----
                                                                $color = 
$GLOBALS[\'phpgw_info\'][\'theme\'][\'cal_today\'];
                                                        }
!                                                       elseif 
($this->bo->cached_holidays[$date])
                                                        {
!                                                               $color = 
$this->bo->holiday_color; 
!                                                               
$hdr[2][\'.\'.$index] .= \' 
title="\'.$this->bo->cached_holidays[$date][0][\'name\'].\'"\';
!                                                       }
!                                                       elseif ($dow == 0 || 
$dow == 6)
!                                                       {
!                                                               $color = 
$this->bo->theme[\'th_bg\'];
                                                        }
  
                                                        $hdr[2][\'.\'.$index] 
.= " bgcolor=\"$color\"";
! 
                                                        $hdr[2][$index] = \'<a 
href="\'.$this->planner_html->link(\'/index.php\',
                                                                                
array(