Merge remote-tracking branch 'origin/QA_4_2' into QA_4_2

phpmyadmin · May 2, 2014 · 73a5cab · 73a5cab
2 parents 2f1bd34 + 45d6f47
commit 73a5cab
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 13 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog
 - bug       Correctly fetch length of user and host fields in MySQL tables
 - bug #4364 examples/signon.php does not support the SessionSavePath directive
 - bug #4382 Missing source for OpenLayers library
+- bug       Incorrect attributes for number fields
 
 4.2.0.0 (not yet released)
 + rfe #1403 Export only triggers

diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php
@@ -829,7 +829,7 @@ private function _getOptions()
          */
         $html_output .= '<fieldset id="fieldset_limit_rows">'
             . '<legend>' . __('Number of rows per page') . '</legend>'
-            . '<input type="number" size="4" name="session_max_rows" required '
+            . '<input type="number" name="session_max_rows" required="required" '
             . 'min="1" '
             . 'value="' . $GLOBALS['cfg']['MaxRows'] . '" class="textfield" />'
             . '</fieldset>';
@@ -901,7 +901,7 @@ private function _getOptionsZoom($dataLabel)
             . __("Maximum rows to plot") . '</label></td>';
         $html_output .= '<td>';
         $html_output .= '<input type="number" name="maxPlotLimit"'
-            . ' id="maxRowPlotLimit" required'
+            . ' id="maxRowPlotLimit" required="required"'
             . ' value="' . ((! empty($_POST['maxPlotLimit']))
                 ? htmlspecialchars($_POST['maxPlotLimit'])
                 : $GLOBALS['cfg']['maxRowPlotLimit'])

diff --git a/libraries/config/FormDisplay.tpl.php b/libraries/config/FormDisplay.tpl.php
@@ -239,7 +239,7 @@ function PMA_displayInput($path, $name, $type, $value, $description = '',
             . ' value="' . htmlspecialchars($value) . '" />';
         break;
     case 'number_text':
-        echo '<input type="number" size="15" ' . $name_id . $field_class
+        echo '<input type="number" ' . $name_id . $field_class
             . ' value="' . htmlspecialchars($value) . '" />';
         break;
     case 'checkbox':

diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php
@@ -63,7 +63,7 @@ function PMA_getHtmlForCreateTable($db)
     $html .= ' </div>';
     $html .= '  <div class="formelement">';
     $html .= __('Number of columns') . ":";
-    $html .= '  <input type="number" min="1" name="num_fields" size="2" value="4" required="required" />';
+    $html .= '  <input type="number" min="1" name="num_fields" value="4" required="required" />';
     $html .= ' </div>';
     $html .= '  <div class="clearfloat"></div>';
     $html .= '</fieldset>';

diff --git a/libraries/index.lib.php b/libraries/index.lib.php
@@ -32,8 +32,8 @@ function PMA_getHtmlForDisplayIndexes()
     );
     $html_output .= sprintf(
         __('Create an index on &nbsp;%s&nbsp;columns'),
-        '<input type="number" size="2" name="added_fields" value="1" '
-        . 'min="1" required />'
+        '<input type="number" name="added_fields" value="1" '
+        . 'min="1" required="required" />'
     );
     $html_output .= '<input type="hidden" name="create_index" value="1" />'
         . '<input class="add_index ajax"'

diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
@@ -716,8 +716,7 @@ function PMA_getHtmlForResourceLimits($row)
         . 'MAX QUERIES PER HOUR'
         . '</dfn></code></label>' . "\n"
         . '<input type="number" name="max_questions" id="text_max_questions" '
-        . 'value="' . $row['max_questions'] . '" '
-        . 'size="6" maxlength="11" min="0" '
+        . 'value="' . $row['max_questions'] . '" min="0" '
         . 'title="'
         . __(
             'Limits the number of queries the user may send to the server per hour.'
@@ -735,7 +734,7 @@ function PMA_getHtmlForResourceLimits($row)
         . 'MAX UPDATES PER HOUR'
         . '</dfn></code></label>' . "\n"
         . '<input type="number" name="max_updates" id="text_max_updates" '
-        . 'value="' . $row['max_updates'] . '" size="6" maxlength="11" min="0" '
+        . 'value="' . $row['max_updates'] . '" min="0" '
         . 'title="'
         . __(
             'Limits the number of commands that change any table '
@@ -753,7 +752,7 @@ function PMA_getHtmlForResourceLimits($row)
         . 'MAX CONNECTIONS PER HOUR'
         . '</dfn></code></label>' . "\n"
         . '<input type="number" name="max_connections" id="text_max_connections" '
-        . 'value="' . $row['max_connections'] . '" size="6" maxlength="11" min="0" '
+        . 'value="' . $row['max_connections'] . '" min="0" '
         . 'title="' . __(
             'Limits the number of new connections the user may open per hour.'
         )
@@ -769,7 +768,7 @@ function PMA_getHtmlForResourceLimits($row)
         . '</dfn></code></label>' . "\n"
         . '<input type="number" name="max_user_connections" '
         . 'id="text_max_user_connections" '
-        . 'value="' . $row['max_user_connections'] . '" size="6" maxlength="11" '
+        . 'value="' . $row['max_user_connections'] . '" '
         . 'title="'
         . __('Limits the number of simultaneous connections the user may have.')
         . '" />' . "\n"

diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
@@ -1587,8 +1587,8 @@ function PMA_getHtmlForAddColumn($columns_list)
             __('Add column')
         );
     }
-    $num_fields = '<input type="number" name="num_fields" size="2" '
-        . 'maxlength="2" value="1" onfocus="this.select()" '
+    $num_fields = '<input type="number" name="num_fields" '
+        . 'value="1" onfocus="this.select()" '
         . 'min="1" required />';
     $html_output .= sprintf(__('Add %s column(s)'), $num_fields);
 

diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
@@ -201,6 +201,10 @@
     margin: 6px;
 }
 
+input[type=number] {
+    width: 50px;
+}
+
 input[type=text],
 input[type=password],
 input[type=number],