From b6ca39d9dd471f9c5ff52354bdc8fb176d4e6a56 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Thu, 9 Jan 2014 09:04:59 +0000 Subject: [PATCH] Fix tooltip for GroupPlanner, replace it with jquery tooltip --- calendar/inc/class.calendar_uiviews.inc.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php index f7190448eb..6e7317f34c 100644 --- a/calendar/inc/class.calendar_uiviews.inc.php +++ b/calendar/inc/class.calendar_uiviews.inc.php @@ -574,8 +574,8 @@ class calendar_uiviews extends calendar_ui '" data-tooltip ="'.$tooltip . '" style="position: absolute; left: '.$left.'%; width: '.$width.'%; height: '. $row_height.'%; top: '.($n * $row_height).'%;'. - 'background-color: '.$color.';" '.$data['popup'].' '. - '>'."\n".$data['html'].$indent.'" data-tooltip ="'.$tooltip ."\n"; + 'background-color: '.$color.';" '.'" data-date ="'.$this->bo->date2string($event['start']).' '. + '>'."\n".$data['html'].$indent."\n"; } } } @@ -2737,9 +2737,10 @@ class calendar_uiviews extends calendar_ui $width = $this->_planner_pos($event['end'],$start,$end) - $left; $color = $data['color'] ? $data['color'] : 'gray'; + $tooltip = html::htmlspecialchars(str_replace(array("\n","\r","'",'"'),array('','',"\\'",'"'),$data['tooltip'])); return $indent.'
0,'Padding'=>0)).'>'."\n".$data['html'].$indent."
\n"; + '%; width: '.$width.'%; background-color: '.$color.';"'.'data-tooltip="'. $tooltip.'" '. + '>'."\n".$data['html'].$indent."\n"; } /**