Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

ChangeLog

@@ -49,6 +49,7 @@ phpMyAdmin - ChangeLog
 + [interface] 'Function based search' for GIS data
 + Support Drizzle database
 - bug #3356456 [interface] Interface problems for queries having LIMIT clauses
++ [interface] Remove DefaultPropDisplay feature
 
 3.4.7.0 (not yet released)
 - bug #3418610 [interface] Links in navigation when $cfg['MainPageIconic'] = false

Documentation.html

@@ -2003,18 +2003,6 @@ $cfg['TrustedProxies'] =
         otherwise.
     </dd>
 
-    <dt id="DefaultPropDisplay">
-        <span id="cfg_DefaultPropDisplay">$cfg['DefaultPropDisplay']</span>
-        string or integer</dt>
-    <dd>When editing/creating new columns in a table all fields normally get
-        lined up one field a line. (default: 'horizontal'). If you set this to
-        'vertical' you can have each field lined up vertically beneath each
-        other. You can save up a lot of place on the horizontal direction and
-        no longer have to scroll. If you set this to integer, editing of fewer
-        columns will appear in 'vertical' mode, while editing of more columns 
-        still in 'horizontal' mode. This way you can still effectively edit
-        large number of columns, while having full view on few of them.</dd>
-
     <dt id="cfg_ShowBrowseComments">$cfg['ShowBrowseComments'] boolean<br />
         <span id="cfg_ShowPropertyComments">$cfg['ShowPropertyComments'] </span>boolean
     </dt>

libraries/config.default.php

@@ -2300,15 +2300,6 @@ $cfg['DefaultDisplay'] = 'horizontal';
  */
 $cfg['RememberSorting'] = true;
 
