The branch, master has been updated via af322da95a8b043e94ca6f51c8b82d0fe117dc6b (commit) from 008ef66027f4a55d962bda74dd3c3094498ac628 (commit)

- Log ----------------------------------------------------------------- commit af322da95a8b043e94ca6f51c8b82d0fe117dc6b Author: Rouslan Placella rouslan@placella.com Date: Sun Nov 20 15:04:09 2011 +0000

Fixed IE bug in the new index editor

-----------------------------------------------------------------------

Summary of changes: tbl_indexes.php | 47 +++++++++++++++++------------- themes/pmahomme/css/theme_right.css.php | 11 ++++++- 2 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/tbl_indexes.php b/tbl_indexes.php index 3a1a863..b576e10 100644 --- a/tbl_indexes.php +++ b/tbl_indexes.php @@ -179,26 +179,33 @@ if ($GLOBALS['is_ajax_request'] != true) { <?php } ?> -<div> -<table class='index_info'> -<tr><td> -<strong> -<label for="input_index_name"><?php echo __('Index name:'); ?></label> -</strong> -<?php echo PMA_showhint(PMA_Message::notice(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))); ?> -</td><td> -<input type="text" name="index[Key_name]" id="input_index_name" size="25" - value="<?php echo htmlspecialchars($index->getName()); ?>" onfocus="this.select()" /> -</td></tr><tr><td> -<strong> -<label for="select_index_type"><?php echo __('Index type:'); ?></label> -</strong> -<?php echo PMA_showMySQLDocu('SQL-Syntax', 'ALTER_TABLE'); ?> -</td><td> -<select name="index[Index_type]" id="select_index_type" > - <?php echo $index->generateIndexSelector(); ?> -</select> -</td></tr></table> +<div class='index_info'> + <div> + <div class="label"> + <strong> + <label for="input_index_name"> + <?php echo __('Index name:'); ?> + <?php echo PMA_showhint(PMA_Message::notice(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))); ?> + </label> + </strong> + </div> + <input type="text" name="index[Key_name]" id="input_index_name" size="25" + value="<?php echo htmlspecialchars($index->getName()); ?>" onfocus="this.select()" /> + </div> + <div> + <div class="label"> + <strong> + <label for="select_index_type"> + <?php echo __('Index type:'); ?> + <?php echo PMA_showMySQLDocu('SQL-Syntax', 'ALTER_TABLE'); ?> + </label> + </strong> + </div> + <select name="index[Index_type]" id="select_index_type" > + <?php echo $index->generateIndexSelector(); ?> + </select> + </div> + <div class="clearfloat"></div> </div>

<table id="index_columns"> diff --git a/themes/pmahomme/css/theme_right.css.php b/themes/pmahomme/css/theme_right.css.php index db300f3..5d4c3f3 100644 --- a/themes/pmahomme/css/theme_right.css.php +++ b/themes/pmahomme/css/theme_right.css.php @@ -2132,13 +2132,22 @@ td.more_opts { */ #index_frm .index_info input, #index_frm .index_info select { - width: 100%; + width: 14em; box-sizing: border-box; -ms-box-sizing: border-box; -moz-box-sizing: border-box; -webkit-box-sizing: border-box; }

+#index_frm .index_info div { + padding: 0.2em 0; +} + +#index_frm .index_info .label { + float: left; + min-width: 12em; +} + #index_frm .slider { width: 10em; margin: 0.6em;

hooks/post-receive