The branch, master has been updated via f5954a7d2f1ba1ca115ef057a6e0e47e01698678 (commit) from cd29417260525a9768df0b9539c9c709214c668d (commit)

- Log ----------------------------------------------------------------- commit f5954a7d2f1ba1ca115ef057a6e0e47e01698678 Author: Marc Delisle marc@infomarc.info Date: Sat Mar 19 07:04:43 2011 -0400

Revert "Improve display of the Show dialog in Browse mode"

This reverts commit cd29417260525a9768df0b9539c9c709214c668d.

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

Summary of changes: libraries/display_tbl.lib.php | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 0e88a36..9c98f61 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -303,10 +303,10 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo <?php echo PMA_generate_common_hidden_inputs($db, $table); ?> <input type="hidden" name="sql_query" value="<?php echo $html_sql_query; ?>" /> <input type="hidden" name="goto" value="<?php echo $goto; ?>" /> - <span class="nowrap"><input type="submit" name="navig" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> value="<?php echo __('Show'); ?> :" /> + <input type="submit" name="navig" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?> value="<?php echo __('Show'); ?> :" /> <input type="text" name="session_max_rows" size="3" value="<?php echo (($_SESSION['tmp_user_values']['max_rows'] != 'all') ? $_SESSION['tmp_user_values']['max_rows'] : $GLOBALS['cfg']['MaxRows']); ?>" class="textfield" onfocus="this.select()" /> <?php echo __('row(s) starting from row #') . "\n"; ?> - <input type="text" name="pos" size="6" value="<?php echo (($pos_next >= $unlim_num_rows) ? 0 : $pos_next); ?>" class="textfield" onfocus="this.select()" /></span> + <input type="text" name="pos" size="6" value="<?php echo (($pos_next >= $unlim_num_rows) ? 0 : $pos_next); ?>" class="textfield" onfocus="this.select()" /> <br /> <?php // Display mode (horizontal/vertical and repeat headers) @@ -317,8 +317,9 @@ onsubmit="return (checkFormElementInRange(this, 'session_max_rows', '<?php echo $param1 = PMA_generate_html_dropdown('disp_direction', $choices, $_SESSION['tmp_user_values']['disp_direction'], $id_for_direction_dropdown); unset($choices);

- $param2 = '<input type="text" size="3" name="repeat_cells" value="' . $_SESSION['tmp_user_values']['repeat_cells'] . '" class="textfield" />'; - echo '<span class="nowrap">' . sprintf(__('in %s mode and repeat headers after %s cells'), "\n" . $param1, "\n" . $param2) . "</span>"; + $param2 = ' <input type="text" size="3" name="repeat_cells" value="' . $_SESSION['tmp_user_values']['repeat_cells'] . '" class="textfield" />' . "\n" + . ' '; + echo ' ' . sprintf(__('in %s mode and repeat headers after %s cells'), "\n" . $param1, "\n" . $param2) . "\n"; ?> </form> </td>

hooks/post-receive