extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-04 22:01:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: using equally sized, non-overlaping columns for multiple events at the same time

Browse Source 
- old overlapping events failed for more then 6 columns
- clicking on events opened the frist/underlaying event not the visible one
This commit is contained in:
Ralf Becker 2011-02-11 15:44:50 +00:00
parent b6203cad52
commit b90e590f66
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -1124,8 +1124,11 @@ function open_edit(series)
// displaying all event columns of the day // displaying all event columns of the day
foreach($eventCols as $n => $eventCol) foreach($eventCols as $n => $eventCol)
{ {
$html .= $this->eventColWidget($eventCol,!$n ? 0 : 60-10*(count($eventCols)-$n), // equal sized columns
count($eventCols) == 1 ? 100 : (!$n ? 80 : 50),$indent."\t", $width = 95.0 / count($eventCols);
$left = 2.5 + $n * $width;
$html .= $this->eventColWidget($eventCol,$left,$width,$indent."\t",
$owner ? $owner : $this->user); $owner ? $owner : $this->user);
} }
$html .= $indent."</div>\n"; // calDayCol $html .= $indent."</div>\n"; // calDayCol
@ -1195,11 +1198,12 @@ function open_edit(series)
* @param string $indent string for correct indention * @param string $indent string for correct indention
* @param int $owner owner of the eventCol * @param int $owner owner of the eventCol
*/ */
function eventColWidget($events,$left,$width,$indent,$owner) function eventColWidget($events,$left,$width,$indent,$owner,$z_index=null)
{ {
if ($this->debug > 1 || $this->debug==='eventColWidget') $this->bo->debug_message('uiviews::eventColWidget(%1,left=%2,width=%3,)',False,$events,$left,$width); if ($this->debug > 1 || $this->debug==='eventColWidget') $this->bo->debug_message('uiviews::eventColWidget(%1,left=%2,width=%3,)',False,$events,$left,$width);
$html = $indent.'<div class="calEventCol" style="left: '.$left.'%; width:'.$width.'%;'. $html = $indent.'<div class="calEventCol" style="left: '.$left.'%; width:'.$width.'%;'.
(!is_null($z_index) ? ' z-index:'.$z_index.';' : '').
(!$this->use_time_grid ? ' top: '.$this->rowHeight.'%;' : '').'">'."\n"; (!$this->use_time_grid ? ' top: '.$this->rowHeight.'%;' : '').'">'."\n";
foreach($events as $event) foreach($events as $event)
{ {