From 7103156e509030d76c314f2ce17d512aa673b804 Mon Sep 17 00:00:00 2001 From: Rouslan Placella Date: Thu, 2 Jun 2011 20:09:06 +0100 Subject: [PATCH] Moved some code around to ease merging with master. --- js/functions.js | 124 ++++++++++++------------ themes/pmahomme/css/theme_right.css.php | 24 ++--- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/js/functions.js b/js/functions.js index bc339e28d1..61758fbcf4 100644 --- a/js/functions.js +++ b/js/functions.js @@ -2269,68 +2269,6 @@ $(document).ready(function() { }) // end of $(document).ready() -/** - * Attach Ajax event handlers for Drop Table. - * - * @uses $.PMA_confirm() - * @uses PMA_ajaxShowMessage() - * @uses window.parent.refreshNavigation() - * @uses window.parent.refreshMain() - * @see $cfg['AjaxEnable'] - */ -$(document).ready(function() { - $("#drop_tbl_anchor").live('click', function(event) { - event.preventDefault(); - - //context is top.frame_content, so we need to use window.parent.db to access the db var - /** - * @var question String containing the question to be asked for confirmation - */ - var question = PMA_messages['strDropTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + ' :\n' + 'DROP TABLE ' + window.parent.table; - - $(this).PMA_confirm(question, $(this).attr('href') ,function(url) { - - PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) { - //Database deleted successfully, refresh both the frames - window.parent.refreshNavigation(); - window.parent.refreshMain(); - }) // end $.get() - }); // end $.PMA_confirm() - }); //end of Drop Table Ajax action -}) // end of $(document).ready() for Drop Table - -/** - * Attach Ajax event handlers for Truncate Table. - * - * @uses $.PMA_confirm() - * @uses PMA_ajaxShowMessage() - * @uses window.parent.refreshNavigation() - * @uses window.parent.refreshMain() - * @see $cfg['AjaxEnable'] - */ -$(document).ready(function() { - $("#truncate_tbl_anchor").live('click', function(event) { - event.preventDefault(); - - //context is top.frame_content, so we need to use window.parent.db to access the db var - /** - * @var question String containing the question to be asked for confirmation - */ - var question = PMA_messages['strTruncateTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + ' :\n' + 'TRUNCATE TABLE ' + window.parent.table; - - $(this).PMA_confirm(question, $(this).attr('href') ,function(url) { - - PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); - $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) { - //Database deleted successfully, refresh both the frames - window.parent.refreshNavigation(); - window.parent.refreshMain(); - }) // end $.get() - }); // end $.PMA_confirm() - }); //end of Drop Table Ajax action -}) // end of $(document).ready() for Drop Table - /** * Attach Ajax event handlers for Export of Routines, Triggers and Events. * @@ -2410,3 +2348,65 @@ $(document).ready(function() { }) // end $.PMA_confirm() }); // end $.live() }); //end $(document).ready() for Drop functionality of Routines, Triggers and Events. + +/** + * Attach Ajax event handlers for Drop Table. + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowMessage() + * @uses window.parent.refreshNavigation() + * @uses window.parent.refreshMain() + * @see $cfg['AjaxEnable'] + */ +$(document).ready(function() { + $("#drop_tbl_anchor").live('click', function(event) { + event.preventDefault(); + + //context is top.frame_content, so we need to use window.parent.db to access the db var + /** + * @var question String containing the question to be asked for confirmation + */ + var question = PMA_messages['strDropTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + ' :\n' + 'DROP TABLE ' + window.parent.table; + + $(this).PMA_confirm(question, $(this).attr('href') ,function(url) { + + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) { + //Database deleted successfully, refresh both the frames + window.parent.refreshNavigation(); + window.parent.refreshMain(); + }) // end $.get() + }); // end $.PMA_confirm() + }); //end of Drop Table Ajax action +}) // end of $(document).ready() for Drop Table + +/** + * Attach Ajax event handlers for Truncate Table. + * + * @uses $.PMA_confirm() + * @uses PMA_ajaxShowMessage() + * @uses window.parent.refreshNavigation() + * @uses window.parent.refreshMain() + * @see $cfg['AjaxEnable'] + */ +$(document).ready(function() { + $("#truncate_tbl_anchor").live('click', function(event) { + event.preventDefault(); + + //context is top.frame_content, so we need to use window.parent.db to access the db var + /** + * @var question String containing the question to be asked for confirmation + */ + var question = PMA_messages['strTruncateTableStrongWarning'] + '\n' + PMA_messages['strDoYouReally'] + ' :\n' + 'TRUNCATE TABLE ' + window.parent.table; + + $(this).PMA_confirm(question, $(this).attr('href') ,function(url) { + + PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']); + $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function(data) { + //Database deleted successfully, refresh both the frames + window.parent.refreshNavigation(); + window.parent.refreshMain(); + }) // end $.get() + }); // end $.PMA_confirm() + }); //end of Drop Table Ajax action +}) // end of $(document).ready() for Drop Table diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 92a1ba9fba..a6bbf7bcb2 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2103,18 +2103,6 @@ fieldset .disabled-field td { margin-bottom: 0.5em; } -#table_columns input, #table_columns select { - width: 14em; - box-sizing: border-box; - -ms-box-sizing: border-box; - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; -} - -#table_columns select { - margin: 0 6px; -} - #rte_table td { vertical-align: middle; } @@ -2128,3 +2116,15 @@ fieldset .disabled-field td { -webkit-box-sizing: border-box; } +#table_columns input, #table_columns select { + width: 14em; + box-sizing: border-box; + -ms-box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; +} + +#table_columns select { + margin: 0 6px; +} +