Merge remote-tracking branch 'origin/master'

ChangeLog

@@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
 - Bug #3509686 Reverting sort on joined column does not work
 + New transformation: append string
 + rfe #3507804 Session upload progress (PHP 5.4)
++ rfe #3488185 draggable columns vs copy column name
 
 3.5.1.0 (not yet released)
 - bug #3510784 [edit] Limit clause ignored when sort order is remembered

js/makegrid.js

@@ -1426,6 +1426,20 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 })
                 .mouseleave(function(e) {
                     g.showReorderHint = false;
+                })
+                .dblclick(function(e) {
+                    if ($(this).find("input").length) {
+                        $(this).find("span").hide().end().find("input").show().focus().select();
+                    }
+                    else {
+                        var $input = $("<input/>")
+                            .val($(this).find("span").text())
+                            .blur(function (e) {
+                                $(this).hide().parent().find("span").show();
+                            });
+                        $(this).append($input).find("span").hide();
+                        $input.focus().select();
+                    }
                 });
             // restore column order when the restore button is clicked
             $('.restore_column').click(function() {

themes/original/css/theme_right.css.php

@@ -2328,6 +2328,22 @@ span.CodeMirror-selected {
     position: static;
 }
 
+.pma_table th.draggable {
+    position: relative;
+}
+
+.pma_table th.draggable input {
+    font-weight: inherit;
+    position: absolute;
+    top: -.2em;
+    left: 0;
+    width: 100%;
+    background: transparent;
+    border: 0;
+    outline: none;
+    text-align: center;
+}
+
 .pma_table th.draggable span, .pma_table tbody td span {
     display: block;
     overflow: hidden;

themes/pmahomme/css/theme_right.css.php

@@ -2847,6 +2847,21 @@ span.CodeMirror-selected {
     position: static;
 }
 
+.pma_table th.draggable {
+    position: relative;
+}
+
+.pma_table th.draggable input {
+    font-weight: inherit;
+    position: absolute;
+    top: 0;
+    left: .2em;
+    width: 100%;
+    background: transparent;
+    border: 0;
+    outline: none;
+}
+
 .pma_table th.draggable span,
 .pma_table tbody td span {
     display: block;