From f61bbbccd64138fc1881c7abfffa1b4260205192 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Sun, 24 Mar 2013 22:32:38 +0100 Subject: [PATCH] refs #3813 use jqueryui tooltip plugin instead of piwiks selfmade one for datatables --- plugins/CoreHome/templates/datatable.css | 2 +- plugins/CoreHome/templates/datatable.js | 15 +++++---------- .../CoreHome/templates/jquery.ui.autocomplete.css | 4 +--- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/templates/datatable.css index c71c2f6a313..dfaf958e01e 100644 --- a/plugins/CoreHome/templates/datatable.css +++ b/plugins/CoreHome/templates/datatable.css @@ -636,7 +636,7 @@ table.dataTable .dataTableRowActions a img { height: 17px; } -body .piwik-tooltip.rowActionTooltip { +body .ui-tooltip.rowActionTooltip { font-size: 11px; padding: 3px 5px 3px 6px; } diff --git a/plugins/CoreHome/templates/datatable.js b/plugins/CoreHome/templates/datatable.js index 1acc5471860..5b2c80517ae 100644 --- a/plugins/CoreHome/templates/datatable.js +++ b/plugins/CoreHome/templates/datatable.js @@ -1452,7 +1452,6 @@ dataTable.prototype = return function (e) { $(this).blur(); container.hide(); - Piwik_Tooltip.hide(); if (typeof actionInstances[action.name].onClick == 'function') { return actionInstances[action.name].onClick(el, tr, e); } @@ -1477,15 +1476,11 @@ dataTable.prototype = } if (typeof action.dataTableIconTooltip != 'undefined') { - actionEl.hover((function (action) { - return function () { - Piwik_Tooltip.showWithTitle( - action.dataTableIconTooltip[0], - action.dataTableIconTooltip[1], - 'rowActionTooltip'); - }; - })(action), function () { - Piwik_Tooltip.hide(); + actionEl.tooltip({ + track: true, + items: 'a', + content: '

'+action.dataTableIconTooltip[0]+'

'+action.dataTableIconTooltip[1], + tooltipClass: 'rowActionTooltip' }); } } diff --git a/plugins/CoreHome/templates/jquery.ui.autocomplete.css b/plugins/CoreHome/templates/jquery.ui.autocomplete.css index dfe6df80e81..d4ae0e863e3 100644 --- a/plugins/CoreHome/templates/jquery.ui.autocomplete.css +++ b/plugins/CoreHome/templates/jquery.ui.autocomplete.css @@ -55,9 +55,7 @@ } .ui-widget-content { - background: url(../../../libs/jquery/themes/base/images/ui-bg_flat_75_ffffff_40x100.png) repeat-x scroll 50% 50% #FFFFFF; - border: 0 solid #D4D4D4; - color: #222; + border: 0; } .ui-corner-all {