[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.51
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.51,1.66.2.52 |
|
Date: |
Wed, 26 Feb 2003 13:54:34 -0500 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv16669
Modified Files:
Tag: Version-0_9_14-branch
class.uicalendar.inc.php
Log Message:
- fixed bug #2079 and #2480: description is twice in the printer-friendly view
of week and month
- printer-friendly view of week and year work now for date other than the
actual date
- prev. and next-week arrows/links removed from printer-friendly view
- prev. and next-week arrows/links are align=center und valing=middle now
Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.51
retrieving revision 1.66.2.52
diff -C2 -r1.66.2.51 -r1.66.2.52
*** class.uicalendar.inc.php 26 Feb 2003 16:21:29 -0000 1.66.2.51
--- class.uicalendar.inc.php 26 Feb 2003 18:54:20 -0000 1.66.2.52
***************
*** 468,478 ****
$prev_week_link = '<a
href="'.$this->page('week','&date='.$prev['full']).'"><<</a>';
$next_week_link = '<a
href="'.$this->page('week','&date='.$next['full']).'">>></a>';
! $print = '<a
href="'.$this->page('week','&friendly=1')."\" TARGET=\"cal_printer_friendly\"
onMouseOver=\"window.status = '".lang('Generate printer-friendly
version')."'\">[".lang('Printer Friendly').']</a>';
}
else
{
$printer = '<body
bgcolor="'.$this->theme['bg_color'].'">';
! $prev_week_link = '<<';
! $next_week_link = '>>';
$print = '';
$GLOBALS['phpgw_info']['flags']['nofooter'] =
True;
--- 468,478 ----
$prev_week_link = '<a
href="'.$this->page('week','&date='.$prev['full']).'"><<</a>';
$next_week_link = '<a
href="'.$this->page('week','&date='.$next['full']).'">>></a>';
! $print = '<a
href="'.$this->page('week','&friendly=1&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day))."\"
TARGET=\"cal_printer_friendly\" onMouseOver=\"window.status =
'".lang('Generate printer-friendly version')."'\">[".lang('Printer
Friendly').']</a>';
}
else
{
$printer = '<body
bgcolor="'.$this->theme['bg_color'].'">';
! $prev_week_link = '';
! $next_week_link = '';
$print = '';
$GLOBALS['phpgw_info']['flags']['nofooter'] =
True;
***************
*** 595,599 ****
$right_link = '<a
href="'.$this->page('year','&year='.($this->bo->year + 1)).'">>></a>';
$link = 'day';
! $printer = '<a
href="'.$this->page('year','&friendly=1').'" target="cal_printer_friendly"
onMouseOver="window.status = '."'".lang('Generate printer-friendly
version')."'".'">['.lang('Printer Friendly').']</a>';
}
else
--- 595,599 ----
$right_link = '<a
href="'.$this->page('year','&year='.($this->bo->year + 1)).'">>></a>';
$link = 'day';
! $printer = '<a
href="'.$this->page('year','&friendly=1&year='.$this->bo->year).'"
target="cal_printer_friendly" onMouseOver="window.status = '."'".lang('Generate
printer-friendly version')."'".'">['.lang('Printer Friendly').']</a>';
}
else
***************
*** 2537,2541 ****
$this->link_tpl->set_var('lang_view',lang('View
this entry'));
$this->link_tpl->parse('picture','link_open',True);
!
if($event['priority'] == 3)
{
--- 2537,2541 ----
$this->link_tpl->set_var('lang_view',lang('View
this entry'));
$this->link_tpl->parse('picture','link_open',True);
!
if($event['priority'] == 3)
{
***************
*** 2626,2633 ****
$this->output_template_array($this->link_tpl,'picture','pict',$var);
}
- }
- 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)
--- 2626,2629 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.51,1.66.2.52,
Ralf Becker <address@hidden> <=