extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-11 00:18:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed more issues with calendar's display

Browse Source
This commit is contained in:
ak703 2004-03-16 22:02:34 +00:00
parent 439f33e2e8
commit 12ae5c11f9
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
calendar/inc/class.bocalendar.inc.php
View File

@ -1564,12 +1564,13 @@
return 'private'; return 'private';
} }
//NDEE: cutting off too long entries 140304 // cut off too long titles
//ToDo: calculate length based on client window elseif(strlen($event[$field]) > 19 && !$this->printer_friendly && $field=="title")
elseif(strlen($event[$field]) > 19 && !$this->printer_friendly && $field == "title")
// elseif(strlen($event[$field]) > 19 && $this->printer_friendly) // elseif(strlen($event[$field]) > 19 && $this->printer_friendly)
{ {
return substr($event[$field], 0 , 19) . ' ...'; // we dont use currently 160304
// return substr($event[$field], 0 , 19) . ' ...';
return $event[$field];
} }
else else
{ {

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

@ -203,7 +203,8 @@
if($this->bo->printer_friendly == False) if($this->bo->printer_friendly == False)
{ {
$month = '<a href="' . $this->page('month','&month='.$GLOBALS['phpgw']->common->show_date($date['raw'],'m').'&year='.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y')). '" class="minicalendar">' . lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).' '.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y').'</a>'; //NDEE $month = '<a href="' . $this->page('month','&month='.$GLOBALS['phpgw']->common->show_date($date['raw'],'m').'&year='.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y')). '" class="_minicalendar">' . lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).' '.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y').'</a>';
$month = '<a href="' . $this->page('month','&month='.$GLOBALS['phpgw']->common->show_date($date['raw'],'m').'&year='.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y')). '">' . lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).' '.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y').'</a>';
} }
else else
{ {
@ -3610,12 +3611,11 @@
$starttime = $param['starttime']; $starttime = $param['starttime'];
$endtime = $param['endtime']; $endtime = $param['endtime'];
$participants = $param['participants']; $participants = $param['participants'];
$participants_id = array();
foreach($participants as $part => $nul) foreach($participants as $part => $nul)
{ {
$participants[$part] = $GLOBALS['phpgw']->common->grab_owner_name($part); $participants[$part] = $GLOBALS['phpgw']->common->grab_owner_name($part);
// Much better for processor :) // Much better for processor :)
$participants_id[] = $part; $participants_id[] .= $part;
} }
uasort($participants,'strnatcasecmp'); // sort them after their fullname uasort($participants,'strnatcasecmp'); // sort them after their fullname
@ -3642,7 +3642,7 @@
$k = ($j == 0 ? sprintf('%02d',$i).'<br>':'').sprintf('%02d',$j*$increment); $k = ($j == 0 ? sprintf('%02d',$i).'<br>':'').sprintf('%02d',$j*$increment);
$str .= '<td align="left" bgcolor="'.$this->theme['bg_color'].'"><font color="'.$phpgw_info['theme']['bg_text'].'" face="'.$this->theme['font'].'" size="-2">' $str .= '<td align="left" bgcolor="'.$this->theme['bg_color'].'"><font color="'.$phpgw_info['theme']['bg_text'].'" face="'.$this->theme['font'].'" size="-2">'
. '<a href="'.$this->page('add','&date='.$date['full'].'&hour='.$i.'&minute='.(interval * $j) . '&participants=' . base64_encode(implode(';', $participants_id)) )."\" onMouseOver=\"window.status='".$i.':'.(($increment * $j)<=9?'0':'').($increment * $j)."'; return true;\">" . '<a href="'.$this->page('add','&date='.$date['full'].'&hour='.$i.'&minute='.(interval * $j) . '&participants=' . base64_encode(implode(";", $participants_id)) )."\" onMouseOver=\"window.status='".$i.':'.(($increment * $j)<=9?'0':'').($increment * $j)."'; return true;\">"
. $k."</a>&nbsp;</font></td>\n"; . $k."</a>&nbsp;</font></td>\n";
} }
} }