extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 17:38:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

- fixed bug #2079 and #2480: description is twice in the printer-friendly view of week and month

Browse Source 
- 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
This commit is contained in:
Ralf Becker 2003-02-26 18:58:01 +00:00
parent bdf2cb9d91
commit 8727041c6b
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
calendar/inc/class.uicalendar.inc.php
View File

@ -733,13 +733,13 @@
$printer = ''; $printer = '';
$prev_week_link = '<a href="'.$this->page('week','&date='.$prev['full']).'">&lt;&lt;</a>'; $prev_week_link = '<a href="'.$this->page('week','&date='.$prev['full']).'">&lt;&lt;</a>';
$next_week_link = '<a href="'.$this->page('week','&date='.$next['full']).'">&gt;&gt;</a>'; $next_week_link = '<a href="'.$this->page('week','&date='.$next['full']).'">&gt;&gt;</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>'; $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 else
{ {
$printer = '<body bgcolor="'.$this->theme['bg_color'].'">'; $printer = '<body bgcolor="'.$this->theme['bg_color'].'">';
$prev_week_link = '&lt;&lt;'; $prev_week_link = '';
$next_week_link = '&gt;&gt;'; $next_week_link = '';
$print = ''; $print = '';
$GLOBALS['phpgw_info']['flags']['nofooter'] = True; $GLOBALS['phpgw_info']['flags']['nofooter'] = True;
} }
@ -856,7 +856,7 @@
$left_link = '<a href="'.$this->page('year','&year='.($this->bo->year - 1)).'">&lt;&lt;</a>'; $left_link = '<a href="'.$this->page('year','&year='.($this->bo->year - 1)).'">&lt;&lt;</a>';
$right_link = '<a href="'.$this->page('year','&year='.($this->bo->year + 1)).'">&gt;&gt;</a>'; $right_link = '<a href="'.$this->page('year','&year='.($this->bo->year + 1)).'">&gt;&gt;</a>';
$link = 'day'; $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>'; $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 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('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->set_var('lang_view',lang('View this entry'));
$this->link_tpl->parse('picture','link_open',True); $this->link_tpl->parse('picture','link_open',True);
if($event['priority'] == 3) if($event['priority'] == 3)
{ {
$picture[] = Array( $picture[] = Array(
@ -2884,10 +2884,6 @@
$this->output_template_array($this->link_tpl,'picture','pict',$var); $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) if ($text)
{ {
$var = Array( $var = Array(

8
calendar/templates/default/week.tpl
View File

@ -5,14 +5,14 @@
<td align="left" valign="top" width="20%"> <td align="left" valign="top" width="20%">
{small_calendar_prev} {small_calendar_prev}
</td> </td>
<td align="left" valign="top" width="20%"> <td align="center" valign="middle" width="20%">
{prev_week_link} <b>{prev_week_link}</b>
</td> </td>
<td align="center" valign="top" width="20%"> <td align="center" valign="top" width="20%">
{small_calendar_this} {small_calendar_this}
</td> </td>
<td align="right" valign="top" width="20%"> <td align="center" valign="middle" width="20%">
{next_week_link} <b>{next_week_link}</b>
</td> </td>
<td align="right" valign="top" width="20%"> <td align="right" valign="top" width="20%">
{small_calendar_next} {small_calendar_next}