From 015d265ee9d747b041c7f47d491581cc48a018e7 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Fri, 22 Oct 2010 19:18:45 +0000 Subject: [PATCH] Fix: A better way to use jQuery tooltips. --- htdocs/core/class/html.form.class.php | 11 ++-- htdocs/lib/lib_foot.js | 85 --------------------------- htdocs/main.inc.php | 33 ++++++----- 3 files changed, 21 insertions(+), 108 deletions(-) delete mode 100644 htdocs/lib/lib_foot.js diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index 6b4fb6e7984..59e849efe73 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -155,13 +155,10 @@ class Form $htmltext=str_replace("
\n","
",$htmltext); $htmltext=str_replace("\n","",$htmltext); - if ($conf->use_javascript_ajax) - { - $htmltext=str_replace('"',""",$htmltext); - $paramfortooltip.=' title="'.$htmltext.'"'; - } - - $s=""; + $htmltext=str_replace('"',""",$htmltext); + $paramfortooltip.=' class="classfortooltip" title="'.$htmltext.'"'; // Attribut to put on td tag to store tooltip + + $s=""; $s.=''; if ($direction > 0) { diff --git a/htdocs/lib/lib_foot.js b/htdocs/lib/lib_foot.js deleted file mode 100644 index 40081242ab4..00000000000 --- a/htdocs/lib/lib_foot.js +++ /dev/null @@ -1,85 +0,0 @@ -// Copyright (C) 2005-2010 Laurent Destailleur -// -// Javascript code to put at bottom of pages (avant fin de body) -// -// \file htdocs/lib/lib_foot.js -// \brief File that include javascript functions (included if option use_javascript activated) -// \version $Revision$ - - -/*********************************************** -* Cool DHTML tooltip script- (c) Dynamic Drive DHTML code library (www.dynamicdrive.com) -* This notice MUST stay intact for legal use -* Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code -***********************************************/ - -var offsetxpoint=-40 //Customize x offset of tooltip -var offsetypoint=12 //Customize y offset of tooltip -var ie=document.all -var ns6=document.getElementById && !document.all -var enabletip=false -if (ie||ns6) -var tipobj=document.all? document.all["dhtmltooltip"] : document.getElementById? document.getElementById("dhtmltooltip") : "" - -function ietruebody() -{ - return (document.compatMode && document.compatMode!="BackCompat")? document.documentElement : document.body -} - -function showtip(thetext) -{ - if (ns6||ie) - { - tipobj.innerHTML=thetext - enabletip=true - return false - } -} - -function positiontip(e) -{ - if (enabletip) - { - var curX=(ns6)?e.pageX : event.clientX+ietruebody().scrollLeft; - var curY=(ns6)?e.pageY : event.clientY+ietruebody().scrollTop; - //Find out how close the mouse is to the corner of the window - var rightedge=ie&&!window.opera? ietruebody().clientWidth-event.clientX-offsetxpoint : window.innerWidth-e.clientX-offsetxpoint-20 - var bottomedge=ie&&!window.opera? ietruebody().clientHeight-event.clientY-offsetypoint : window.innerHeight-e.clientY-offsetypoint-20 - - var leftedge=(offsetxpoint<0)? offsetxpoint*(-1) : -1000 - //alert('curX='+curX+' curY='+curY+' rightedge='+rightedge+' bottomedge='+bottomedge+' leftedge='+leftedge+' tipobj.offsetHeight='+tipobj.offsetHeight); - - //if the horizontal distance isn't enough to accomodate the width of the context menu - if (rightedgeheaderdone)) top_htmlhead($head, $title, $disablejs, $disablehead, $arrayofjs, $arrayofcss); - print '
'; + print ''; + + // Wrapper to show tooltips + print ''; /* * Top menu @@ -955,16 +970,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a } print "\n".''."\n"; - print ''; + print '
'."\n"; // Show menu @@ -1412,11 +1418,6 @@ if (! function_exists("llxFooter")) if (defined('XDEBUGCOVERAGE')) { var_dump(xdebug_get_code_coverage()); } } - if ($conf->use_javascript_ajax) - { - print ''."\n"; - } - // If there is some logs in buffer to show if (sizeof($conf->logbuffer)) {