From 995940eeb53038af765d204dc5cc7ac5e4b74eda Mon Sep 17 00:00:00 2001
From: Klaus Leithoff <kl@stylite.de>
Date: Tue, 2 Feb 2010 11:23:11 +0000
Subject: [PATCH] small improvements regarding the tooltip behavior for
 calendar

---
 calendar/inc/class.calendar_uiviews.inc.php | 11 ++++++++---
 phpgwapi/inc/class.html.inc.php             |  4 ++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index 666c1300ed..f6c9768310 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -1351,12 +1351,19 @@ class calendar_uiviews extends calendar_ui
 				'color'   => $color,
 			);
 		}
+
+		$draggableID = 'drag_'.$event['id'].'_O'.$event['owner'].'_C'.$owner;
+
 		$ttip_options = array(
 			'BorderWidth' => 0,		// as we use our round borders
 			'Padding'     => 0,
 			'Sticky'      => true,	// make long tooltips scrollable
 			'ClickClose'  => true,
-			'FollowMouse' => false,
+			'FOLLOWMOUSE' => false,
+			'DELAY'		  => 600,
+			'FIX'		  => "['".$draggableID."',10,-5]",
+			'SHADOW'	  => false,
+			'WIDTH'		  => -400,
 		);
 		$ie_fix = '';
         if (html::$user_agent == 'msie')	// add a transparent image to make the event "opaque" to mouse events
@@ -1383,8 +1390,6 @@ class calendar_uiviews extends calendar_ui
 			$style = 'position: relative; margin-top: 3px;';
 		}
 
-		$draggableID = 'drag_'.$event['id'].'_O'.$event['owner'].'_C'.$owner;
-
 		$html = $indent.'<div id="'.$draggableID.'" class="calEvent'.($is_private ? 'Private' : '').' '.$status_class.
 			'" style="'.$style.' border-color: '.$headerbgcolor.'; background: '.$background.'; z-index: 20;"'.
 			$popup.' '.html::tooltip($tooltip,False,$ttip_options).
diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 87767bf367..2cfc523fd8 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -127,7 +127,7 @@ class html
 						$value = $value ? 'true' : 'false';
 						break;
 					case 'string':
-						$value = "'$value'";
+						if (stripos($value,"'")===false) $value = "'$value'";
 						break;
 				}
 				$ttip .= ','.$option.','.$value;
@@ -135,7 +135,7 @@ class html
 		}
 		$ttip .= ')"';
 
-		if (!$sticky) $ttip .= ' onmouseout="UnTip()"';
+		$ttip .= ' onmouseout="UnTip()"';
 
 		return $ttip;
 	}