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

js/messages.php

@@ -24,8 +24,6 @@ session_write_close();
 // But this one is needed for PMA_escapeJsString()
 require_once './libraries/js_escape.lib.php';
 
-$js_messages['strClickToSelect'] = __('Click to select');
-$js_messages['strClickToUnselect'] = __('Click to unselect');
 $js_messages['strNoDropDatabases'] = $cfg['AllowUserDropDatabase'] ? '' : __('"DROP DATABASE" statements are disabled.');
 
 /* For confirmations */
@@ -289,6 +287,8 @@ $js_messages['strDisplayHelp'] = '<ul><li>'
     . '</li></ul>';
 $js_messages['strInputNull'] = '<strong>' . __('Select two columns') . '</strong>';
 $js_messages['strSameInputs'] = '<strong>' . __('Select two different columns') . '</strong>';
+$js_messages['strQueryResults'] = __('Query results');
+$js_messages['strDataPointContent'] = __('Data point content');
 
 /* For tbl_change.js */
 $js_messages['strIgnore'] = __('Ignore');

js/tbl_zoom_plot.js

@@ -456,7 +456,7 @@ $(document).ready(function() {
     };
     $("#dataDisplay").dialog({
         autoOpen: false,
-        title: 'Data point content',
+        title: PMA_messages['strDataPointContent'],
         modal: true,
         buttons: buttonOptions,
         width: $('#dataDisplay').width() + 24,
@@ -572,7 +572,7 @@ $(document).ready(function() {
                     return this.point.name;
                 }
             },
-            title: { text: 'Query Results' },
+            title: { text: PMA_messages['strQueryResults'] },
             xAxis: {
                 title: { text: $('#tableid_0').val() },
                 events: {

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">

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;