-/**
- * default display direction for altering/creating columns (tbl_properties)
- * (horizontal|vertical|<number>)
- * number indicates maximum number for which vertical model is used
- *
- * @global integer $cfg['DefaultPropDisplay']
- */
-$cfg['DefaultPropDisplay'] = 3;
-
 /**
  * table-header rotation via faking or CSS? (css|fake|auto)
  * NOTE: CSS only works in IE browsers!

libraries/config.values.php

@@ -150,7 +150,6 @@ $cfg_db['_overrides']['Servers/1/extension'] = extension_loaded('mysqli')
 $cfg_db['_validators'] = array(
     'CharTextareaCols' => 'validate_positive_number',
     'CharTextareaRows' => 'validate_positive_number',
-    'DefaultPropDisplay' => array(array('validate_by_regex', '/^(?:horizontal|vertical|\d+)$/')),
     'ExecTimeLimit' => 'validate_non_negative_number',
     'Export/sql_max_query_size' => 'validate_positive_number',
     'ForeignKeyMaxLimit' => 'validate_positive_number',

libraries/config/messages.inc.php

@@ -43,8 +43,6 @@ $strConfigConfirm_desc = __('Whether a warning ("Are your really sure...&qu
 $strConfigConfirm_name = __('Confirm DROP queries');
 $strConfigDBG_sql_name = __('Debug SQL');
 $strConfigDefaultDisplay_name = __('Default display direction');
-$strConfigDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used');
-$strConfigDefaultPropDisplay_name = __('Display direction for altering/creating columns');
 $strConfigDefaultTabDatabase_desc = __('Tab that is displayed when entering a database');
 $strConfigDefaultTabDatabase_name = __('Default database tab');
 $strConfigDefaultTabServer_desc = __('Tab that is displayed when entering a server');

libraries/config/setup.forms.php

@@ -219,8 +219,7 @@ $forms['Main_frame']['Edit'] = array(
     'LongtextDoubleTextarea',
     'InsertRows',
     'ForeignKeyDropdownOrder',
-    'ForeignKeyMaxLimit',
-    'DefaultPropDisplay');
+    'ForeignKeyMaxLimit');
 $forms['Main_frame']['Tabs'] = array(
     'LightTabs',
     'PropertiesIconic',

libraries/config/user_preferences.forms.php

@@ -122,8 +122,7 @@ $forms['Main_frame']['Edit'] = array(
     'ShowFieldTypesInDataEditView',
     'InsertRows',
     'ForeignKeyDropdownOrder',
-    'ForeignKeyMaxLimit',
-    'DefaultPropDisplay');
+    'ForeignKeyMaxLimit');
 $forms['Main_frame']['Tabs'] = array(
     'LightTabs',
     'DefaultTabServer',

libraries/tbl_properties.inc.php

@@ -34,21 +34,7 @@ if (PMA_DRIZZLE) {
     include_once './libraries/data_mysql.inc.php';
 }
 
-if (is_int($cfg['DefaultPropDisplay'])) {
-    if ($num_fields <= $cfg['DefaultPropDisplay']) {
-        $display_type = 'vertical';
-    } else {
-        $display_type = 'horizontal';
-    }
-} else {
-    $display_type = $cfg['DefaultPropDisplay'];
-}
-
-if ('horizontal' == $display_type) {
-    $length_values_input_size = 8;
-} else {
-    $length_values_input_size = 30;
-}
+$length_values_input_size = 8;
 
 $_form_params = array(
     'db' => $db,
@@ -123,7 +109,7 @@ if (!$is_backup) {
     $header_cells[] = __('Index');
 }
 
-$header_cells[] = '<abbr title="AUTO_INCREMENT">' . ($display_type == 'horizontal' ? 'A_I' : 'AUTO_INCREMENT') . '</abbr>';
+$header_cells[] = '<abbr title="AUTO_INCREMENT">A_I</abbr>';
 
 require_once './libraries/transformations.lib.php';
 $cfgRelation = PMA_getRelationsParam();
@@ -279,7 +265,7 @@ for ($i = 0; $i < $num_fields; $i++) {
     $content_cells[$i][$ci] = '<input id="field_' . $i . '_' . ($ci - $ci_offset) . '"'
         . ' type="text" name="field_name[' . $i . ']"'
         . ' maxlength="64" class="textfield" title="' . __('Column') . '"'
-        . ' size="' . ($GLOBALS['cfg']['DefaultPropDisplay'] == 'horizontal' ? '10' : '30') . '"'
+        . ' size="10"'
         . ' value="' . (isset($row['Field']) ? htmlspecialchars($row['Field']) : '') . '"'
         . ' />';
     $ci++;
@@ -562,7 +548,7 @@ for ($i = 0; $i < $num_fields; $i++) {
 <script src="./js/keyhandler.js" type="text/javascript"></script>
 <script type="text/javascript">
 // <![CDATA[
-var switch_movement = <?php echo $display_type == 'horizontal' ? '0' : '1'; ?>;
+var switch_movement = 0;
 document.onkeydown = onKeyDownArrowsHandler;
 // ]]>
 </script>
@@ -602,48 +588,27 @@ if (is_array($content_cells) && is_array($header_cells)) {
     echo '<table id="table_columns" class="noclick">';
     echo '<caption class="tblHeaders">' . __('Structure') . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_TABLE') . '</caption>';
 
-    if ($display_type == 'horizontal') {
         ?>
 <tr>
-        <?php foreach ($header_cells as $header_val) { ?>
+    <?php foreach ($header_cells as $header_val) { ?>
     <th><?php echo $header_val; ?></th>
-        <?php } ?>
+    <?php } ?>
 </tr>
-        <?php
+    <?php
 
-        $odd_row = true;
-        foreach ($content_cells as $content_row) {
-            echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';
-            $odd_row = ! $odd_row;
+    $odd_row = true;
+    foreach ($content_cells as $content_row) {
+        echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';
+        $odd_row = ! $odd_row;
 
-            if (is_array($content_row)) {
-                foreach ($content_row as $content_row_val) {
-                    ?>
+        if (is_array($content_row)) {
+            foreach ($content_row as $content_row_val) {
+                ?>
     <td align="center"><?php echo $content_row_val; ?></td>
-                    <?php
-                }
+                <?php
             }
-            echo '</tr>';
-        }
-    } else {
-        $i = 0;
-        $odd_row = true;
-        foreach ($header_cells as $header_val) {
-            echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';
-            $odd_row = ! $odd_row;
-            ?>
-    <th><?php echo $header_val; ?></th>
-            <?php
-            foreach ($content_cells as $content_cell) {
-                if (isset($content_cell[$i]) && $content_cell[$i] != '') {
-                    ?>
-    <td><?php echo $content_cell[$i]; ?></td>
-                    <?php
-                }
-            }
-            echo '</tr>';
-            $i++;
         }
+        echo '</tr>';
     }
     ?>
 </table>

tbl_create.php

@@ -40,7 +40,7 @@ if (isset($_REQUEST['submit_num_fields'])) {
 } elseif (isset($_REQUEST['num_fields']) && intval($_REQUEST['num_fields']) > 0) {
     $num_fields = (int) $_REQUEST['num_fields'];
 } else {
-    $num_fields = 2;
+    $num_fields = 4;
 }
 
 /**