[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.74,1.75
From: |
Mark A Peters <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.74,1.75 class.uicalendar.inc.php,1.77,1.78 |
Date: |
Sun, 05 May 2002 13:47:19 -0400 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv15822
Modified Files:
class.bocalendar.inc.php class.uicalendar.inc.php
Log Message:
This should solve the problem with the matrix view. Also a little format
fixing.
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** class.bocalendar.inc.php 19 Apr 2002 14:02:31 -0000 1.74
--- class.bocalendar.inc.php 5 May 2002 17:47:15 -0000 1.75
***************
*** 1850,1855 ****
{
$event = $this->cached_events[$fulldate][$k];
! $eventstart =
$this->datetime->localdates($event->datetime);
! $eventend =
$this->datetime->localdates($event->edatetime);
$start = ($eventstart['hour'] * 10000) +
($eventstart['minute'] * 100);
$starttemp = $this->splittime("$start",False);
--- 1850,1855 ----
{
$event = $this->cached_events[$fulldate][$k];
! $eventstart =
$this->datetime->localdates($this->maketime($event['start']) -
$this->datetime->tz_offset);
! $eventend =
$this->datetime->localdates($this->maketime($event['end']) -
$this->datetime->tz_offset);
$start = ($eventstart['hour'] * 10000) +
($eventstart['minute'] * 100);
$starttemp = $this->splittime("$start",False);
Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -r1.77 -r1.78
*** class.uicalendar.inc.php 25 Apr 2002 13:10:22 -0000 1.77
--- class.uicalendar.inc.php 5 May 2002 17:47:15 -0000 1.78
***************
*** 441,461 ****
$var = Array(
! 'printer_friendly' =>
$printer,
! 'bg_text'
=> $this->theme['bg_text'],
! 'small_calendar_prev' => $minical_prev,
! 'prev_week_link' =>
$prev_week_link,
! 'small_calendar_this' => $minical_this,
! 'week_identifier' =>
$this->bo->get_week_label(),
! 'next_week_link' =>
$next_week_link,
! 'username'
=> $GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner),
! 'small_calendar_next' => $minical_next,
! 'week_display' =>
$this->display_weekly(
Array(
'date' =>
sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day),
'showyear' => true,
! 'owners' =>
$this->bo->owner
)
),
! 'print'
=> $print
);
--- 441,461 ----
$var = Array(
! 'printer_friendly' => $printer,
! 'bg_text' =>
$this->theme['bg_text'],
! 'small_calendar_prev' => $minical_prev,
! 'prev_week_link' => $prev_week_link,
! 'small_calendar_this' => $minical_this,
! 'week_identifier' =>
$this->bo->get_week_label(),
! 'next_week_link' => $next_week_link,
! 'username' =>
$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner),
! 'small_calendar_next' => $minical_next,
! 'week_display' =>
$this->display_weekly(
Array(
'date' =>
sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day),
'showyear' => true,
! 'owners' =>
$this->bo->owner
)
),
! 'print' => $print
);
***************
*** 1600,1604 ****
{
case 'free/busy':
! $freetime =
$this->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year);
echo $this->timematrix(
Array(
--- 1600,1604 ----
{
case 'free/busy':
! $freetime =
$this->datetime->gmtdate(mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year));
echo $this->timematrix(
Array(
***************
*** 2317,2325 ****
$p->set_file(
! Array (
! 'month_header' => 'month_header.tpl',
! 'month_day' => 'month_day.tpl'
! )
! );
$p->set_block('month_header','monthly_header','monthly_header');
$p->set_block('month_header','month_column','month_column');
--- 2317,2325 ----
$p->set_file(
! Array (
! 'month_header' => 'month_header.tpl',
! 'month_day' => 'month_day.tpl'
! )
! );
$p->set_block('month_header','monthly_header','monthly_header');
$p->set_block('month_header','month_column','month_column');
***************
*** 2431,2435 ****
if($this->debug)
{
! echo '<!-- datetime:gmtdate =
'.$this->datetime->gmtdate.' -->'."\n";
}
--- 2431,2435 ----
if($this->debug)
{
! echo '<!-- datetime:gmtdate =
'.$this->datetime->cv_gmtdate.' -->'."\n";
}
***************
*** 2844,2848 ****
'day_cal' => 'day_cal.tpl'
);
! $p->set_file($templates);
$p->set_block('day_cal','day','day');
$p->set_block('day_cal','day_row','day_row');
--- 2844,2848 ----
'day_cal' => 'day_cal.tpl'
);
! $p->set_file($templates);
$p->set_block('day_cal','day','day');
$p->set_block('day_cal','day_row','day_row');
***************
*** 2880,2884 ****
{
$rowspan_arr[$i][$j] = 0;
! $time[$ind][$j] = '';
}
}
--- 2880,2884 ----
{
$rowspan_arr[$i][$j] = 0;
! $time[$ind][$j] = '';
}
}
***************
*** 2894,2900 ****
}
if($daily[$date_to_eval]['appts'])
! {
! $starttime = 0;
! $endtime = 0;
$events =
$this->bo->cached_events[$date_to_eval];
$c_events = count($events);
--- 2894,2900 ----
}
if($daily[$date_to_eval]['appts'])
! {
! $starttime = 0;
! $endtime = 0;
$events =
$this->bo->cached_events[$date_to_eval];
$c_events = count($events);
***************
*** 3158,3166 ****
$GLOBALS['phpgw']->preferences->save_repository();
}
! // $increment = $this->bo->prefs['calendar']['interval'];
! $increment = 15;
$interval = (int)(60 / $increment);
! $pix =
$GLOBALS['phpgw']->common->image('calendar','pix.gif');
$str =
'<center>'.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'l'))
--- 3158,3166 ----
$GLOBALS['phpgw']->preferences->save_repository();
}
! $increment = $this->bo->prefs['calendar']['interval'];
! // $increment = 15;
$interval = (int)(60 / $increment);
! $pix =
$GLOBALS['phpgw']->common->image('calendar','pix');
$str =
'<center>'.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'l'))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.74,1.75 class.uicalendar.inc.php,1.77,1.78,
Mark A Peters <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.11,1.66.2.12
- Next by Date:
[Phpgroupware-cvs] CVS: felamimail/inc class.bocompose.inc.php,1.1.1.1.2.2,1.1.1.1.2.3 class.bofelamimail.inc.php,1.2.2.3,1.2.2.4 class.uicompose.inc.php,1.1.1.1.2.2,1.1.1.1.2.3 class.uifelamimail.inc.php,1.2.2.2,1.2.2.3
- Previous by thread:
[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.11,1.66.2.12
- Next by thread:
[Phpgroupware-cvs] CVS: felamimail/inc class.bocompose.inc.php,1.1.1.1.2.2,1.1.1.1.2.3 class.bofelamimail.inc.php,1.2.2.3,1.2.2.4 class.uicompose.inc.php,1.1.1.1.2.2,1.1.1.1.2.3 class.uifelamimail.inc.php,1.2.2.2,1.2.2.3
- Index(es):