[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.2,1.71.2.3 class.uicalendar.inc.php,1.66.2.7,1.66.2.8

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.bocalendar.inc.php class.uicalendar.inc.php 
Log Message:
Small fixes for the calendar.

Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.2
retrieving revision 1.71.2.3
diff -C2 -r1.71.2.2 -r1.71.2.3
*** class.bocalendar.inc.php    16 Apr 2002 16:20:13 -0000      1.71.2.2
--- class.bocalendar.inc.php    19 Apr 2002 13:50:59 -0000      1.71.2.3
***************
*** 132,138 ****
                {
                        $this->grants = 
$GLOBALS['phpgw']->acl->get_grants('calendar');
- 
                        @reset($this->grants);
- 
                        if($this->debug)
                        {
--- 132,136 ----
***************
*** 272,276 ****
                                }
                        }
!                       
                        $this->today = date('Ymd',$this->datetime->gmtnow);
  
--- 270,274 ----
                                }
                        }
! 
                        $this->today = date('Ymd',$this->datetime->gmtnow);
  
***************
*** 1277,1285 ****
                function get_short_field($event,$is_private=True,$field='')
                {
!                       if ($is_private)
                        {
                                return 'private';
                        }
!                       elseif (strlen($event[$field]) > 19)
                        {
                                return substr($event[$field], 0 , 19) . '...';
--- 1275,1283 ----
                function get_short_field($event,$is_private=True,$field='')
                {
!                       if($is_private)
                        {
                                return 'private';
                        }
!                       elseif(strlen($event[$field]) > 19 && 
!$this->printer_friendly)
                        {
                                return substr($event[$field], 0 , 19) . '...';

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.7
retrieving revision 1.66.2.8
diff -C2 -r1.66.2.7 -r1.66.2.8
*** class.uicalendar.inc.php    17 Apr 2002 23:41:08 -0000      1.66.2.7
--- class.uicalendar.inc.php    19 Apr 2002 13:50:59 -0000      1.66.2.8
***************
*** 1949,1953 ****
                                . '  A.minicalgreyhol { background: 
'.$this->holiday_color.'; color: #999999; font: xx-small 
'.$this->theme['font'].' }'."\n"
                                . '  A.bminicalgreyhol { background: 
'.$this->holiday_color.'; color: #999999; font: italic bold xx-small 
'.$this->theme['font'].' }'."\n"
!                               . '  .event-on { background: 
'.$this->theme['row_on'].'; color: '.$this->theme['bg_text'].'; font: 100 
80%/110% '.$this->theme['font'].'; vertical-align: middle; }'."\n"
                                . '  .event-off { background: 
'.$this->theme['row_off'].'; color: '.$this->theme['bg_text'].'; font: 100 
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
                                . '  .event-holiday { background: 
'.$this->theme['bg04'].'; color: '.$this->theme['bg_text'].'; font: 100 
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
--- 1949,1953 ----
                                . '  A.minicalgreyhol { background: 
'.$this->holiday_color.'; color: #999999; font: xx-small 
'.$this->theme['font'].' }'."\n"
                                . '  A.bminicalgreyhol { background: 
'.$this->holiday_color.'; color: #999999; font: italic bold xx-small 
'.$this->theme['font'].' }'."\n"
!                               . '  .event-on { background: 
'.$this->theme['row_on'].'; color: '.$this->theme['bg_text'].'; font: 100 
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
                                . '  .event-off { background: 
'.$this->theme['row_off'].'; color: '.$this->theme['bg_text'].'; font: 100 
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
                                . '  .event-holiday { background: 
'.$this->theme['bg04'].'; color: '.$this->theme['bg_text'].'; font: 100 
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
***************
*** 2026,2030 ****
                                $time = '';
                        }
!                       $text = '';;
                        if(!$is_private)
                        {
--- 2026,2030 ----
                                $time = '';
                        }
!                       $text = '';
                        if(!$is_private)
                        {
***************
*** 2032,2036 ****
                        }
                        $text = '<font size="-2" 
face="'.$this->theme['font'].'"><nobr>'.$time.'</nobr>&nbsp;'.$this->bo->get_short_field($event,$is_private,'title').$text.'</font>'.$GLOBALS['phpgw']->browser->br;
!               
                        if ($editable)
                        {
--- 2032,2036 ----
                        }
                        $text = '<font size="-2" 
face="'.$this->theme['font'].'"><nobr>'.$time.'</nobr>&nbsp;'.$this->bo->get_short_field($event,$is_private,'title').$text.'</font>'.$GLOBALS['phpgw']->browser->br;
! 
                        if ($editable)
                        {
***************
*** 2104,2107 ****
--- 2104,2111 ----
                                }
                        }
+                       else
+                       {
+                               $text .= '<font size="-2" 
face="'.$this->theme['font'].'">'.nl2br($this->bo->get_short_field($event,$is_private,'description')).'</font>'.$GLOBALS['phpgw']->browser->br;
+                       }
                        if ($text)
                        {
***************
*** 2536,2540 ****
                function view_event($event,$alarms=False)
                {
!                       if(!$event['participants'][$this->bo->owner] && 
!$this->bo->member_of_group())
                        {
                                return '<center>'.lang('You do not have 
permission to read this record!').'</center>';
--- 2540,2544 ----
                function view_event($event,$alarms=False)
                {
!                       if((!$event['participants'][$this->bo->owner] && 
!$this->bo->member_of_group()) || (!$event['public'] && 
!$this->bo->check_perms(PHPGW_ACL_PRIVATE)))
                        {
                                return '<center>'.lang('You do not have 
permission to read this record!').'</center>';