[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_6RC1-20769-g8945a2a

The branch, master has been updated via 8945a2a614cd4d62a462da339b3e8dd099f3115e (commit) from 554c1df307b47516dc0249fc75bdec2ad5c5e5a1 (commit) - Log ----------------------------------------------------------------- commit 8945a2a614cd4d62a462da339b3e8dd099f3115e Author: Marc Delisle &lt;marc(a)infomarc.info&gt; Date: Sun Oct 9 07:42:10 2011 -0400 Convert footnotes to tooltips in Create table dialog - works when called from main panel - from navi panel, this commit fixed a js error but the tooltips do not appear yet ----------------------------------------------------------------------- Summary of changes: js/functions.js | 1 + navigation.php | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/js/functions.js b/js/functions.js index 9d14eec..0ed1a22 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1523,6 +1523,7 @@ function PMA_createTableDialog( div, url , target) buttons : button_options }); // end dialog options } + PMA_convertFootnotesToTooltips($(div)); PMA_ajaxRemoveMessage($msgbox); }) // end $.get() diff --git a/navigation.php b/navigation.php index 300bdb5..126b00d 100644 --- a/navigation.php +++ b/navigation.php @@ -107,6 +107,7 @@ require_once './libraries/header_http.inc.php'; <?php echo PMA_includeJS('jquery/jquery-1.6.2.js'); echo PMA_includeJS('jquery/jquery-ui-1.8.custom.js'); + echo PMA_includeJS('jquery/jquery.qtip-1.0.0-rc3.js'); echo PMA_includeJS('navigation.js'); echo PMA_includeJS('functions.js'); echo PMA_includeJS('messages.php'); hooks/post-receive -- phpMyAdmin