Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

This commit is contained in:
Madhura Jayaratne 2011-10-10 08:01:44 +05:30
commit 6e1258f954
3 changed files with 14 additions and 4 deletions

View File

@ -1511,12 +1511,17 @@ function PMA_createTableDialog( div, url , target)
.append(data)
.dialog({
title: PMA_messages['strCreateTable'],
height: 600,
width: 900,
/*
* Use a little less than the current value, otherwise there is i
* some overlap; 16 is a value found by experimenting
*/
height: $(window.document).height() - 16,
width: $(window.document).width() - 16,
open: PMA_verifyTypeOfAllColumns,
buttons : button_options
}); // end dialog options
}
PMA_convertFootnotesToTooltips($(div));
PMA_ajaxRemoveMessage($msgbox);
}) // end $.get()

View File

@ -229,8 +229,12 @@ $(document).ready(function(){
var div = parent.frame_content.$('<div id="create_table_dialog"></div>');
var target = "tbl_create.php";
/*Calling to the createTableDialog function*/
PMA_createTableDialog(div , url , target);
/*
* Calling to the createTableDialog function
* (needs to be done in the context of frame_content in order
* for the qtip tooltips to work)
* */
parent.frame_content.PMA_createTableDialog(div , url , target);
});//end of create new table
});//end of document get ready

View File

@ -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');