From 8727041c6b40940ba0c711ed349faee199959937 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 26 Feb 2003 18:58:01 +0000 Subject: [PATCH] - 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 --- calendar/inc/class.uicalendar.inc.php | 14 +++++--------- calendar/templates/default/week.tpl | 8 ++++---- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/calendar/inc/class.uicalendar.inc.php b/calendar/inc/class.uicalendar.inc.php index 6124f27ea8..fc380ae39c 100755 --- a/calendar/inc/class.uicalendar.inc.php +++ b/calendar/inc/class.uicalendar.inc.php @@ -733,13 +733,13 @@ $printer = ''; $prev_week_link = '<<'; $next_week_link = '>>'; - $print = '[".lang('Printer Friendly').']'; + $print = 'bo->year,$this->bo->month,$this->bo->day))."\" TARGET=\"cal_printer_friendly\" onMouseOver=\"window.status = '".lang('Generate printer-friendly version')."'\">[".lang('Printer Friendly').']'; } else { $printer = ''; - $prev_week_link = '<<'; - $next_week_link = '>>'; + $prev_week_link = ''; + $next_week_link = ''; $print = ''; $GLOBALS['phpgw_info']['flags']['nofooter'] = True; } @@ -856,7 +856,7 @@ $left_link = '<<'; $right_link = '>>'; $link = 'day'; - $printer = '['.lang('Printer Friendly').']'; + $printer = '['.lang('Printer Friendly').']'; } else { @@ -2794,7 +2794,7 @@ $this->link_tpl->set_var('link_link',$this->page('view','&cal_id='.$event['id'].'&date='.$date)); $this->link_tpl->set_var('lang_view',lang('View this entry')); $this->link_tpl->parse('picture','link_open',True); - + if($event['priority'] == 3) { $picture[] = Array( @@ -2884,10 +2884,6 @@ $this->output_template_array($this->link_tpl,'picture','pict',$var); } } - else - { - $text .= ''.nl2br($this->bo->get_short_field($event,$is_private,'description')).''.$GLOBALS['phpgw']->browser->br; - } if ($text) { $var = Array( diff --git a/calendar/templates/default/week.tpl b/calendar/templates/default/week.tpl index e8d964e65e..096f96ca17 100755 --- a/calendar/templates/default/week.tpl +++ b/calendar/templates/default/week.tpl @@ -5,14 +5,14 @@ {small_calendar_prev} - - {prev_week_link} + + {prev_week_link} {small_calendar_this} - - {next_week_link} + + {next_week_link} {small_calendar_next}