[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.71.2.26,
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.26,1.71.2.27 class.uicalendar.inc.php,1.66.2.41,1.66.2.42 |
Date: |
Sat, 16 Nov 2002 12:51:01 -0500 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv9584
Modified Files:
Tag: Version-0_9_14-branch
class.bocalendar.inc.php class.uicalendar.inc.php
Log Message:
Corrected day-view to use a day-label conformint with the dateformat in the
prefs.
Done with the same bo-function (renamed to long_date) as for the week-label.
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.26
retrieving revision 1.71.2.27
diff -C2 -r1.71.2.26 -r1.71.2.27
*** class.bocalendar.inc.php 16 Nov 2002 17:10:21 -0000 1.71.2.26
--- class.bocalendar.inc.php 16 Nov 2002 17:50:58 -0000 1.71.2.27
***************
*** 1266,1270 ****
}
! function date_range($first,$last)
{
$datefmt = $this->prefs['common']['dateformat'];
--- 1266,1270 ----
}
! function long_date($first,$last=0)
{
$datefmt = $this->prefs['common']['dateformat'];
***************
*** 1288,1291 ****
--- 1288,1295 ----
$range .=
($datefmt[0] != 'd' ? ', ' : ' ') . $first['year'];
}
+ if (!$last)
+ {
+ return $range;
+ }
$range .= ' - ';
***************
*** 1322,1328 ****
$last =
$GLOBALS['phpgw']->datetime->gmtdate($first['raw'] + 518400);
! return ($this->date_range($first,$last));
}
!
function normalizeminutes(&$minutes)
{
--- 1326,1332 ----
$last =
$GLOBALS['phpgw']->datetime->gmtdate($first['raw'] + 518400);
! return ($this->long_date($first,$last));
}
!
function normalizeminutes(&$minutes)
{
Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.41
retrieving revision 1.66.2.42
diff -C2 -r1.66.2.41 -r1.66.2.42
*** class.uicalendar.inc.php 16 Nov 2002 17:15:19 -0000 1.66.2.41
--- class.uicalendar.inc.php 16 Nov 2002 17:50:58 -0000 1.66.2.42
***************
*** 1229,1233 ****
$now = $GLOBALS['phpgw']->datetime->makegmttime(0,
0, 0, $this->bo->month, $this->bo->day, $this->bo->year);
$now['raw'] += $GLOBALS['phpgw']->datetime->tz_offset;
- $m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
$p =
CreateObject('phpgwapi.Template',$this->template_dir);
--- 1229,1232 ----
***************
*** 1251,1255 ****
),
'small_calendar' => $minical,
! 'date' =>
lang(date('F',$m)).' '.sprintf("%02d",$this->bo->day).', '.$this->bo->year,
'username' =>
$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner),
'print' => $print
--- 1250,1254 ----
),
'small_calendar' => $minical,
! 'date' =>
$this->bo->long_date($now),
'username' =>
$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner),
'print' => $print
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.26,1.71.2.27 class.uicalendar.inc.php,1.66.2.41,1.66.2.42,
Ralf Becker <address@hidden> <=