diff options
author | Chanaka Indrajith <pe.chanaka.ck@gmail.com> | 2012-07-01 22:26:04 +0400 |
---|---|---|
committer | Chanaka Indrajith <pe.chanaka.ck@gmail.com> | 2012-07-01 22:26:04 +0400 |
commit | 9a2900508d714243a544b17452b1da49f3723177 (patch) | |
tree | a86dab8a4e51588abe3cb93655cfea80df02985b /js/db_operations.js | |
parent | b623c59512bdfbd94032fdfb1919f068c41a9b7d (diff) | |
parent | 05331f0cf198fc374e3c17704b2bcf430153a457 (diff) |
Merge remote branch 'upstream/master'
Diffstat (limited to 'js/db_operations.js')
-rw-r--r-- | js/db_operations.js | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/js/db_operations.js b/js/db_operations.js index 67ca7a9b44..301d6f8888 100644 --- a/js/db_operations.js +++ b/js/db_operations.js @@ -45,7 +45,7 @@ $(function() { button_options[PMA_messages['strNo']] = function() { $(this).dialog("close").remove(); } $form.PMA_confirm(question, $form.attr('action'), function(url) { - PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases']); + PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases'], false); $.get(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function(data) { if(data.success == true) { @@ -84,7 +84,7 @@ $(function() { $("#copy_db_form.ajax").live('submit', function(event) { event.preventDefault(); - var $msgbox = PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase']); + PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase'], false); var $form = $(this); @@ -94,7 +94,7 @@ $(function() { // use messages that stay on screen $('div.success, div.error').fadeOut(); if(data.success == true) { - $('#floating_menubar').after(data.message); + PMA_ajaxShowMessage(data.message); if( $("#checkbox_switch").is(":checked")) { window.parent.db = data.newname; window.parent.refreshMain(); @@ -106,10 +106,8 @@ $(function() { window.parent.refreshNavigation(true); } } else { - $('#floating_menubar').after(data.error); + PMA_ajaxShowMessage(data.error, false); } - - PMA_ajaxRemoveMessage($msgbox); }) // end $.get }) // end copy database |