The branch, master has been updated via 5de751bd99285cdbcb2212ed03dff0b67155e9db (commit) via be14efaa75e99b821f862110a92e56c6b71d0c99 (commit) from 24e05e1cb2ae896dc9f667e3de71b09a9c7b7378 (commit) - Log ----------------------------------------------------------------- commit 5de751bd99285cdbcb2212ed03dff0b67155e9db Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: Sun Apr 24 18:15:03 2011 +0530 This should also be styled with class="operations_half_width" commit be14efaa75e99b821f862110a92e56c6b71d0c99 Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: Sun Apr 24 16:33:24 2011 +0530 Database operations tab made more compact. Table operations altered to use classes for styling. ----------------------------------------------------------------------- Summary of changes: db_operations.php | 25 +++++++++++++++++-------- tbl_operations.php | 18 +++++++++--------- themes/original/css/theme_right.css.php | 21 +++------------------ themes/pmahomme/css/theme_right.css.php | 25 +++++-------------------- view_operations.php | 2 +- 5 files changed, 35 insertions(+), 56 deletions(-) diff --git a/db_operations.php b/db_operations.php index 46591bc..e49ddcb 100644 --- a/db_operations.php +++ b/db_operations.php @@ -349,14 +349,17 @@ if ($db == 'information_schema') { } if (!$is_information_schema) { - - require './libraries/display_create_table.lib.php'; - + ?> + <div class="operations_half_width"> + <?php require './libraries/display_create_table.lib.php'; ?> + </div> + <?php if ($cfgRelation['commwork']) { /** * database comment */ ?> + <div class="operations_half_width"> <form method="post" action="db_operations.php"> <?php echo PMA_generate_common_hidden_inputs($db); ?> <fieldset> @@ -371,6 +374,7 @@ if (!$is_information_schema) { <input type="submit" value="<?php echo __('Go'); ?>" /> </fieldset> </form> + </div> <?php } /** @@ -378,6 +382,7 @@ if (!$is_information_schema) { */ if ($db != 'mysql') { ?> + <div class="operations_half_width"> <form id="rename_db_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : ''); ?>method="post" action="db_operations.php" onsubmit="return emptyFormElements(this, 'newname')"> <?php @@ -416,6 +421,7 @@ if ($db != 'mysql') { <input id="rename_db_input" type="submit" value="<?php echo __('Go'); ?>" /> </fieldset> </form> + </div> <?php } // end if @@ -424,6 +430,7 @@ if ($db != 'mysql') { // Don't allow to easily drop mysql database, RFE #1327514. if (($is_superuser || $GLOBALS['cfg']['AllowUserDropDatabase']) && ! $db_is_information_schema && ($db != 'mysql')) { ?> +<div class="operations_half_width"> <fieldset class="caution"> <legend><?php if ($cfg['PropertiesIconic']) { @@ -452,12 +459,14 @@ echo __('Remove database'); </li> </ul> </fieldset> +</div> <?php } ?> <?php /** * Copy database */ ?> + <div class="operations_half_width clearfloat"> <form id="copy_db_form" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax" ' : ''); ?>method="post" action="db_operations.php" onsubmit="return emptyFormElements(this, 'newname')"> <?php @@ -522,13 +531,13 @@ echo __('Remove database'); <input type="submit" name="submit_copy" value="<?php echo __('Go'); ?>" /> </fieldset> </form> - + </div> <?php /** * Change database charset */ - echo '<form id="change_db_charset_form" '; + echo '<div class="operations_half_width"><form id="change_db_charset_form" '; if ($GLOBALS['cfg']['AjaxEnable']) { echo ' class="ajax" '; } @@ -549,7 +558,7 @@ echo __('Remove database'); . ' <input type="submit" name="submitcollation"' . ' value="' . __('Go') . '" />' . "\n" . '</fieldset>' . "\n" - . '</form>' . "\n"; + . '</form></div>' . "\n"; if ($num_tables > 0 && !$cfgRelation['allworks'] && $cfg['PmaNoRelation_DisableWarning'] == false) { @@ -581,12 +590,12 @@ if ($cfgRelation['pdfwork'] && $num_tables > 0) { ?> /* * Export Relational Schema View */ - echo '<fieldset><a href="schema_edit.php?' . $url_query . '">'; + echo '<div class="operations_full_width"><fieldset><a href="schema_edit.php?' . $url_query . '">'; if ($cfg['PropertiesIconic']) { echo '<img class="icon" src="' . $pmaThemeImage . 'b_edit.png"' .' alt="" width="16" height="16" />'; } - echo __('Edit or export relational schema') . '</a></fieldset>'; + echo __('Edit or export relational schema') . '</a></fieldset></div>'; } // end if /** diff --git a/tbl_operations.php b/tbl_operations.php index 3c8b5dd..04f1165 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -253,7 +253,7 @@ unset($local_query); */ ?> <!-- Order the table --> -<div id="div_table_order"> +<div class="operations_half_width"> <form method="post" action="tbl_operations.php"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <fieldset id="fieldset_table_order"> @@ -279,7 +279,7 @@ unset($columns); </div> <!-- Move table --> -<div id="div_table_rename"> +<div class="operations_half_width"> <form method="post" action="tbl_operations.php" onsubmit="return emptyFormElements(this, 'new_name')"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> @@ -339,7 +339,7 @@ if (strstr($show_comment, '; InnoDB free') === false) { ?> <!-- Table options --> -<div id="div_table_options"> +<div class="operations_half_width clearfloat"> <form method="post" action="tbl_operations.php"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <input type="hidden" name="reload" value="1" /> @@ -518,7 +518,7 @@ if (isset($possible_row_formats[$tbl_type])) { </div> <!-- Copy table --> -<div id="div_table_copy"> +<div class="operations_half_width"> <form method="post" action="tbl_operations.php" onsubmit="return emptyFormElements(this, 'new_name')"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> @@ -581,7 +581,7 @@ if (isset($possible_row_formats[$tbl_type])) { <br class="clearfloat"/> -<div id="div_table_maintenance"> +<div class="operations_half_width"> <fieldset> <legend><?php echo __('Table maintenance'); ?></legend> @@ -668,7 +668,7 @@ $this_url_params = array_merge($url_params, </fieldset> </div> <?php if (! (isset($db_is_information_schema) && $db_is_information_schema)) { ?> -<div id="div_table_removal"> +<div class="operations_half_width"> <fieldset class="caution"> <legend><?php echo __('Delete data or table'); ?></legend> @@ -699,7 +699,7 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) { 'reload' => '1', 'purge' => '1', 'message_to_show' => sprintf(($tbl_is_view ? __('View %s has been dropped') : __('Table %s has been dropped')), htmlspecialchars($table)), - // table name is needed to avoid running + // table name is needed to avoid running // PMA_relationsCleanupDatabase() on the whole db later 'table' => $GLOBALS['table'], )); @@ -722,7 +722,7 @@ if (! (isset($db_is_information_schema) && $db_is_information_schema)) { // show the Partition maintenance section only if we detect a partition if (! is_null($partition_names[0])) { ?> -<div id="div_partition_maintenance"> +<div class="operations_half_width"> <form method="post" action="tbl_operations.php"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <fieldset> @@ -777,7 +777,7 @@ if ($cfgRelation['relwork'] && ! $is_innodb) { if ($foreign) { ?> <!-- Referential integrity check --> -<div id="div_referential_integrity"> +<div class="operations_half_width"> <fieldset> <legend><?php echo __('Check referential integrity:'); ?></legend> <ul> diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index 9f944e8..27d931b 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -1251,29 +1251,14 @@ li#li_user_preferences { float: <?php echo $left; ?>; } -#div_table_order { +.operations_half_width { min-width: 48%; float: <?php echo $left; ?>; } -#div_table_rename { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_copy, -#div_partition_maintenance, -#div_referential_integrity, -#div_table_removal, -#div_table_maintenance { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_options { +.operations_full_width { + width: 100%; clear: both; - min-width: 48%; - float: <?php echo $left; ?>; } #qbe_div_table_list { diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index 2107354..4d18832 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -599,11 +599,11 @@ div.footnotes { <?php } else { ?> padding: 0.3em; <?php } ?> - + -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; - + -moz-box-shadow: 0 1px 1px #fff inset; -webkit-box-shadow: 0 1px 1px #fff inset; box-shadow: 0 1px 1px #fff inset; @@ -1546,29 +1546,14 @@ li#li_user_preferences { float: <?php echo $left; ?>; } -#div_table_order { +.operations_half_width { min-width: 48%; float: <?php echo $left; ?>; } -#div_table_rename { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_copy, -#div_partition_maintenance, -#div_referential_integrity, -#div_table_removal, -#div_table_maintenance { - min-width: 48%; - float: <?php echo $left; ?>; -} - -#div_table_options { +.operations_full_width { + width: 100%; clear: both; - min-width: 48%; - float: <?php echo $left; ?>; } #qbe_div_table_list { diff --git a/view_operations.php b/view_operations.php index 2149e15..55d1c74 100644 --- a/view_operations.php +++ b/view_operations.php @@ -79,7 +79,7 @@ $url_params['back'] = 'view_operations.php'; */ ?> <!-- Table operations --> -<div id="div_table_options"> +<div class="operations_half_width"> <form method="post" action="view_operations.php"> <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?> <input type="hidden" name="reload" value="1" /> hooks/post-receive -- phpMyAdmin