lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: use jQuery tooltip

Browse Source
This commit is contained in:
Regis Houssin 2010-10-22 08:06:41 +00:00
parent 19dae2da95
commit fe93194056
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
htdocs/core/class/html.form.class.php
View File

@ -150,8 +150,8 @@ class Form
// Sanitize tooltip // Sanitize tooltip
$htmltext=str_replace("\\","\\\\",$htmltext); $htmltext=str_replace("\\","\\\\",$htmltext);
$htmltext=str_replace("'","\'",$htmltext); //$htmltext=str_replace("'","\'",$htmltext);
$htmltext=str_replace("'","\'",$htmltext); //$htmltext=str_replace("'","\'",$htmltext);
$htmltext=str_replace("\r","",$htmltext); $htmltext=str_replace("\r","",$htmltext);
$htmltext=str_replace("<br>\n","<br>",$htmltext); $htmltext=str_replace("<br>\n","<br>",$htmltext);
$htmltext=str_replace("\n","",$htmltext); $htmltext=str_replace("\n","",$htmltext);
@ -159,6 +159,7 @@ class Form
if ($conf->use_javascript_ajax) if ($conf->use_javascript_ajax)
{ {
$htmltext=str_replace('"',"&quot;",$htmltext); $htmltext=str_replace('"',"&quot;",$htmltext);
/*
if ($tooltipon==1 || $tooltipon==3) if ($tooltipon==1 || $tooltipon==3)
{ {
$paramfortooltiptext.=' onmouseover="showtip(\''.$htmltext.'\')"'; $paramfortooltiptext.=' onmouseover="showtip(\''.$htmltext.'\')"';
@ -169,6 +170,15 @@ class Form
$paramfortooltippicto.=' onmouseover="showtip(\''.$htmltext.'\')"'; $paramfortooltippicto.=' onmouseover="showtip(\''.$htmltext.'\')"';
$paramfortooltippicto.=' onMouseout="hidetip()"'; $paramfortooltippicto.=' onMouseout="hidetip()"';
} }
*/
if ($tooltipon==1 || $tooltipon==3)
{
$paramfortooltiptext.=' title="'.$htmltext.'"';
}
if ($tooltipon==2 || $tooltipon==3)
{
$paramfortooltippicto.=' title="'.$htmltext.'"';
}
} }
$s=""; $s="";

15
htdocs/main.inc.php
View File

@ -818,6 +818,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
$jquerytheme = 'smoothness'; $jquerytheme = 'smoothness';
if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME; if (!empty($conf->global->MAIN_USE_JQUERY_THEME)) $jquerytheme = $conf->global->MAIN_USE_JQUERY_THEME;
print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-1.8.5.custom.css" type="text/css" />'."\n"; print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/css/'.$jquerytheme.'/jquery-ui-1.8.5.custom.css" type="text/css" />'."\n";
print '<link rel="stylesheet" href="'.DOL_URL_ROOT.'/includes/jquery/plugins/tooltip/jquery.tooltip.css" type="text/css" />'."\n";
} }
print '<!-- Includes for Dolibarr, modules or specific pages-->'."\n"; print '<!-- Includes for Dolibarr, modules or specific pages-->'."\n";
@ -954,7 +955,17 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
} }
print "\n".'<!-- Start top horizontal menu '.$top_menu.' -->'."\n"; print "\n".'<!-- Start top horizontal menu '.$top_menu.' -->'."\n";
print '<div class="tmenu">'."\n"; print '<script type="text/javascript">
jQuery(function() {
jQuery("#tmenu_tooltip *").tooltip({
track: true,
delay: 0,
showURL: false,
positionLeft: true
});
});
</script>';
print '<div id="tmenu_tooltip" class="tmenu">'."\n";
// Show menu // Show menu
$menutop = new MenuTop($db); $menutop = new MenuTop($db);
@ -971,7 +982,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
{ {
//$mc = new ActionsMulticompany($db); //$mc = new ActionsMulticompany($db);
$entitytext = img_object('', 'globe','entity'); $entitytext = img_object('', 'globe','entity');
$entityhtmltext = 'text'; $entityhtmltext = 'EntityName';
print $html->textwithtooltip('',$entityhtmltext,2,1,$entitytext); print $html->textwithtooltip('',$entityhtmltext,2,1,$entitytext);
//$select_entity = '<div class="loginSelectEntity">'.$mc->select_entities($conf->entity).'</div>'; //$select_entity = '<div class="loginSelectEntity">'.$mc->select_entities($conf->entity).'</div>';
//if ($mc->numEntity >= 1) print $select_entity; //if ($mc->numEntity >= 1) print $select_entity;