diff --git a/ChangeLog b/ChangeLog index 4572a255d..5e55d9c6e 100755 --- a/ChangeLog +++ b/ChangeLog @@ -85,10 +85,6 @@ $Id$ - patch #2999595, rfe #2998130 [interface] Cleanup navigation frame. - [core] Update library PHPExcel to version 1.7.3c -3.3.5.0 (not yet released) -- patch #2932113 [information_schema] Slow export when having lots of - databases, thanks to Stéphane Pontier - shadow_walker - 3.3.4.0 (not yet released) - bug #2996161 [import] properly escape import value - bug #2998889 [import] Import button does not work in Catalan diff --git a/js/functions.js b/js/functions.js index a4827957b..aa1ced89c 100755 --- a/js/functions.js +++ b/js/functions.js @@ -1893,7 +1893,7 @@ $(document).ready(function() { var curr_table_name = window.parent.table; var curr_column_name = $(this).parents('tr').children('th').children('label').text(); - var question = PMA_messages['strDoYouReally'] + ' :\n ALTER TABLE `' + curr_table_name + '` DROP `' + curr_column_name + '`'; + var question = PMA_message['strDoYouReally'] + ' :\n ALTER TABLE `' + curr_table_name + '` DROP `' + curr_column_name + '`'; $(this).PMA_confirm(question, $(this).attr('href'), function(url) { @@ -1943,8 +1943,6 @@ $(document).ready(function() { * libraries/display_create_table.lib.php is used) */ $(document).ready(function() { - - //make Ajax call and create the dialog with the full create table form $("#create_table_form_minimal").live('submit', function(event) { event.preventDefault(); @@ -1959,40 +1957,13 @@ $(document).ready(function() { .dialog({ title: PMA_messages['strCreateTable'], width: 900, - buttons : {"Cancel" : function() {$(this).dialog('close').remove() ;} + buttons : { + "Create Table" : function() { + $('#create_table_form').trigger("submit"); + }, + "Cancel" : function() {$(this).dialog('close').remove() ;} } - }); // end dialog options - }) // end $.get() - - }); - - $("#create_table_form").find("input[name=submit_num_fields], input[name=do_save_data]").live('click', function(event) { - event.preventDefault(); - - var the_form = $("#create_table_form"); - - PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - $(the_form).append(''); - - if($(this).attr('name') == 'submit_num_fields') { - //User wants to add more fields to the table - $.post($(the_form).attr('action'), $(the_form).serialize() + "&submit_num_fields=" + $(this).val(), function(data) { - $("#create_table_dialog").html(data); - - }) //end $.post() - } - else if($(this).attr('name') == 'do_save_data') { - //User wants to submit the form - $.post($(the_form).attr('action'), $(the_form).serialize() + "&do_save_data=" + $(this).val(), function(data) { - if(data.success == true) { - PMA_ajaxShowMessage(data.message); - $("#create_table_dialog").dialog("close").remove(); - } - else { - PMA_ajaxShowMessage(data.error); - } - }) // end $.post() - } - }) // end create table form submit button actions - -}, 'top.frame_content'); //end $(document).ready for 'Create Table' \ No newline at end of file + }); + }) + }) +}, 'top.frame_content'); \ No newline at end of file diff --git a/js/tbl_operations.js b/js/tbl_operations.js index c74cc60c0..e8331e679 100644 --- a/js/tbl_operations.js +++ b/js/tbl_operations.js @@ -8,11 +8,11 @@ /** * Add all AJAX scripts for tbl_operations.php page here. * - * Alter table order - #div_table_order form - * Move Table - #div_table_rename form - * Table Options - #div_table_options form - * Copy Table - #div_table_copy form - * Table Maintenance - #div_table_maintenance (need to id each anchor) + * Alter table order + * Move Table + * Table Options + * Copy Table + * Table Maintenance * Check * Repair * Analyze diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php index fd59480cb..8f1b740a6 100755 --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -37,7 +37,8 @@ require_once './libraries/check_user_privileges.lib.php'; $is_create_table_priv = true; ?> -
+
- + \n" +"POT-Creation-Date: 2010-06-22 12:29+0530\n" +"PO-Revision-Date: 2010-06-17 21:32+0200\n" +"Last-Translator: \n" "Language-Team: turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -96,7 +96,7 @@ msgstr "Veritabanı %1$s oluşturuldu." #: db_datadict.php:49 db_operations.php:387 msgid "Database comment: " -msgstr "Veritabanı yorumu:" +msgstr "Veritabanı yorumu: " #: db_datadict.php:165 libraries/tbl_properties.inc.php:724 #: pdf_schema.php:1236 tbl_operations.php:347 tbl_printview.php:130 @@ -1631,7 +1631,7 @@ msgstr "%s dosyası herhangi bir anahtar kimliği içermiyor" #: libraries/auth/swekey/swekey.auth.lib.php:157 #: libraries/auth/swekey/swekey.auth.lib.php:180 msgid "Hardware authentication failed" -msgstr "Donanım kimlik doğrulama başarısız" +msgstr "Donanım kimlik denetimi başarısız" #: libraries/auth/swekey/swekey.auth.lib.php:166 msgid "No valid authentication key plugged" @@ -1639,7 +1639,7 @@ msgstr "Geçerli kimlik denetimi anahtarı takılı değil" #: libraries/auth/swekey/swekey.auth.lib.php:202 msgid "Authenticating..." -msgstr "Kimlik doğrulanıyor..." +msgstr "Kimlik denetleniyor..." #: libraries/blobstreaming.lib.php:689 msgid "View image" @@ -1651,7 +1651,7 @@ msgstr "Ses çal" #: libraries/blobstreaming.lib.php:698 msgid "View video" -msgstr "Görüntüyü göster" +msgstr "Videoyu göster" #: libraries/blobstreaming.lib.php:702 msgid "Download file" diff --git a/tbl_create.php b/tbl_create.php index 169960bb1..02c637dff 100755 --- a/tbl_create.php +++ b/tbl_create.php @@ -249,8 +249,6 @@ if (isset($_REQUEST['do_save_data'])) { $message = PMA_Message::success(__('Table %1$s has been created.')); $message->addParam(PMA_backquote($db) . '.' . PMA_backquote($table)); - PMA_ajaxResponse($message, $message->isSuccess()); - $display_query = $sql_query; $sql_query = '';