From aff4046fdd54e636cc2617c6eae3251cc4064863 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 27 Nov 2014 16:58:20 +0530
Subject: [PATCH 01/29] Update getCheckbox to add id field. Remove id field
 from profiling checkbox

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/DisplayResults.class.php             |  9 ++++++---
 libraries/TableSearch.class.php                |  3 ++-
 libraries/Util.class.php                       | 16 ++++++++++------
 libraries/server_privileges.lib.php            |  7 ++++---
 test/libraries/PMA_server_privileges_test.php  |  2 +-
 test/libraries/common/PMA_getCheckbox_test.php |  8 ++++----
 6 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 49aa2fd6bb..d31cfb89c3 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1661,12 +1661,14 @@ class PMA_DisplayResults
         $options_html .= '<div class="formelement">'
             . PMA_Util::getCheckbox(
                 'display_binary', __('Show binary contents'),
-                ! empty($_SESSION['tmpval']['display_binary']), false
+                ! empty($_SESSION['tmpval']['display_binary']), false,
+                'display_binary'
             )
             . '<br />'
             . PMA_Util::getCheckbox(
                 'display_blob', __('Show BLOB contents'),
-                ! empty($_SESSION['tmpval']['display_blob']), false
+                ! empty($_SESSION['tmpval']['display_blob']), false,
+                'display_blob'
             )
             . '</div>';
 
@@ -1677,7 +1679,8 @@ class PMA_DisplayResults
         $options_html .= '<div class="formelement">'
             . PMA_Util::getCheckbox(
                 'hide_transformation', __('Hide browser transformation'),
-                ! empty($_SESSION['tmpval']['hide_transformation']), false
+                ! empty($_SESSION['tmpval']['hide_transformation']), false,
+                'hide_transformation'
             )
             . '</div>';
 
diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php
index ca5f13dba4..08cd599a13 100644
--- a/libraries/TableSearch.class.php
+++ b/libraries/TableSearch.class.php
@@ -1369,7 +1369,8 @@ class PMA_TableSearch
                 'useRegex',
                 __('Use regular expression'),
                 false,
-                false
+                false,
+                'useRegex'
             );
         return $htmlOutput;
     }
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 47dee4bf50..fd93109269 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -2605,15 +2605,19 @@ class PMA_Util
      * @param string  $label           label for checkbox
      * @param boolean $checked         is it initially checked?
      * @param boolean $onclick         should it submit the form on click?
+     * @param string  $html_field_id   id for the checkbox
      *
      * @return string                  HTML for the checkbox
      */
-    public static function getCheckbox($html_field_name, $label, $checked, $onclick)
-    {
-        return '<input type="checkbox" name="' . $html_field_name . '" id="'
-            . $html_field_name . '"' . ($checked ? ' checked="checked"' : '')
-            . ($onclick ? ' class="autosubmit"' : '') . ' /><label for="'
-            . $html_field_name . '">' . $label . '</label>';
+    public static function getCheckbox(
+        $html_field_name, $label, $checked, $onclick, $html_field_id = ''
+    ) {
+        return '<input type="checkbox" name="' . $html_field_name . '"'
+            . ($html_field_id ? ' id="' . $html_field_id . '"' : '')
+            . ($checked ? ' checked="checked"' : '')
+            . ($onclick ? ' class="autosubmit"' : '') . ' />'
+            . '<label' . ($html_field_id ? ' for="' . $html_field_name . '"' : '')
+            . '>' . $label . '</label>';
     }
 
     /**
diff --git a/libraries/server_privileges.lib.php b/libraries/server_privileges.lib.php
index 0a56668315..a8123a558e 100644
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@@ -1757,13 +1757,13 @@ function PMA_getHtmlForAddUser($dbname)
     $html_output .= PMA_Util::getCheckbox(
         'createdb-1',
         __('Create database with same name and grant all privileges.'),
-        false, false
+        false, false, 'createdb-1'
     );
     $html_output .= '<br />' . "\n";
     $html_output .= PMA_Util::getCheckbox(
         'createdb-2',
         __('Grant all privileges on wildcard name (username\\_%).'),
-        false, false
+        false, false, 'createdb-2'
     );
     $html_output .= '<br />' . "\n";
 
@@ -1775,7 +1775,8 @@ function PMA_getHtmlForAddUser($dbname)
                 htmlspecialchars($dbname)
             ),
             true,
-            false
+            false,
+            'createdb-3'
         );
         $html_output .= '<input type="hidden" name="dbname" value="'
             . htmlspecialchars($dbname) . '" />' . "\n";
diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php
index 3e628728cf..1e252531af 100644
--- a/test/libraries/PMA_server_privileges_test.php
+++ b/test/libraries/PMA_server_privileges_test.php
@@ -1200,7 +1200,7 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase
         $item = PMA_Util::getCheckbox(
             'createdb-2',
             __('Grant all privileges on wildcard name (username\\_%).'),
-            false, false
+            false, false, 'createdb-2'
         );
         $this->assertContains(
             $item,
diff --git a/test/libraries/common/PMA_getCheckbox_test.php b/test/libraries/common/PMA_getCheckbox_test.php
index 340c3b61de..ba5349e215 100644
--- a/test/libraries/common/PMA_getCheckbox_test.php
+++ b/test/libraries/common/PMA_getCheckbox_test.php
@@ -31,7 +31,7 @@ class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
         $label = "text_label_for_checkbox";
 
         $this->assertEquals(
-            PMA_Util::getCheckbox($name, $label, false, false),
+            PMA_Util::getCheckbox($name, $label, false, false, $name),
             '<input type="checkbox" name="' . $name . '" id="' . $name
             . '" /><label for="' . $name . '">' . $label
             . '</label>'
@@ -49,7 +49,7 @@ class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
         $label = "text_label_for_checkbox";
 
         $this->assertEquals(
-            PMA_Util::getCheckbox($name, $label, true, false),
+            PMA_Util::getCheckbox($name, $label, true, false, $name),
             '<input type="checkbox" name="' . $name . '" id="' . $name
             . '" checked="checked" /><label for="' . $name . '">' . $label
             . '</label>'
@@ -67,7 +67,7 @@ class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
         $label = "text_label_for_checkbox";
 
         $this->assertEquals(
-            PMA_Util::getCheckbox($name, $label, false, true),
+            PMA_Util::getCheckbox($name, $label, false, true, $name),
             '<input type="checkbox" name="' . $name . '" id="' . $name
             . '" class="autosubmit" /><label for="' . $name . '">' . $label
             . '</label>'
@@ -85,7 +85,7 @@ class PMA_GetCheckboxTest extends PHPUnit_Framework_TestCase
         $label = "text_label_for_checkbox";
 
         $this->assertEquals(
-            PMA_Util::getCheckbox($name, $label, true, true),
+            PMA_Util::getCheckbox($name, $label, true, true, $name),
             '<input type="checkbox" name="' . $name . '" id="' . $name
             . '" checked="checked" class="autosubmit" /><label for="' . $name
             . '">' . $label . '</label>'

From ff393b207e459874dcfc070e728aec026b7f6f9d Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 27 Nov 2014 17:05:06 +0530
Subject: [PATCH 02/29] Remove id field from displayOptionsForm

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/sql.js                          | 4 ++--
 libraries/DisplayResults.class.php | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index ae969f0b2b..e9838f139b 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -95,7 +95,7 @@ AJAX.registerTeardown('sql.js', function () {
     $("input[name=navig].ajax").die('click');
     $("#pageselector").die('change');
     $("#table_results.ajax").find("a[title=Sort]").die('click');
-    $("#displayOptionsForm.ajax").die('submit');
+    $(".displayOptionsForm.ajax").die('submit');
     $('th.column_heading.pointer').die('hover');
     $('th.column_heading.marker').die('click');
     $(window).unbind('scroll');
@@ -389,7 +389,7 @@ AJAX.registerOnload('sql.js', function () {
      * @memberOf    jQuery
      * @name        displayOptionsForm_submit
      */
-    $("#displayOptionsForm.ajax").live('submit', function (event) {
+    $(".displayOptionsForm.ajax").live('submit', function (event) {
         event.preventDefault();
 
         $form = $(this);
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index d31cfb89c3..57cfbb1f30 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1608,8 +1608,7 @@ class PMA_DisplayResults
         $options_html = '';
 
         $options_html .= '<form method="post" action="sql.php" '
-            . 'name="displayOptionsForm" '
-            . 'id="displayOptionsForm"';
+            . 'name="displayOptionsForm"';
 
         $options_html .= ' class="ajax" ';
 

From 201b7446508ffb4c9092d11af592fce79fe28e19 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 27 Nov 2014 17:19:53 +0530
Subject: [PATCH 03/29] Remove id from display options slider

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/DisplayResults.class.php |  2 +-
 libraries/Util.class.php           | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 57cfbb1f30..0c72fc7b54 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1624,7 +1624,7 @@ class PMA_DisplayResults
         $options_html .= PMA_URL_getHiddenInputs($url_params)
             . '<br />'
             . PMA_Util::getDivForSliderEffect(
-                'displayoptions', __('Options')
+                '', __('Options')
             )
             . '<fieldset>';
 
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index fd93109269..c06d7755da 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -2722,10 +2722,10 @@ class PMA_Util
      * @return string         html div element
      *
      */
-    public static function getDivForSliderEffect($id, $message)
+    public static function getDivForSliderEffect($id = '', $message = '')
     {
         if ($GLOBALS['cfg']['InitialSlidersState'] == 'disabled') {
-            return '<div id="' . $id . '">';
+            return '<div' . ($id ? ' id="' . $id . '"' : '') . '>';
         }
         /**
          * Bad hack on the next line. document.write() conflicts with jQuery,
@@ -2736,11 +2736,14 @@ class PMA_Util
          * append to
          */
 
-        return '<div id="' . $id . '"'
+        return '<div'
+             . ($id ? ' id="' . $id . '"' : '')
             . (($GLOBALS['cfg']['InitialSlidersState'] == 'closed')
                 ? ' style="display: none; overflow:auto;"'
                 : '')
-            . ' class="pma_auto_slider" title="' . htmlspecialchars($message) . '">';
+            . ' class="pma_auto_slider"'
+            . ($message ? ' title="' . htmlspecialchars($message) . '"' : '')
+            . '>';
     }
 
     /**

From 823a68f60124e3f9c20254aca52ac61dd011500d Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 27 Nov 2014 17:35:58 +0530
Subject: [PATCH 04/29] Choose withing the scope of current query results

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/makegrid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index bcd33d3200..f65a5c5a14 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1068,7 +1068,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             /**
              * @var relational_display string 'K' if relational key, 'D' if relational display column
              */
-            var relational_display = $("#relational_display_K").prop('checked') ? 'K' : 'D';
+            var relational_display = $(t).find("input[name=relational_display]:checked").val();
             /**
              * @var transform_fields    Array containing the name/value pairs for transformed fields
              */

From b1ab5e3e5b0b196bdcc997836359d45f5dab916e Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Thu, 27 Nov 2014 20:43:59 +0530
Subject: [PATCH 05/29] Avoid using #table_results for jQuery selections

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/db_search.js                    |  4 +-
 js/makegrid.js                     | 14 ++---
 js/navigation.js                   |  4 +-
 js/sql.js                          | 92 ++++++++++++++++--------------
 libraries/DisplayResults.class.php |  2 +-
 5 files changed, 59 insertions(+), 57 deletions(-)

diff --git a/js/db_search.js b/js/db_search.js
index a25b8296d2..72b0802658 100644
--- a/js/db_search.js
+++ b/js/db_search.js
@@ -53,7 +53,9 @@ function loadResult(result_path, table_name, link)
                         scrollTop: $("#browse-results").offset().top
                     }, 1000);
                 PMA_ajaxRemoveMessage($msg);
-                PMA_makegrid($('#table_results')[0], true, true, true, true);
+                $('.table_results').each(function () {
+                    PMA_makegrid(this, true, true, true, true);
+                })
                 $('#browse-results').show();
             } else {
                 PMA_ajaxShowMessage(data.error, false);
diff --git a/js/makegrid.js b/js/makegrid.js
index f65a5c5a14..2e239d3b2d 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -194,9 +194,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 g.reposDrop();
                 g.colRsz = false;
                 $(g.cRsz).find('div').removeClass('colborder_active');
-                if($('#sticky_columns').length !== 0) {
-                    rearrangeStickyColumns();
-                }
+                rearrangeStickyColumns($(t).prev('.sticky_columns'), $(t));
             } else if (g.colReorder) {
                 // shift columns
                 if (g.colReorder.newn != g.colReorder.n) {
@@ -223,9 +221,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 $(g.cPointer).css('visibility', 'hidden');
 
                 g.colReorder = false;
-                if($('#sticky_columns').length !== 0) {
-                    rearrangeStickyColumns();
-                }
+                rearrangeStickyColumns($(t).prev('.sticky_columns'), $(t));
             }
             $(document.body).css('cursor', 'inherit').noSelect(false);
         },
@@ -722,7 +718,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                  * @var field_name  String containing the name of this field.
                  * @see getFieldName()
                  */
-                var field_name = getFieldName($td);
+                var field_name = getFieldName($(t), $td);
                 /**
                  * @var relation_curr_value String current value of the field (for fields that are foreign keyed).
                  */
@@ -1140,7 +1136,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                      * @var field_name  String containing the name of this field.
                      * @see getFieldName()
                      */
-                    var field_name = getFieldName($this_field);
+                    var field_name = getFieldName($(t), $this_field);
 
                     /**
                      * @var this_field_params   Array temporary storage for the name/value of current field
@@ -1355,7 +1351,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
              * @var field_name  String containing the name of this field.
              * @see getFieldName()
              */
-            var field_name = getFieldName($this_field);
+            var field_name = getFieldName($(t), $this_field);
 
             /**
              * @var this_field_params   Array temporary storage for the name/value of current field
diff --git a/js/navigation.js b/js/navigation.js
index a72647dc7e..ad530c0fa5 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -993,8 +993,8 @@ var ResizeHandler = function () {
         event.preventDefault();
         var pos = event.data.resize_handler.getPos(event);
         event.data.resize_handler.setWidth(pos);
-        if($('#sticky_columns').length !== 0) {
-            handleStickyColumns();
+        if ($('.sticky_columns').length !== 0) {
+            handleAllStickyColumns();
         }
     };
     /**
diff --git a/js/sql.js b/js/sql.js
index e9838f139b..e01ebc2398 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -40,23 +40,24 @@ function PMA_urlencode(str)
  * Get the field name for the current field.  Required to construct the query
  * for grid editing
  *
- * @param $this_field  jQuery object that points to the current field's tr
+ * @param $table_results enclosing results table
+ * @param $this_field    jQuery object that points to the current field's tr
  */
-function getFieldName($this_field)
+function getFieldName($table_results, $this_field)
 {
 
     var this_field_index = $this_field.index();
     // ltr or rtl direction does not impact how the DOM was generated
     // check if the action column in the left exist
-    var left_action_exist = !$('#table_results').find('th:first').hasClass('draggable');
+    var left_action_exist = !$table_results.find('th:first').hasClass('draggable');
     // number of column span for checkbox and Actions
-    var left_action_skip = left_action_exist ? $('#table_results').find('th:first').attr('colspan') - 1 : 0;
+    var left_action_skip = left_action_exist ? $table_results.find('th:first').attr('colspan') - 1 : 0;
 
     // If this column was sorted, the text of the a element contains something
     // like <small>1</small> that is useful to indicate the order in case
     // of a sort on multiple columns; however, we dont want this as part
     // of the column name so we strip it ( .clone() to .end() )
-    var field_name = $('#table_results')
+    var field_name = $table_results
         .find('thead')
         .find('th:eq(' + (this_field_index - left_action_skip) + ') a')
         .clone()    // clone the element
@@ -66,7 +67,7 @@ function getFieldName($this_field)
         .text();    // grab the text
     // happens when just one row (headings contain no a)
     if (field_name === '') {
-        var $heading = $('#table_results').find('thead').find('th:eq(' + (this_field_index - left_action_skip) + ')').children('span');
+        var $heading = $table_results.find('thead').find('th:eq(' + (this_field_index - left_action_skip) + ')').children('span');
         // may contain column comment enclosed in a span - detach it temporarily to read the column name
         var $tempColComment = $heading.children().detach();
         field_name = $heading.text();
@@ -94,7 +95,6 @@ AJAX.registerTeardown('sql.js', function () {
     $("#sqlqueryform.ajax").die('submit');
     $("input[name=navig].ajax").die('click');
     $("#pageselector").die('change');
-    $("#table_results.ajax").find("a[title=Sort]").die('click');
     $(".displayOptionsForm.ajax").die('submit');
     $('th.column_heading.pointer').die('hover');
     $('th.column_heading.marker').die('click');
@@ -168,7 +168,9 @@ AJAX.registerOnload('sql.js', function () {
      * @memberOf    jQuery
      */
     $("#sqlqueryresults").live('makegrid', function () {
-        PMA_makegrid($('#table_results')[0]);
+        $('.table_results').each(function () {
+            PMA_makegrid(this);
+        });
     });
 
     /*
@@ -177,15 +179,16 @@ AJAX.registerOnload('sql.js', function () {
      * @memberOf    jQuery
      */
     $("#sqlqueryresults").live('stickycolumns', function () {
-        if ($("#table_results").length === 0) {
-            return;
-        }
-        //add sticky columns div
-        initStickyColumns();
-        rearrangeStickyColumns();
-        //adjust sticky columns on scroll
-        $(window).bind('scroll', function() {
-            handleStickyColumns();
+        $(".sticky_columns").remove();
+        $(".table_results").each(function () {
+            var $table_results = $(this);
+            //add sticky columns div
+            var $stick_columns = initStickyColumns($table_results);
+            rearrangeStickyColumns($stick_columns, $table_results);
+            //adjust sticky columns on scroll
+            $(window).bind('scroll', function() {
+                handleStickyColumns($stick_columns, $table_results);
+            });
         });
     });
 
@@ -557,7 +560,7 @@ function PMA_changeClassForColumn($this_th, newclass, isAddClass)
     if (has_big_t) {
         th_index--;
     }
-    var $tds = $("#table_results").find('tbody tr').find('td.data:eq(' + th_index + ')');
+    var $tds = $this_th.parents(".table_results").find('tbody tr').find('td.data:eq(' + th_index + ')');
     if (isAddClass === undefined) {
         $tds.toggleClass(newclass);
     } else {
@@ -725,39 +728,35 @@ function initProfilingTables()
 /*
  * Set position, left, top, width of sticky_columns div
  */
-function setStickyColumnsPosition(position, top, left) {
-    if ($("#sticky_columns").length !== 0) {
-        $("#sticky_columns")
-            .css("position", position)
-            .css("top", top)
-            .css("left", left ? left : "auto")
-            .css("width", $("#table_results").width());
-    }
+function setStickyColumnsPosition($sticky_columns, $table_results, position, top, left) {
+    $sticky_columns
+        .css("position", position)
+        .css("top", top)
+        .css("left", left ? left : "auto")
+        .css("width", $table_results.width());
 }
 
 /*
  * Initialize sticky columns
  */
-function initStickyColumns() {
+function initStickyColumns($table_results) {
     fixedTop = $('#floating_menubar').height();
-    if ($("#sticky_columns").length === 0) {
-        $('<table id="sticky_columns"></table>')
-            .insertBefore('#page_content')
+    var $sticky_columns = $('<table class="sticky_columns"></table>')
+            .insertBefore($table_results)
             .css("position", "fixed")
             .css("z-index", "99")
-            .css("width", $("#table_results").width())
+            .css("width", $table_results.width())
             .css("margin-left", $('#page_content').css("margin-left"))
             .css("top", fixedTop)
             .css("display", "none");
-    }
+    return $sticky_columns;
 }
 
 /*
  * Arrange/Rearrange columns in sticky header
  */
-function rearrangeStickyColumns() {
-    var $sticky_columns = $("#sticky_columns");
-    var $originalHeader = $("#table_results > thead");
+function rearrangeStickyColumns($sticky_columns, $table_results) {
+    var $originalHeader = $table_results.find("thead");
     var $originalColumns = $originalHeader.find("tr:first").children();
     var $clonedHeader = $originalHeader.clone();
     // clone width per cell
@@ -767,26 +766,31 @@ function rearrangeStickyColumns() {
     $sticky_columns.empty().append($clonedHeader);
 }
 
+/*
+ * Adjust sticky columns on horizontal/vertical scroll for all tables
+ */
+function handleAllStickyColumns() {
+    $('.sticky_columns').each(function () {
+        handleStickyColumns($(this), $(this).next('.table_results'));
+    });
+}
+
 /*
  * Adjust sticky columns on horizontal/vertical scroll
  */
-function handleStickyColumns() {
-    if ($("#table_results").length === 0) {
-        return;
-    }
+function handleStickyColumns($sticky_columns, $table_results) {
     var currentScrollX = $(window).scrollLeft();
     var windowOffset = $(window).scrollTop();
-    var tableStartOffset = $("#table_results").offset().top;
-    var tableEndOffset = tableStartOffset + $("#table_results").height();
-    var $sticky_columns = $("#sticky_columns");
+    var tableStartOffset = $table_results.offset().top;
+    var tableEndOffset = tableStartOffset + $table_results.height();
     if (windowOffset >= tableStartOffset && windowOffset <= tableEndOffset) {
         //for horizontal scrolling
         if(prevScrollX != currentScrollX) {
             prevScrollX = currentScrollX;
-            setStickyColumnsPosition("absolute", fixedTop + windowOffset);
+            setStickyColumnsPosition($sticky_columns, $table_results, "absolute", fixedTop + windowOffset);
         //for vertical scrolling
         } else {
-            setStickyColumnsPosition("fixed", fixedTop, $("#pma_navigation").width() - currentScrollX);
+            setStickyColumnsPosition($sticky_columns, $table_results, "fixed", fixedTop, $("#pma_navigation").width() - currentScrollX);
         }
         $sticky_columns.show();
     } else {
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 0c72fc7b54..f91fe7ba00 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1784,7 +1784,7 @@ class PMA_DisplayResults
                 . '<input type="hidden" name="goto" value="sql.php" />';
         }
 
-        $form_html .= '<table id="table_results" class="data';
+        $form_html .= '<table id="table_results" class="table_results data';
         $form_html .= ' ajax';
         $form_html .= '">';
 

From 803d63d32fd15192715891e92b03b04a91b63e44 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 12:27:12 +0530
Subject: [PATCH 06/29] There is no sqlqueryresults div in db search. Use
 searchresults div

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/db_search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/db_search.js b/js/db_search.js
index 72b0802658..575f880bb0 100644
--- a/js/db_search.js
+++ b/js/db_search.js
@@ -44,7 +44,7 @@ function loadResult(result_path, table_name, link)
         /**  Load the browse results to the page */
         $("#table-info").show();
         $('#table-link').attr({"href" : 'sql.php' + link }).text(table_name);
-        var url = result_path + "#sqlqueryresults";
+        var url = result_path + "#searchresults";
         $.get(url, {'ajax_request': true, 'is_js_confirmed': true}, function (data) {
             if (typeof data !== 'undefined' && data.success) {
                 $('#browse-results').html(data.message);
@@ -230,7 +230,7 @@ AJAX.registerOnload('db_search.js', function () {
                     .show();
             } else {
                 // error message (zero rows)
-                $("#sqlqueryresults").html(data.error);
+                $("#searchresults").html(data.error).show();
             }
 
             PMA_ajaxRemoveMessage($msgbox);

From c397c9f2bbc9768e313892a394a4b00109ff0a8a Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 12:29:07 +0530
Subject: [PATCH 07/29] Use div id sqlqueryresultsouter in table search since
 sqlqueryresults clashes with the results returned

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/tbl_find_replace.js          |  4 ++--
 js/tbl_select.js                | 10 +++++-----
 js/tbl_zoom_plot_jqplot.js      |  4 ++--
 libraries/TableSearch.class.php |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/js/tbl_find_replace.js b/js/tbl_find_replace.js
index 975648f1cf..c164bac2d7 100644
--- a/js/tbl_find_replace.js
+++ b/js/tbl_find_replace.js
@@ -38,9 +38,9 @@ AJAX.registerOnload('tbl_find_replace.js', function () {
             if (data.success === true) {
                 $('#toggle_find_div').show();
                 $('#toggle_find').click();
-                $("#sqlqueryresults").html(data.preview);
+                $("#sqlqueryresultsouter").html(data.preview);
             } else {
-                $("#sqlqueryresults").html(data.error);
+                $("#sqlqueryresultsouter").html(data.error);
             }
         });
     });
diff --git a/js/tbl_select.js b/js/tbl_select.js
index 7b796c6443..9909dba9bf 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -97,7 +97,7 @@ AJAX.registerOnload('tbl_select.js', function () {
         event.preventDefault();
 
         // empty previous search results while we are waiting for new results
-        $("#sqlqueryresults").empty();
+        $("#sqlqueryresultsouter").empty();
         var $msgbox = PMA_ajaxShowMessage(PMA_messages.strSearching, false);
 
         PMA_prepareForAjaxRequest($search_form);
@@ -142,9 +142,9 @@ AJAX.registerOnload('tbl_select.js', function () {
             PMA_ajaxRemoveMessage($msgbox);
             if (typeof data !== 'undefined' && data.success === true) {
                 if (typeof data.sql_query !== 'undefined') { // zero rows
-                    $("#sqlqueryresults").html(data.sql_query);
+                    $("#sqlqueryresultsouter").html(data.sql_query);
                 } else { // results found
-                    $("#sqlqueryresults").html(data.message);
+                    $("#sqlqueryresultsouter").html(data.message);
                     $("#sqlqueryresults").trigger('makegrid').trigger('stickycolumns');
                 }
                 $('#tbl_search_form')
@@ -160,9 +160,9 @@ AJAX.registerOnload('tbl_select.js', function () {
                  // needed for the display options slider in the results
                 PMA_init_slider();
             } else {
-                $("#sqlqueryresults").html(data.error);
+                $("#sqlqueryresultsouter").html(data.error);
             }
-            PMA_highlightSQL($('#sqlqueryresults'));
+            PMA_highlightSQL($('#sqlqueryresultsouter'));
         }); // end $.post()
     });
 
diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js
index 5057ec4435..3eab813ce8 100644
--- a/js/tbl_zoom_plot_jqplot.js
+++ b/js/tbl_zoom_plot_jqplot.js
@@ -400,8 +400,8 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
                     'inline_edit' : false
                 }, function (data) {
                     if (typeof data !== 'undefined' && data.success === true) {
-                        $('#sqlqueryresults').html(data.sql_query);
-                        $("#sqlqueryresults").trigger('appendAnchor');
+                        $('#sqlqueryresultsouter').html(data.sql_query);
+                        PMA_highlightSQL($('#sqlqueryresultsouter'));
                     } else {
                         PMA_ajaxShowMessage(data.error, false);
                     }
diff --git a/libraries/TableSearch.class.php b/libraries/TableSearch.class.php
index 08cd599a13..c03406f760 100644
--- a/libraries/TableSearch.class.php
+++ b/libraries/TableSearch.class.php
@@ -1237,7 +1237,7 @@ class PMA_TableSearch
             . ($this->_searchType == 'zoom' ? '" id="inputFormSubmitId"' : '" ')
             . 'value="' . __('Go') . '" />';
         $html_output .= '</fieldset></form>';
-        $html_output .= '<div id="sqlqueryresults"></div>';
+        $html_output .= '<div id="sqlqueryresultsouter"></div>';
         return $html_output;
     }
 

From 4327a98910f46a96a98e5f805ae83e6601feeff0 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 12:30:06 +0530
Subject: [PATCH 08/29] Use div id sqlqueryresultsouter in SQL tab since
 sqlqueryresults clashes with the results returned

---
 js/sql.js                        | 13 +++++++------
 libraries/sql_query_form.lib.php |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index e01ebc2398..a2844ca596 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -290,7 +290,7 @@ AJAX.registerOnload('sql.js', function () {
         $('div.error').remove();
 
         var $msgbox = PMA_ajaxShowMessage();
-        var $sqlqueryresults = $('#sqlqueryresults');
+        var $sqlqueryresultsouter = $('#sqlqueryresultsouter');
 
         PMA_prepareForAjaxRequest($form);
 
@@ -317,10 +317,10 @@ AJAX.registerOnload('sql.js', function () {
                         }
                     }
                 }
-                $sqlqueryresults
+                $sqlqueryresultsouter
                     .show()
                     .html(data.message);
-                PMA_highlightSQL($('#result_query'));
+                PMA_highlightSQL($sqlqueryresultsouter);
 
                 if (typeof data.ajax_reload != 'undefined') {
                     if (data.ajax_reload.reload) {
@@ -357,7 +357,7 @@ AJAX.registerOnload('sql.js', function () {
                     });
                 }
 
-                $sqlqueryresults.show().trigger('makegrid').trigger('stickycolumns');
+                $('#sqlqueryresults').trigger('makegrid').trigger('stickycolumns');
                 $('#togglequerybox').show();
                 PMA_init_slider();
 
@@ -370,8 +370,9 @@ AJAX.registerOnload('sql.js', function () {
                 }
             } else if (typeof data !== 'undefined' && data.success === false) {
                 // show an error message that stays on screen
-                $('#sqlqueryform').before(data.error);
-                $sqlqueryresults.hide();
+                $sqlqueryresultsouter
+                    .show()
+                    .html(data.error);
             }
             PMA_ajaxRemoveMessage($msgbox);
         }); // end $.post()
diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php
index 5b33b33863..488abe573d 100644
--- a/libraries/sql_query_form.lib.php
+++ b/libraries/sql_query_form.lib.php
@@ -118,7 +118,7 @@ function PMA_getHtmlForSqlQueryForm(
     $html .= '</form>' . "\n";
     // print an empty div, which will be later filled with
     // the sql query results by ajax
-    $html .= '<div id="sqlqueryresults"></div>';
+    $html .= '<div id="sqlqueryresultsouter"></div>';
 
     return $html;
 }

From 42f9c8c460e11bee59d59d5ce9c3be2cfa7e7c4e Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 12:39:24 +0530
Subject: [PATCH 09/29] Use class for passing column order to the front end

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/makegrid.js                     | 2 +-
 libraries/DisplayResults.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index 2e239d3b2d..0cf6ed0b76 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1481,7 +1481,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             var $firstRowCols = $(g.t).find('tr:first th.draggable');
 
             // initialize column order
-            $col_order = $('#col_order');   // check if column order is passed from PHP
+            $col_order = $(t).find('.col_order');   // check if column order is passed from PHP
             if ($col_order.length > 0) {
                 g.colOrder = $col_order.val().split(',');
                 for (var i = 0; i < g.colOrder.length; i++) {
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index f91fe7ba00..cca34b9d7f 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1569,7 +1569,7 @@ class PMA_DisplayResults
         $col_order = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_ORDER);
 
         if ($col_order) {
-            $data_html .= '<input id="col_order" type="hidden" value="'
+            $data_html .= '<input class="col_order" type="hidden" value="'
                 . implode(',', $col_order) . '" />';
         }
 

From 7647baee58bbe00f77e60e26214ef171f5ebabbe Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 12:40:48 +0530
Subject: [PATCH 10/29] Pass column visibility with class attribute to the
 front end

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/makegrid.js                     | 2 +-
 libraries/DisplayResults.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index 0cf6ed0b76..a2be1049ff 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1575,7 +1575,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             var $firstRowCols = $(g.t).find('tr:first th.draggable');
 
             // initialize column visibility
-            var $col_visib = $('#col_visib');   // check if column visibility is passed from PHP
+            var $col_visib = $(t).find('.col_visib');   // check if column visibility is passed from PHP
             if ($col_visib.length > 0) {
                 g.colVisib = $col_visib.val().split(',');
                 for (var i = 0; i < g.colVisib.length; i++) {
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index cca34b9d7f..f755caf701 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1576,7 +1576,7 @@ class PMA_DisplayResults
         $col_visib = $pmatable->getUiProp(PMA_Table::PROP_COLUMN_VISIB);
 
         if ($col_visib) {
-            $data_html .= '<input id="col_visib" type="hidden" value="'
+            $data_html .= '<input class="col_visib" type="hidden" value="'
                 . implode(',', $col_visib) . '" />';
         }
 

From b57250bcdfd342d7c5eb825f5b351709122e8407 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 12:42:32 +0530
Subject: [PATCH 11/29] Pass table_create_time with class attribute

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/makegrid.js                     | 2 +-
 libraries/DisplayResults.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index a2be1049ff..f7f1af2bc3 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1857,7 +1857,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
 
     // assign table create time
     // #table_create_time will only available if we are in "Browse" tab
-    g.tableCreateTime = $('#table_create_time').val();
+    g.tableCreateTime = $(t).find('.table_create_time').val();
 
     // assign the hints
     g.sortHint = PMA_messages.strSortHint;
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index f755caf701..de167da1d5 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1582,7 +1582,7 @@ class PMA_DisplayResults
 
         // generate table create time
         if (! PMA_Table::isView($this->__get('db'), $this->__get('table'))) {
-            $data_html .= '<input id="table_create_time" type="hidden" value="'
+            $data_html .= '<input class="table_create_time" type="hidden" value="'
                 . PMA_Table::sGetStatusInfo(
                     $this->__get('db'), $this->__get('table'), 'Create_time'
                 ) . '" />';

From 74bba2773d8c953a6b5096e68d8b93a7500815f8 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 12:43:57 +0530
Subject: [PATCH 12/29] Update comment as well

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/makegrid.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index f7f1af2bc3..07ea150fb4 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1856,7 +1856,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
     }
 
     // assign table create time
-    // #table_create_time will only available if we are in "Browse" tab
+    // table_create_time will only available if we are in "Browse" tab
     g.tableCreateTime = $(t).find('.table_create_time').val();
 
     // assign the hints

From fc611618832ebf3914d42a133fe325d0d97619df Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 12:45:13 +0530
Subject: [PATCH 13/29] Pass save_cells_at_once using class attribute

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/makegrid.js                     | 2 +-
 libraries/DisplayResults.class.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index 07ea150fb4..1863aa2026 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1700,7 +1700,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             g.showDataRowLinkText = PMA_messages.strShowDataRowLink;
 
             // initialize cell editing configuration
-            g.saveCellsAtOnce = $('#save_cells_at_once').val();
+            g.saveCellsAtOnce = $(t).find('.save_cells_at_once').val();
             g.maxTruncatedLen = PMA_commonParams.get('LimitChars');
 
             // register events
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index de167da1d5..dc0364b3c1 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1056,7 +1056,7 @@ class PMA_DisplayResults
         }
 
         // Output data needed for grid editing
-        $table_headers_html .= '<input id="save_cells_at_once" type="hidden" value="'
+        $table_headers_html .= '<input class="save_cells_at_once" type="hidden" value="'
             . $GLOBALS['cfg']['SaveCellsAtOnce'] . '" />'
             . '<div class="common_hidden_inputs">'
             . PMA_URL_getHiddenInputs(

From d21f37b3f1acae457aa027c5763feb8b3cb8df0d Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 12:51:30 +0530
Subject: [PATCH 14/29] Use class to identify bookmarkQueryForm

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/sql.js             | 4 ++--
 libraries/sql.lib.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index a2844ca596..75f51aa391 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -85,7 +85,7 @@ function getFieldName($table_results, $this_field)
  */
 AJAX.registerTeardown('sql.js', function () {
     $('a.delete_row.ajax').die('click');
-    $('#bookmarkQueryForm').die('submit');
+    $('.bookmarkQueryForm').die('submit');
     $('input#bkm_label').unbind('keyup');
     $("#sqlqueryresults").die('makegrid');
     $("#sqlqueryresults").die('stickycolumns');
@@ -143,7 +143,7 @@ AJAX.registerOnload('sql.js', function () {
     });
 
     // Ajaxification for 'Bookmark this SQL query'
-    $('#bookmarkQueryForm').live('submit', function (e) {
+    $('.bookmarkQueryForm').live('submit', function (e) {
         e.preventDefault();
         PMA_ajaxShowMessage();
         $.post($(this).attr('action'), 'ajax_request=1&' + $(this).serialize(), function (data) {
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index 7ada9d4f8f..b24699f5a8 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -616,7 +616,7 @@ function PMA_getHtmlForBookmark($disp_mode, $cfgBookmark, $sql_query, $db, $tabl
         $html = '<form action="sql.php" method="post"'
             . ' onsubmit="return ! emptyCheckTheField(this,'
             . '\'bkm_fields[bkm_label]\');"'
-            . ' id="bookmarkQueryForm">';
+            . ' class="bookmarkQueryForm">';
         $html .= PMA_URL_getHiddenInputs();
         $html .= '<input type="hidden" name="db"'
             . ' value="' . htmlspecialchars($db) . '" />';

From 981fc9f1656e297f974b4ffb49660d7b6d8ed019 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 12:57:29 +0530
Subject: [PATCH 15/29] Match teardown selector with register selector

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/functions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/functions.js b/js/functions.js
index b5b5397cd6..586dc9cc14 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -3733,7 +3733,7 @@ AJAX.registerOnload('functions.js', function () {
 AJAX.registerTeardown('functions.js', function () {
     $('.vpointer').die('hover');
     $('.vmarker').die('click');
-    $('#pageselector').die('change');
+    $('select.pageselector').die('change');
     $('a.formLinkSubmit').die('click');
     $('#update_recent_tables').unbind('ready');
     $('#sync_favorite_tables').unbind('ready');

From be9a32413819c3fd21f5f6d058ddbf2ad62daba3 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 12:58:52 +0530
Subject: [PATCH 16/29] This is redundant

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/sql.js | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index 75f51aa391..f7a71e56ae 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -94,7 +94,6 @@ AJAX.registerTeardown('sql.js', function () {
     $("input[name=bookmark_variable]").unbind("keypress");
     $("#sqlqueryform.ajax").die('submit');
     $("input[name=navig].ajax").die('click');
-    $("#pageselector").die('change');
     $(".displayOptionsForm.ajax").die('submit');
     $('th.column_heading.pointer').die('hover');
     $('th.column_heading.marker').die('click');
@@ -378,16 +377,6 @@ AJAX.registerOnload('sql.js', function () {
         }); // end $.post()
     }); // end SQL Query submit
 
-    /**
-     * Paginate results with Page Selector dropdown
-     * @memberOf    jQuery
-     * @name        paginate_dropdown_change
-     */
-    $("#pageselector").live('change', function (event) {
-        var $form = $(this).parent("form");
-        $form.submit();
-    }); // end Paginate results with Page Selector
-
     /**
      * Ajax Event handler for the display options
      * @memberOf    jQuery

From f5a943e8a14019b87e56bc2d673d766bc1841220 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 13:43:30 +0530
Subject: [PATCH 17/29] Use class attribute to identify correct sql query

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/makegrid.js           | 13 +++++++------
 libraries/Util.class.php |  2 +-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index 1863aa2026..5154478567 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1301,15 +1301,16 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                                 var tools = $result_query.find('.tools').wrap('<p>').parent().html();
                                 // sqlOuter and tools will not be present if 'Show SQL queries' configuration is off
                                 if (typeof sqlOuter != 'undefined' && typeof tools != 'undefined') {
+                                    $existing_query = $(t).find('.result_query');
                                     // If two query box exists update query in second else add a second box
-                                    if ($('#result_query').find('div.sqlOuter').length > 1) {
-                                        $('#result_query').children(":nth-child(4)").remove();
-                                        $('#result_query').children(":nth-child(4)").remove();
-                                        $('#result_query').append(sqlOuter + tools);
+                                    if ($existing_query.find('div.sqlOuter').length > 1) {
+                                        $existing_query.children(":nth-child(4)").remove();
+                                        $existing_query.children(":nth-child(4)").remove();
+                                        $existing_query.append(sqlOuter + tools);
                                     } else {
-                                        $('#result_query').append(sqlOuter + tools);
+                                        $existing_query.append(sqlOuter + tools);
                                     }
-                                    PMA_highlightSQL($('#result_query'));
+                                    PMA_highlightSQL($existing_query);
                                 }
                             }
                             // hide and/or update the successfully saved cells
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index c06d7755da..6f367ae451 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -1019,7 +1019,7 @@ class PMA_Util
 
         // In an Ajax request, $GLOBALS['cell_align_left'] may not be defined. Hence,
         // check for it's presence before using it
-        $retval .= '<div id="result_query"'
+        $retval .= '<div id="result_query" class="result_query"'
             . ( isset($GLOBALS['cell_align_left'])
                 ? ' style="text-align: ' . $GLOBALS['cell_align_left'] . '"'
                 : '' )

From 501a4c9c1ffe0bc71a1e3ed1d04f571b3946eecb Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 13:44:30 +0530
Subject: [PATCH 18/29] Use sqlqueryresultsouter to show USE or DROP query

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/sql.js | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index f7a71e56ae..99c1988563 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -344,15 +344,10 @@ AJAX.registerOnload('sql.js', function () {
                         url = 'server_sql.php';
                     }
                     PMA_commonActions.refreshMain(url, function () {
-                        if ($('#result_query').length) {
-                            $('#result_query').remove();
-                        }
-                        if (data.sql_query) {
-                            $('<div id="result_query"></div>')
-                                .html(data.sql_query)
-                                .prependTo('#page_content');
-                            PMA_highlightSQL($('#page_content'));
-                        }
+                        $('#sqlqueryresultsouter')
+                            .show()
+                            .html(data.message);
+                        PMA_highlightSQL($('#sqlqueryresultsouter'));
                     });
                 }
 

From 698813db3da8b83c05771c32ae12c6f8c2662e7c Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 15:32:46 +0530
Subject: [PATCH 19/29] Cleanup makegrid.js and do scoped selections

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/makegrid.js | 63 ++++++++++++++++++++++++++------------------------
 1 file changed, 33 insertions(+), 30 deletions(-)

diff --git a/js/makegrid.js b/js/makegrid.js
index 5154478567..01b1c1281b 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -247,7 +247,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             $(g.cRsz).find('div').hide();
             var $firstRowCols = $(g.t).find('tr:first th.draggable:visible');
             var $resizeHandles = $(g.cRsz).find('div').removeClass('condition');
-            $('table.pma_table').find('thead th:first').removeClass('before-condition');
+            $(g.t).find('table.pma_table').find('thead th:first').removeClass('before-condition');
             for (var n = 0, l = $firstRowCols.length; n < l; n++) {
                 var $col = $($firstRowCols[n]);
                 $($resizeHandles[n]).css('left', $col.position().left + $col.outerWidth(true))
@@ -260,7 +260,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 }
             }
             if ($($resizeHandles[0]).hasClass('condition')) {
-                $('table.pma_table').find('thead th:first').addClass('before-condition');
+                $(g.t).find('thead th:first').addClass('before-condition');
             }
             $(g.cRsz).css('height', $(g.t).height());
         },
@@ -407,9 +407,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             var isOneColumn = g.visibleHeadersCount == 1;
             // enable or disable restore button
             if (isInitial || isOneColumn) {
-                $('div.restore_column').hide();
+                $(g.o).find('div.restore_column').hide();
             } else {
-                $('div.restore_column').show();
+                $(g.o).find('div.restore_column').show();
             }
         },
 
@@ -1064,7 +1064,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             /**
              * @var relational_display string 'K' if relational key, 'D' if relational display column
              */
-            var relational_display = $(t).find("input[name=relational_display]:checked").val();
+            var relational_display = $(g.o).find("input[name=relational_display]:checked").val();
             /**
              * @var transform_fields    Array containing the name/value pairs for transformed fields
              */
@@ -1092,7 +1092,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             /**
              * @var is_unique   Boolean, whether the rows in this table is unique or not
              */
-            var is_unique = $('td.edit_row_anchor').is('.nonunique') ? 0 : 1;
+            var is_unique = $(g.t).find('td.edit_row_anchor').is('.nonunique') ? 0 : 1;
             /**
              * multi edit variables
              */
@@ -1107,7 +1107,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             }
 
             // loop each edited row
-            $('td.to_be_saved').parents('tr').each(function () {
+            $(g.t).find('td.to_be_saved').parents('tr').each(function () {
                 var $tr = $(this);
                 var where_clause = $tr.find('.where_clause').val();
                 if (typeof where_clause === 'undefined') {
@@ -1136,7 +1136,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                      * @var field_name  String containing the name of this field.
                      * @see getFieldName()
                      */
-                    var field_name = getFieldName($(t), $this_field);
+                    var field_name = getFieldName($(g.t), $this_field);
 
                     /**
                      * @var this_field_params   Array temporary storage for the name/value of current field
@@ -1240,7 +1240,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 $(g.cEdit).find('*').prop('disabled', true);
                 $(g.cEdit).find('.edit_box').addClass('edit_box_posting');
             } else {
-                $('div.save_edited').addClass('saving_edited_data')
+                $(g.o).find('div.save_edited').addClass('saving_edited_data')
                     .find('input').prop('disabled', true);    // disable the save button
             }
 
@@ -1255,14 +1255,14 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                             $(g.cEdit).find('*').removeProp('disabled');
                             $(g.cEdit).find('.edit_box').removeClass('edit_box_posting');
                         } else {
-                            $('div.save_edited').removeClass('saving_edited_data')
+                            $(g.o).find('div.save_edited').removeClass('saving_edited_data')
                                 .find('input').removeProp('disabled');  // enable the save button back
                         }
                         if (typeof data !== 'undefined' && data.success === true) {
                             PMA_ajaxShowMessage(data.message);
 
                             // update where_clause related data in each edited row
-                            $('td.to_be_saved').parents('tr').each(function () {
+                            $(g.t).find('td.to_be_saved').parents('tr').each(function () {
                                 var new_clause = $(this).data('new_clause');
                                 var $where_clause = $(this).find('.where_clause');
                                 var old_clause = $where_clause.val();
@@ -1301,7 +1301,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                                 var tools = $result_query.find('.tools').wrap('<p>').parent().html();
                                 // sqlOuter and tools will not be present if 'Show SQL queries' configuration is off
                                 if (typeof sqlOuter != 'undefined' && typeof tools != 'undefined') {
-                                    $existing_query = $(t).find('.result_query');
+                                    $existing_query = $(g.o).find('.result_query');
                                     // If two query box exists update query in second else add a second box
                                     if ($existing_query.find('div.sqlOuter').length > 1) {
                                         $existing_query.children(":nth-child(4)").remove();
@@ -1317,7 +1317,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                             g.hideEditCell(true, data);
 
                             // remove the "Save edited cells" button
-                            $('div.save_edited').hide();
+                            $(g.o).find('div.save_edited').hide();
                             // update saved fields
                             $(g.t).find('.to_be_saved')
                                 .removeClass('to_be_saved')
@@ -1352,7 +1352,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
              * @var field_name  String containing the name of this field.
              * @see getFieldName()
              */
-            var field_name = getFieldName($(t), $this_field);
+            var field_name = getFieldName($(g.t), $this_field);
 
             /**
              * @var this_field_params   Array temporary storage for the name/value of current field
@@ -1406,7 +1406,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 $(g.currentEditCell).addClass('to_be_saved')
                     .data('value', this_field_params[field_name]);
                 if (g.saveCellsAtOnce) {
-                    $('div.save_edited').show();
+                    $(g.o).find('div.save_edited').show();
                 }
                 g.isCellEdited = true;
             }
@@ -1482,7 +1482,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             var $firstRowCols = $(g.t).find('tr:first th.draggable');
 
             // initialize column order
-            $col_order = $(t).find('.col_order');   // check if column order is passed from PHP
+            $col_order = $(g.o).find('.col_order');   // check if column order is passed from PHP
             if ($col_order.length > 0) {
                 g.colOrder = $col_order.val().split(',');
                 for (var i = 0; i < g.colOrder.length; i++) {
@@ -1496,9 +1496,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             }
 
             // register events
-            $(t).find('th.draggable')
+            $(g.t).find('th.draggable')
                 .mousedown(function (e) {
-                    $('#sqlqueryresults').addClass("turnOffSelect");
+                    $(g.o).addClass("turnOffSelect");
                     if (g.visibleHeadersCount > 1) {
                         g.dragStartReorder(e, this);
                     }
@@ -1533,12 +1533,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     })
                     .find("input").focus().select();
                 });
-            $(t).find('th.draggable a')
+            $(g.t).find('th.draggable a')
                 .dblclick(function (e) {
                     e.stopPropagation();
                 });
             // restore column order when the restore button is clicked
-            $('div.restore_column').click(function () {
+            $(g.o).find('div.restore_column').click(function () {
                 g.restoreColOrder();
             });
 
@@ -1547,7 +1547,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             $(g.gDiv).append(g.cCpy);
 
             // prevent default "dragstart" event when dragging a link
-            $(t).find('th a').bind('dragstart', function () {
+            $(g.t).find('th a').bind('dragstart', function () {
                 return false;
             });
 
@@ -1576,7 +1576,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             var $firstRowCols = $(g.t).find('tr:first th.draggable');
 
             // initialize column visibility
-            var $col_visib = $(t).find('.col_visib');   // check if column visibility is passed from PHP
+            var $col_visib = $(g.o).find('.col_visib');   // check if column visibility is passed from PHP
             if ($col_visib.length > 0) {
                 g.colVisib = $col_visib.val().split(',');
                 for (var i = 0; i < g.colVisib.length; i++) {
@@ -1652,7 +1652,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             }
 
             // hide column visibility list if we move outside the list
-            $(t).find('td, th.draggable').mouseenter(function () {
+            $(g.t).find('td, th.draggable').mouseenter(function () {
                 g.hideColList();
             });
 
@@ -1701,11 +1701,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             g.showDataRowLinkText = PMA_messages.strShowDataRowLink;
 
             // initialize cell editing configuration
-            g.saveCellsAtOnce = $(t).find('.save_cells_at_once').val();
+            g.saveCellsAtOnce = $(g.o).find('.save_cells_at_once').val();
             g.maxTruncatedLen = PMA_commonParams.get('LimitChars');
 
             // register events
-            $(t).find('td.data.click1')
+            $(g.t).find('td.data.click1')
                 .click(function (e) {
                     startGridEditing(e, this);
                     // prevent default action when clicking on "link" in a table
@@ -1714,7 +1714,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     }
                 });
 
-            $(t).find('td.data.click2')
+            $(g.t).find('td.data.click2')
                 .click(function (e) {
                     $cell = $(this);
                     // In the case of relational link, We want single click on the link
@@ -1804,7 +1804,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                     g.hideEditCell(true);
                 }
             });
-            $('div.save_edited').click(function () {
+            $(g.o).find('div.save_edited').click(function () {
                 g.hideEditCell();
                 g.postEditedCell();
             });
@@ -1843,6 +1843,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
     // initialize the table variable
     g.t = t;
 
+    // enclosing #sqlqueryresults div
+    g.o = $(t).parents('#sqlqueryresults');
+
     // get data columns in the first row of the table
     var $firstRowCols = $(t).find('tr:first th.draggable');
 
@@ -1867,7 +1870,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
     g.copyHint = PMA_messages.strColNameCopyHint;
 
     // assign common hidden inputs
-    var $common_hidden_inputs = $('div.common_hidden_inputs');
+    var $common_hidden_inputs = $(g.o).find('div.common_hidden_inputs');
     g.token = $common_hidden_inputs.find('input[name=token]').val();
     g.server = $common_hidden_inputs.find('input[name=server]').val();
     g.db = $common_hidden_inputs.find('input[name=db]').val();
@@ -1892,7 +1895,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
         g.initColResize();
     }
     if (enableReorder &&
-        $('table.navigation').length > 0)    // disable reordering for result from EXPLAIN or SHOW syntax, which do not have a table navigation panel
+        $(g.o).find('table.navigation').length > 0)    // disable reordering for result from EXPLAIN or SHOW syntax, which do not have a table navigation panel
     {
         g.initColReorder();
     }
@@ -1935,7 +1938,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             g.dragMove(e);
         });
         $(document).mouseup(function (e) {
-            $('#sqlqueryresults').removeClass("turnOffSelect");
+            $(g.o).removeClass("turnOffSelect");
             g.dragEnd(e);
         });
     }

From 4476dbfee08aceaef03417e985fea9bb806704da Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Nov 2014 16:03:01 +0530
Subject: [PATCH 20/29] Use a unique number to distinguish multiple result sets

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/DisplayResults.class.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index dc0364b3c1..86073725c5 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -158,7 +158,10 @@ class PMA_DisplayResults
         'mime_map' => null,
 
         /** boolean */
-        'editable' => null
+        'editable' => null,
+
+        /** random unique ID to distinguish result set */
+        'unique_id' => null
     );
 
     /**
@@ -219,6 +222,7 @@ class PMA_DisplayResults
         $this->__set('table', $table);
         $this->__set('goto', $goto);
         $this->__set('sql_query', $sql_query);
+        $this->__set('unique_id', rand());
     }
 
     /**
@@ -1773,7 +1777,8 @@ class PMA_DisplayResults
         if (($del_lnk == self::DELETE_ROW) || ($del_lnk == self::KILL_PROCESS)) {
 
             $form_html .= '<form method="post" action="tbl_row_action.php" '
-                . 'name="resultsForm" id="resultsForm"';
+                . 'name="resultsForm"'
+                . ' id="resultsForm_' . $this->__get('unique_id'). '"';
 
             $form_html .= ' class="ajax" ';
 
@@ -5083,9 +5088,11 @@ class PMA_DisplayResults
                 . ' alt="' . __('With selected:') . '" />';
         }
 
-        $links_html .= '<input type="checkbox" id="resultsForm_checkall" '
+        $links_html .= '<input type="checkbox" '
+            . 'id="resultsForm_' . $this->__get('unique_id') . '_checkall" '
             . 'class="checkall_box" title="' . __('Check All') . '" /> '
-            . '<label for="resultsForm_checkall">' . __('Check All') . '</label> '
+            . '<label for="resultsForm_' . $this->__get('unique_id') . '_checkall">'
+            . __('Check All') . '</label> '
             . '<i style="margin-left: 2em">' . __('With selected:') . '</i>' . "\n";
 
         $links_html .= PMA_Util::getButtonOrImage(

From 4cf4e41decb400b41dc3aa57a67eb5d48bef3c41 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 1 Dec 2014 08:27:10 +0530
Subject: [PATCH 21/29] Table filtering for multiquery

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 db_sql.php                         |  1 +
 js/sql.js                          |  5 +++--
 libraries/DisplayResults.class.php | 12 +++++++-----
 server_sql.php                     |  1 +
 tbl_sql.php                        |  1 +
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/db_sql.php b/db_sql.php
index 67bbbb59d6..987dbaff5f 100644
--- a/db_sql.php
+++ b/db_sql.php
@@ -19,6 +19,7 @@ $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('functions.js');
 $scripts->addFile('makegrid.js');
+$scripts->addFile('jquery/jquery.uitablefilter.js');
 $scripts->addFile('sql.js');
 
 require 'libraries/db_common.inc.php';
diff --git a/js/sql.js b/js/sql.js
index 99c1988563..b29982a323 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -392,7 +392,8 @@ AJAX.registerOnload('sql.js', function () {
 
     // Filter row handling. --STARTS--
     $(".filter_rows").live("keyup", function () {
-        var $target_table = $("#table_results");
+        var unique_id = $(this).data("for");
+        var $target_table = $("#table_results[data-uniqueId='" + unique_id + "']");
         var $header_cells = $target_table.find("th[data-column]");
         var target_columns = Array();
         // To handle colspan=4, in case of edit,copy etc options.
@@ -406,7 +407,7 @@ AJAX.registerOnload('sql.js', function () {
 
         var phrase = $(this).val();
         // Set same value to both Filter rows fields.
-        $(".filter_rows").val(phrase);
+        $(".filter_rows[data-for='" + unique_id + "']").val(phrase);
         // Handle colspan.
         $target_table.find("thead > tr").prepend(dummy_th);
         $.uiTableFilter($target_table, phrase, target_columns);
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 86073725c5..4c76f26e20 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -800,8 +800,9 @@ class PMA_DisplayResults
             . '<td class="navigation_separator"></td>'
             . '<td>'
             . '<span>' . __('Filter rows') . ':</span>'
-            . '<input type="text" class="filter_rows" placeholder="'
-            . __('Search this table') . '">'
+            . '<input type="text" class="filter_rows"'
+            . ' placeholder="' . __('Search this table') . '"'
+            . ' data-for="' . $this->__get('unique_id') . '" />'
             . '</td>'
             . '<td class="navigation_separator"></td>'
             . '</tr>'
@@ -1789,9 +1790,10 @@ class PMA_DisplayResults
                 . '<input type="hidden" name="goto" value="sql.php" />';
         }
 
-        $form_html .= '<table id="table_results" class="table_results data';
-        $form_html .= ' ajax';
-        $form_html .= '">';
+        $form_html .= '<table id="table_results"';
+        $form_html .= ' class="table_results data ajax"';
+        $form_html .= ' data-uniqueId="' . $this->__get('unique_id') . '"';
+        $form_html .= '>';
 
         return $form_html;
 
diff --git a/server_sql.php b/server_sql.php
index 1d505e4305..953e17587d 100644
--- a/server_sql.php
+++ b/server_sql.php
@@ -18,6 +18,7 @@ $response = PMA_Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('makegrid.js');
+$scripts->addFile('jquery/jquery.uitablefilter.js');
 $scripts->addFile('sql.js');
 
 require_once 'libraries/server_common.inc.php';
diff --git a/tbl_sql.php b/tbl_sql.php
index 0035840199..92c980d4d8 100644
--- a/tbl_sql.php
+++ b/tbl_sql.php
@@ -18,6 +18,7 @@ $response = PMA_Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
 $scripts->addFile('makegrid.js');
+$scripts->addFile('jquery/jquery.uitablefilter.js');
 $scripts->addFile('sql.js');
 
 require 'libraries/tbl_common.inc.php';

From b8e13f5b7a2cd03a2ea8950f556ee11228908b60 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 1 Dec 2014 08:44:07 +0530
Subject: [PATCH 22/29] Distinguish between options of each result set

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/DisplayResults.class.php | 15 +++++++++------
 libraries/Util.class.php           | 10 ++++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 4c76f26e20..f7e683e714 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1642,7 +1642,8 @@ class PMA_DisplayResults
         // pftext means "partial or full texts" (done to reduce line lengths)
         $options_html .= PMA_Util::getRadioFields(
             'pftext', $choices,
-            $_SESSION['tmpval']['pftext']
+            $_SESSION['tmpval']['pftext'],
+            true, true, '', 'pftext_' . $this->__get('unique_id')
         )
         . '</div>';
 
@@ -1657,7 +1658,8 @@ class PMA_DisplayResults
 
             $options_html .= PMA_Util::getRadioFields(
                 'relational_display', $choices,
-                $_SESSION['tmpval']['relational_display']
+                $_SESSION['tmpval']['relational_display'],
+                true, true, '', 'relational_display_' . $this->__get('unique_id')
             )
             . '</div>';
         }
@@ -1666,13 +1668,13 @@ class PMA_DisplayResults
             . PMA_Util::getCheckbox(
                 'display_binary', __('Show binary contents'),
                 ! empty($_SESSION['tmpval']['display_binary']), false,
-                'display_binary'
+                'display_binary_' . $this->__get('unique_id')
             )
             . '<br />'
             . PMA_Util::getCheckbox(
                 'display_blob', __('Show BLOB contents'),
                 ! empty($_SESSION['tmpval']['display_blob']), false,
-                'display_blob'
+                'display_blob_' . $this->__get('unique_id')
             )
             . '</div>';
 
@@ -1684,7 +1686,7 @@ class PMA_DisplayResults
             . PMA_Util::getCheckbox(
                 'hide_transformation', __('Hide browser transformation'),
                 ! empty($_SESSION['tmpval']['hide_transformation']), false,
-                'hide_transformation'
+                'hide_transformation_' . $this->__get('unique_id')
             )
             . '</div>';
 
@@ -1698,7 +1700,8 @@ class PMA_DisplayResults
 
             $options_html .= PMA_Util::getRadioFields(
                 'geoOption', $choices,
-                $_SESSION['tmpval']['geoOption']
+                $_SESSION['tmpval']['geoOption'],
+                true, true, '', 'geoOption_' . $this->__get('unique_id')
             )
                 . '</div>';
         }
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index 6f367ae451..c1989b6989 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -2629,12 +2629,15 @@ class PMA_Util
      * @param boolean $line_break      whether to add HTML line break after a choice
      * @param boolean $escape_label    whether to use htmlspecialchars() on label
      * @param string  $class           enclose each choice with a div of this class
+     * @param string  $id_prefix       prefix for the id attribute, name will be
+     *                                 used if this is not supplied
      *
      * @return string                  set of html radio fiels
      */
     public static function getRadioFields(
         $html_field_name, $choices, $checked_choice = '',
-        $line_break = true, $escape_label = true, $class = ''
+        $line_break = true, $escape_label = true, $class = '',
+        $id_prefix = ''
     ) {
         $radio_html = '';
 
@@ -2644,7 +2647,10 @@ class PMA_Util
                 $radio_html .= '<div class="' . $class . '">';
             }
 
-            $html_field_id = $html_field_name . '_' . $choice_value;
+            if (! $id_prefix) {
+                $id_prefix = $html_field_name;
+            }
+            $html_field_id = $id_prefix . '_' . $choice_value;
             $radio_html .= '<input type="radio" name="' . $html_field_name . '" id="'
                         . $html_field_id . '" value="'
                         . htmlspecialchars($choice_value) . '"';

From 84618096a2574bcdee2fbbecd18769bf3e3a8a6a Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 1 Dec 2014 08:58:29 +0530
Subject: [PATCH 23/29] Distinguish between show all checkbox of multiple
 result sets

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/DisplayResults.class.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index d83f6100da..aa509888c5 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -866,9 +866,11 @@ class PMA_DisplayResults
             . (! $showing_all ? 'all' : $GLOBALS['cfg']['MaxRows']) . '" />'
             . '<input type="hidden" name="goto" value="' . $this->__get('goto')
             . '" />'
-            . '<input type="checkbox" name="navig" id="navig" class="showAllRows"'
+            . '<input type="checkbox" name="navig"'
+            . ' id="showAll_' . $this->__get('unique_id') . '" class="showAllRows"'
             . (! $showing_all ? '' : ' checked="checked"') . ' value="all" />'
-            . '<label for="navig">' . __('Show all') . '</label>'
+            . '<label for="showAll_' . $this->__get('unique_id') . '" >'
+            . __('Show all') . '</label>'
             . '</form>'
             . '</td>';
     } // end of the '_getShowAllButtonForTableNavigation()' function

From b1fd49ee6b9b313ebdc8145892ebbadcc4d6bffe Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 1 Dec 2014 09:04:32 +0530
Subject: [PATCH 24/29] Fix typo

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/Util.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index c1989b6989..ad96c72be2 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -2616,7 +2616,7 @@ class PMA_Util
             . ($html_field_id ? ' id="' . $html_field_id . '"' : '')
             . ($checked ? ' checked="checked"' : '')
             . ($onclick ? ' class="autosubmit"' : '') . ' />'
-            . '<label' . ($html_field_id ? ' for="' . $html_field_name . '"' : '')
+            . '<label' . ($html_field_id ? ' for="' . $html_field_id . '"' : '')
             . '>' . $label . '</label>';
     }
 

From 65794575a006a6e898be526591745b87d2f492cc Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 1 Dec 2014 10:07:28 +0530
Subject: [PATCH 25/29] Update tests

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/DisplayResults.class.php       |  2 +-
 test/classes/PMA_DisplayResults_test.php | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index aa509888c5..91e02e2435 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -869,7 +869,7 @@ class PMA_DisplayResults
             . '<input type="checkbox" name="navig"'
             . ' id="showAll_' . $this->__get('unique_id') . '" class="showAllRows"'
             . (! $showing_all ? '' : ' checked="checked"') . ' value="all" />'
-            . '<label for="showAll_' . $this->__get('unique_id') . '" >'
+            . '<label for="showAll_' . $this->__get('unique_id') . '">'
             . __('Show all') . '</label>'
             . '</form>'
             . '</td>';
diff --git a/test/classes/PMA_DisplayResults_test.php b/test/classes/PMA_DisplayResults_test.php
index c169090065..ac85b23289 100644
--- a/test/classes/PMA_DisplayResults_test.php
+++ b/test/classes/PMA_DisplayResults_test.php
@@ -1608,6 +1608,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 'mysql',
                 'user',
                 'tbl_structure.php',
+                0,
                 'SELECT * FROM `user`',
                 "\n"
                 . '<td><form action="sql.php" method="post">'
@@ -1619,8 +1620,9 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
                 . '<input type="hidden" name="pos" value="0" />'
                 . '<input type="hidden" name="session_max_rows" value="all" />'
                 . '<input type="hidden" name="goto" value="tbl_structure.php" />'
-                . '<input type="checkbox" name="navig" id="navig" class="showAllRows" value="all" />'
-                . '<label for="navig">Show all</label></form></td>'
+                . '<input type="checkbox" name="navig" id="showAll_0"'
+                . ' class="showAllRows" value="all" />'
+                . '<label for="showAll_0">Show all</label></form></td>'
             )
         );
     }
@@ -1632,6 +1634,7 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
      * @param string $db             the database name
      * @param string $table          the table name
      * @param string $goto           the URL to go back in case of errors
+     * @param int    $unique_id      the unique id for the results set
      * @param string $html_sql_query the sql encoded by html special characters
      * @param string $output         output of _getRowInfoForSpecialLinks
      *
@@ -1640,11 +1643,12 @@ class PMA_DisplayResults_Test extends PHPUnit_Framework_TestCase
      * @dataProvider dataProviderForTestGetShowAllCheckboxForTableNavigation
      */
     public function testGetShowAllCheckboxForTableNavigation(
-        $db, $table, $goto, $html_sql_query, $output
+        $db, $table, $goto, $unique_id , $html_sql_query, $output
     ) {
         $this->object->__set('db', $db);
         $this->object->__set('table', $table);
         $this->object->__set('goto', $goto);
+        $this->object->__set('unique_id', $unique_id);
 
         $this->assertEquals(
             $output,

From a362667e3c7e322b595f2106cb1538bd31f8b0d0 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 1 Dec 2014 10:44:36 +0530
Subject: [PATCH 26/29] Use class attribute instead of id for sqlqueryresults

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/functions.js       | 26 +++++++++++++-------------
 js/makegrid.js        |  4 ++--
 js/normalization.js   |  2 +-
 js/sql.js             | 25 +++++++++++++++----------
 js/tbl_select.js      |  2 +-
 js/tbl_structure.js   |  4 ++--
 libraries/sql.lib.php |  2 +-
 7 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index 586dc9cc14..565286c3a9 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2698,8 +2698,8 @@ AJAX.registerOnload('functions.js', function () {
     **/
     $("#tbl_maintenance li a.maintain_action.ajax").live('click', function (event) {
         event.preventDefault();
-        if ($("#sqlqueryresults").length !== 0) {
-            $("#sqlqueryresults").remove();
+        if ($(".sqlqueryresults").length !== 0) {
+            $(".sqlqueryresults").remove();
         }
         if ($("#result_query").length !== 0) {
             $("#result_query").remove();
@@ -2712,8 +2712,8 @@ AJAX.registerOnload('functions.js', function () {
             var $temp_div;
             if (typeof data !== 'undefined' && data.success === true && data.sql_query !== undefined) {
                 PMA_ajaxShowMessage(data.message);
-                $("<div id='sqlqueryresults' class='ajax'></div>").prependTo("#page_content");
-                $("#sqlqueryresults").html(data.sql_query);
+                $("<div class='sqlqueryresults ajax'></div>").prependTo("#page_content");
+                $(".sqlqueryresults").html(data.sql_query);
                 PMA_highlightSQL($('#page_content'));
                 scrollToTop();
             } else if (typeof data !== 'undefined' && data.success === true) {
@@ -2721,11 +2721,11 @@ AJAX.registerOnload('functions.js', function () {
                 $temp_div.html(data.message);
                 var $success = $temp_div.find("#result_query .success");
                 PMA_ajaxShowMessage($success);
-                $("<div id='sqlqueryresults' class='ajax'></div>").prependTo("#page_content");
-                $("#sqlqueryresults").html(data.message);
+                $("<div class='sqlqueryresults ajax'></div>").prependTo("#page_content");
+                $(".sqlqueryresults").html(data.message);
                 PMA_highlightSQL($('#page_content'));
                 PMA_init_slider();
-                $("#sqlqueryresults").children("fieldset,br").remove();
+                $(".sqlqueryresults").children("fieldset,br").remove();
                 scrollToTop();
             } else {
                 $temp_div = $("<div id='temp_div'></div>");
@@ -3411,8 +3411,8 @@ function indexEditorDialog(url, title, callback_success, callback_failure)
         PMA_prepareForAjaxRequest($form);
         //User wants to submit the form
         $.post($form.attr('action'), $form.serialize() + "&do_save_data=1", function (data) {
-            if ($("#sqlqueryresults").length !== 0) {
-                $("#sqlqueryresults").remove();
+            if ($(".sqlqueryresults").length !== 0) {
+                $(".sqlqueryresults").remove();
             }
             if (typeof data !== 'undefined' && data.success === true) {
                 PMA_ajaxShowMessage(data.message);
@@ -4098,16 +4098,16 @@ AJAX.registerOnload('functions.js', function () {
         $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
             PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
             $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) {
-                if ($("#sqlqueryresults").length !== 0) {
-                    $("#sqlqueryresults").remove();
+                if ($(".sqlqueryresults").length !== 0) {
+                    $(".sqlqueryresults").remove();
                 }
                 if ($("#result_query").length !== 0) {
                     $("#result_query").remove();
                 }
                 if (typeof data !== 'undefined' && data.success === true) {
                     PMA_ajaxShowMessage(data.message);
-                    $("<div id='sqlqueryresults'></div>").prependTo("#page_content");
-                    $("#sqlqueryresults").html(data.sql_query);
+                    $("<div class='sqlqueryresults ajax'></div>").prependTo("#page_content");
+                    $(".sqlqueryresults").html(data.sql_query);
                     PMA_highlightSQL($('#page_content'));
                 } else {
                     PMA_ajaxShowMessage(data.error, false);
diff --git a/js/makegrid.js b/js/makegrid.js
index 01b1c1281b..dfd05ad283 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1843,8 +1843,8 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
     // initialize the table variable
     g.t = t;
 
-    // enclosing #sqlqueryresults div
-    g.o = $(t).parents('#sqlqueryresults');
+    // enclosing .sqlqueryresults div
+    g.o = $(t).parents('.sqlqueryresults');
 
     // get data columns in the first row of the table
     var $firstRowCols = $(t).find('tr:first th.draggable');
diff --git a/js/normalization.js b/js/normalization.js
index d30b4232d4..ba6a083dd9 100644
--- a/js/normalization.js
+++ b/js/normalization.js
@@ -653,7 +653,7 @@ AJAX.registerOnload('normalization.js', function() {
         var title = PMA_messages.strAddPrimaryKey;
         indexEditorDialog(url, title, function(){
             //on success
-            $("#sqlqueryresults").remove();
+            $(".sqlqueryresults").remove();
             $('#result_query').remove();
             $('.tblFooters').html('');
             goToStep2('goToStep3');
diff --git a/js/sql.js b/js/sql.js
index b29982a323..01109e5f46 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -87,14 +87,14 @@ AJAX.registerTeardown('sql.js', function () {
     $('a.delete_row.ajax').die('click');
     $('.bookmarkQueryForm').die('submit');
     $('input#bkm_label').unbind('keyup');
-    $("#sqlqueryresults").die('makegrid');
-    $("#sqlqueryresults").die('stickycolumns');
+    $(".sqlqueryresults").die('makegrid');
+    $(".sqlqueryresults").die('stickycolumns');
     $("#togglequerybox").unbind('click');
     $("#button_submit_query").die('click');
     $("input[name=bookmark_variable]").unbind("keypress");
     $("#sqlqueryform.ajax").die('submit');
     $("input[name=navig].ajax").die('click');
-    $(".displayOptionsForm.ajax").die('submit');
+    $("form[name='displayOptionsForm'].ajax").die('submit');
     $('th.column_heading.pointer').die('hover');
     $('th.column_heading.marker').die('click');
     $(window).unbind('scroll');
@@ -166,7 +166,7 @@ AJAX.registerOnload('sql.js', function () {
      * triggered manually everytime the table of results is reloaded
      * @memberOf    jQuery
      */
-    $("#sqlqueryresults").live('makegrid', function () {
+    $(".sqlqueryresults").live('makegrid', function () {
         $('.table_results').each(function () {
             PMA_makegrid(this);
         });
@@ -177,7 +177,7 @@ AJAX.registerOnload('sql.js', function () {
      * triggered manually everytime the table of results is reloaded
      * @memberOf    jQuery
      */
-    $("#sqlqueryresults").live('stickycolumns', function () {
+    $(".sqlqueryresults").live('stickycolumns', function () {
         $(".sticky_columns").remove();
         $(".table_results").each(function () {
             var $table_results = $(this);
@@ -351,7 +351,7 @@ AJAX.registerOnload('sql.js', function () {
                     });
                 }
 
-                $('#sqlqueryresults').trigger('makegrid').trigger('stickycolumns');
+                $('.sqlqueryresults').trigger('makegrid').trigger('stickycolumns');
                 $('#togglequerybox').show();
                 PMA_init_slider();
 
@@ -377,16 +377,21 @@ AJAX.registerOnload('sql.js', function () {
      * @memberOf    jQuery
      * @name        displayOptionsForm_submit
      */
-    $(".displayOptionsForm.ajax").live('submit', function (event) {
+    $("form[name='displayOptionsForm'].ajax").live('submit', function (event) {
         event.preventDefault();
 
         $form = $(this);
 
+        var $msgbox = PMA_ajaxShowMessage();
         $.post($form.attr('action'), $form.serialize() + '&ajax_request=true', function (data) {
-            $("#sqlqueryresults")
+            PMA_ajaxRemoveMessage($msgbox);
+            var $sqlqueryresults = $form.parents(".sqlqueryresults")
+            $sqlqueryresults
              .html(data.message)
-             .trigger('makegrid');
+             .trigger('makegrid')
+             .trigger('stickycolumns');
             PMA_init_slider();
+            PMA_highlightSQL($sqlqueryresults);
         }); // end $.post()
     }); //end displayOptionsForm handler
 
@@ -650,7 +655,7 @@ AJAX.registerOnload('sql.js', function () {
     /**
      * create resizable table
      */
-    $("#sqlqueryresults").trigger('makegrid').trigger('stickycolumns');
+    $(".sqlqueryresults").trigger('makegrid').trigger('stickycolumns');
 });
 
 /*
diff --git a/js/tbl_select.js b/js/tbl_select.js
index 9909dba9bf..1601074c5b 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -145,7 +145,7 @@ AJAX.registerOnload('tbl_select.js', function () {
                     $("#sqlqueryresultsouter").html(data.sql_query);
                 } else { // results found
                     $("#sqlqueryresultsouter").html(data.message);
-                    $("#sqlqueryresults").trigger('makegrid').trigger('stickycolumns');
+                    $(".sqlqueryresults").trigger('makegrid').trigger('stickycolumns');
                 }
                 $('#tbl_search_form')
                 // workaround for bug #3168569 - Issue on toggling the "Hide search criteria" in chrome.
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 428ebbc0e7..759561319c 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -110,8 +110,8 @@ AJAX.registerOnload('tbl_structure.js', function () {
             //User wants to submit the form
             $msg = PMA_ajaxShowMessage();
             $.post($form.attr('action'), $form.serialize() + '&do_save_data=1', function (data) {
-                if ($("#sqlqueryresults").length !== 0) {
-                    $("#sqlqueryresults").remove();
+                if ($(".sqlqueryresults").length !== 0) {
+                    $(".sqlqueryresults").remove();
                 } else if ($(".error:not(.tab)").length !== 0) {
                     $(".error:not(.tab)").remove();
                 }
diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index b24699f5a8..61877c8c48 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -1643,7 +1643,7 @@ function PMA_getHtmlForSqlQueryResults($previous_update_query_html,
     $table_html, $indexes_problems_html, $bookmark_support_html, $print_button_html
 ) {
     //begin the sqlqueryresults div here. container div
-    $html_output = '<div id="sqlqueryresults" class="ajax">';
+    $html_output = '<div class="sqlqueryresults ajax">';
     $html_output .= isset($previous_update_query_html)
         ? $previous_update_query_html : '';
     $html_output .= isset($profiling_chart_html) ? $profiling_chart_html : '';

From f2782eb95783f0e5108b879f327081b69b570b2a Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 1 Dec 2014 15:25:22 +0530
Subject: [PATCH 27/29] Remove table_results ID field

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/sql.js                                     |  2 +-
 libraries/DisplayResults.class.php            |  3 +-
 test/selenium/PmaSeleniumTableBrowseTest.php  | 46 +++++++++----------
 test/selenium/PmaSeleniumTableCreateTest.php  | 18 ++++----
 test/selenium/PmaSeleniumTableInsertTest.php  | 18 ++++----
 .../PmaSeleniumTableOperationsTest.php        |  2 +-
 .../PmaSeleniumTableStructureTest.php         |  2 +-
 test/selenium/PmaSeleniumTrackingTest.php     | 24 +++++-----
 test/selenium/TestBase.php                    | 23 +++++++++-
 themes/pmahomme/css/common.css.php            |  2 +-
 10 files changed, 79 insertions(+), 61 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index 01109e5f46..d0060909f1 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -398,7 +398,7 @@ AJAX.registerOnload('sql.js', function () {
     // Filter row handling. --STARTS--
     $(".filter_rows").live("keyup", function () {
         var unique_id = $(this).data("for");
-        var $target_table = $("#table_results[data-uniqueId='" + unique_id + "']");
+        var $target_table = $(".table_results[data-uniqueId='" + unique_id + "']");
         var $header_cells = $target_table.find("th[data-column]");
         var target_columns = Array();
         // To handle colspan=4, in case of edit,copy etc options.
diff --git a/libraries/DisplayResults.class.php b/libraries/DisplayResults.class.php
index 91e02e2435..c2e74a2a30 100644
--- a/libraries/DisplayResults.class.php
+++ b/libraries/DisplayResults.class.php
@@ -1795,8 +1795,7 @@ class PMA_DisplayResults
                 . '<input type="hidden" name="goto" value="sql.php" />';
         }
 
-        $form_html .= '<table id="table_results"';
-        $form_html .= ' class="table_results data ajax"';
+        $form_html .= '<table class="table_results data ajax"';
         $form_html .= ' data-uniqueId="' . $this->__get('unique_id') . '"';
         $form_html .= '>';
 
diff --git a/test/selenium/PmaSeleniumTableBrowseTest.php b/test/selenium/PmaSeleniumTableBrowseTest.php
index 605a7ae31e..1932a88463 100644
--- a/test/selenium/PmaSeleniumTableBrowseTest.php
+++ b/test/selenium/PmaSeleniumTableBrowseTest.php
@@ -73,17 +73,17 @@ class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "1",
-            $this->getTable('table_results', 1, 5)
+            $this->getCellByTableClass('table_results', 1, 5)
         );
 
         $this->assertEquals(
             "3",
-            $this->getTable('table_results', 2, 5)
+            $this->getCellByTableClass('table_results', 2, 5)
         );
 
         $this->assertEquals(
             "2",
-            $this->getTable('table_results', 3, 5)
+            $this->getCellByTableClass('table_results', 3, 5)
         );
 
         // case 2
@@ -93,17 +93,17 @@ class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "2",
-            $this->getTable('table_results', 1, 5)
+            $this->getCellByTableClass('table_results', 1, 5)
         );
 
         $this->assertEquals(
             "1",
-            $this->getTable('table_results', 2, 5)
+            $this->getCellByTableClass('table_results', 2, 5)
         );
 
         $this->assertEquals(
             "3",
-            $this->getTable('table_results', 3, 5)
+            $this->getCellByTableClass('table_results', 3, 5)
         );
 
         // case 2
@@ -113,17 +113,17 @@ class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "3",
-            $this->getTable('table_results', 1, 5)
+            $this->getCellByTableClass('table_results', 1, 5)
         );
 
         $this->assertEquals(
             "1",
-            $this->getTable('table_results', 2, 5)
+            $this->getCellByTableClass('table_results', 2, 5)
         );
 
         $this->assertEquals(
             "2",
-            $this->getTable('table_results', 3, 5)
+            $this->getCellByTableClass('table_results', 3, 5)
         );
 
         // case 4
@@ -133,17 +133,17 @@ class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "2",
-            $this->getTable('table_results', 1, 5)
+            $this->getCellByTableClass('table_results', 1, 5)
         );
 
         $this->assertEquals(
             "1",
-            $this->getTable('table_results', 2, 5)
+            $this->getCellByTableClass('table_results', 2, 5)
         );
 
         $this->assertEquals(
             "3",
-            $this->getTable('table_results', 3, 5)
+            $this->getCellByTableClass('table_results', 3, 5)
         );
     }
 
@@ -158,7 +158,7 @@ class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
     {
         $this->sleep();
         $this->byCssSelector(
-            "table#table_results tbody tr:nth-child(2) td:nth-child(2) a"
+            "table.table_results tbody tr:nth-child(2) td:nth-child(2) a"
         )->click();
         $this->sleep();
         /* TODO: this occasionally fails, so there is probably something wrong */
@@ -191,12 +191,12 @@ class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "foobar",
-            $this->getTable('table_results', 2, 6)
+            $this->getCellByTableClass('table_results', 2, 6)
         );
 
         $this->assertEquals(
             "2009-01-20 02:00:02",
-            $this->getTable('table_results', 2, 7)
+            $this->getCellByTableClass('table_results', 2, 7)
         );
     }
 
@@ -210,7 +210,7 @@ class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
     public function testChangeRecordsByDoubleClick()
     {
         $element = $this->byCssSelector(
-            "table#table_results tbody tr:nth-child(1) td:nth-child(6)"
+            "table.table_results tbody tr:nth-child(1) td:nth-child(6)"
         );
 
         $this->moveto($element);
@@ -232,7 +232,7 @@ class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "abcde",
-            $this->getTable('table_results', 1, 6)
+            $this->getCellByTableClass('table_results', 1, 6)
         );
     }
 
@@ -246,7 +246,7 @@ class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
     public function testCopyRecords()
     {
         $this->byCssSelector(
-            "table#table_results tbody tr:nth-child(3) td:nth-child(3) a"
+            "table.table_results tbody tr:nth-child(3) td:nth-child(3) a"
         )->click();
 
         /* TODO: this occasionally fails, so there is probably something wrong */
@@ -273,12 +273,12 @@ class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "ABCDEFG",
-            $this->getTable('table_results', 4, 6)
+            $this->getCellByTableClass('table_results', 4, 6)
         );
 
         $this->assertEquals(
             "2012-01-20 02:05:02",
-            $this->getTable('table_results', 4, 7)
+            $this->getCellByTableClass('table_results', 4, 7)
         );
     }
 
@@ -306,12 +306,12 @@ class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "1",
-            $this->getTable('table_results', 1, 5)
+            $this->getCellByTableClass('table_results', 1, 5)
         );
 
         $this->assertEquals(
             "3",
-            $this->getTable('table_results', 2, 5)
+            $this->getCellByTableClass('table_results', 2, 5)
         );
     }
 
@@ -336,7 +336,7 @@ class PMA_SeleniumTableBrowseTest extends PMA_SeleniumBase
 
         $this->assertFalse(
             $this->isElementPresent(
-                "byCssSelector", "table#table_results tbody tr:nth-child(2)"
+                "byCssSelector", "table.table_results tbody tr:nth-child(2)"
             )
         );
 
diff --git a/test/selenium/PmaSeleniumTableCreateTest.php b/test/selenium/PmaSeleniumTableCreateTest.php
index c6cebc7bd4..9d8981bc64 100644
--- a/test/selenium/PmaSeleniumTableCreateTest.php
+++ b/test/selenium/PmaSeleniumTableCreateTest.php
@@ -95,27 +95,27 @@ class PMA_SeleniumTableCreateTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "int(14)",
-            $this->getTable('tablestructure', 1, 4)
+            $this->getCellByTableId('tablestructure', 1, 4)
         );
 
         $this->assertEquals(
             "UNSIGNED",
-            $this->getTable('tablestructure', 1, 6)
+            $this->getCellByTableId('tablestructure', 1, 6)
         );
 
         $this->assertEquals(
             "No",
-            $this->getTable('tablestructure', 1, 7)
+            $this->getCellByTableId('tablestructure', 1, 7)
         );
 
         $this->assertEquals(
             "None",
-            $this->getTable('tablestructure', 1, 8)
+            $this->getCellByTableId('tablestructure', 1, 8)
         );
 
         $this->assertEquals(
             "AUTO_INCREMENT",
-            $this->getTable('tablestructure', 1, 9)
+            $this->getCellByTableId('tablestructure', 1, 9)
         );
 
         $this->assertFalse(
@@ -134,22 +134,22 @@ class PMA_SeleniumTableCreateTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "varchar(10)",
-            $this->getTable('tablestructure', 2, 4)
+            $this->getCellByTableId('tablestructure', 2, 4)
         );
 
         $this->assertEquals(
             "utf8_general_ci",
-            $this->getTable('tablestructure', 2, 5)
+            $this->getCellByTableId('tablestructure', 2, 5)
         );
 
         $this->assertEquals(
             "Yes",
-            $this->getTable('tablestructure', 2, 7)
+            $this->getCellByTableId('tablestructure', 2, 7)
         );
 
         $this->assertEquals(
             "def",
-            $this->getTable('tablestructure', 2, 8)
+            $this->getCellByTableId('tablestructure', 2, 8)
         );
 
         $this->assertFalse(
diff --git a/test/selenium/PmaSeleniumTableInsertTest.php b/test/selenium/PmaSeleniumTableInsertTest.php
index 52598d1525..aecb2453af 100644
--- a/test/selenium/PmaSeleniumTableInsertTest.php
+++ b/test/selenium/PmaSeleniumTableInsertTest.php
@@ -107,47 +107,47 @@ class PMA_SeleniumTableInsertTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "1",
-            $this->getTable('table_results', 1, 5)
+            $this->getCellByTableClass('table_results', 1, 5)
         );
 
         $this->assertEquals(
             "abcd",
-            $this->getTable('table_results', 1, 6)
+            $this->getCellByTableClass('table_results', 1, 6)
         );
 
         $this->assertEquals(
             "2011-01-20 02:00:02",
-            $this->getTable('table_results', 1, 7)
+            $this->getCellByTableClass('table_results', 1, 7)
         );
 
         $this->assertEquals(
             "2",
-            $this->getTable('table_results', 2, 5)
+            $this->getCellByTableClass('table_results', 2, 5)
         );
 
         $this->assertEquals(
             "foo",
-            $this->getTable('table_results', 2, 6)
+            $this->getCellByTableClass('table_results', 2, 6)
         );
 
         $this->assertEquals(
             "2010-01-20 02:00:02",
-            $this->getTable('table_results', 2, 7)
+            $this->getCellByTableClass('table_results', 2, 7)
         );
 
         $this->assertEquals(
             "4",
-            $this->getTable('table_results', 3, 5)
+            $this->getCellByTableClass('table_results', 3, 5)
         );
 
         $this->assertEquals(
             "Abcd",
-            $this->getTable('table_results', 3, 6)
+            $this->getCellByTableClass('table_results', 3, 6)
         );
 
         $this->assertEquals(
             "2012-01-20 02:00:02",
-            $this->getTable('table_results', 3, 7)
+            $this->getCellByTableClass('table_results', 3, 7)
         );
     }
 }
diff --git a/test/selenium/PmaSeleniumTableOperationsTest.php b/test/selenium/PmaSeleniumTableOperationsTest.php
index b5c8d7f56f..1d0668892e 100644
--- a/test/selenium/PmaSeleniumTableOperationsTest.php
+++ b/test/selenium/PmaSeleniumTableOperationsTest.php
@@ -89,7 +89,7 @@ class PMA_SeleniumTableOperationsTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "2",
-            $this->getTable('table_results', 1, 5)
+            $this->getCellByTableClass('table_results', 1, 5)
         );
     }
 
diff --git a/test/selenium/PmaSeleniumTableStructureTest.php b/test/selenium/PmaSeleniumTableStructureTest.php
index ebe574565e..08cdd82968 100644
--- a/test/selenium/PmaSeleniumTableStructureTest.php
+++ b/test/selenium/PmaSeleniumTableStructureTest.php
@@ -89,7 +89,7 @@ class PMA_SeleniumTableStructureTest extends PMA_SeleniumBase
 
         $this->assertEquals(
             "int(11)",
-            $this->getTable('tablestructure', 2, 4)
+            $this->getCellByTableId('tablestructure', 2, 4)
         );
     }
 
diff --git a/test/selenium/PmaSeleniumTrackingTest.php b/test/selenium/PmaSeleniumTrackingTest.php
index 9546457457..f1d1156da1 100644
--- a/test/selenium/PmaSeleniumTrackingTest.php
+++ b/test/selenium/PmaSeleniumTrackingTest.php
@@ -91,17 +91,17 @@ class PMA_SeleniumTrackingTest extends PMA_SeleniumBase
 
         $this->assertContains(
             "DROP TABLE IF EXISTS `test_table`",
-            $this->getTable('ddl_versions', 1, 4)
+            $this->getCellByTableId('ddl_versions', 1, 4)
         );
 
         $this->assertContains(
             "CREATE TABLE `test_table` (",
-            $this->getTable('ddl_versions', 2, 4)
+            $this->getCellByTableId('ddl_versions', 2, 4)
         );
 
         $this->assertContains(
             "UPDATE test_table SET val = val + 1",
-            $this->getTable('dml_versions', 1, 4)
+            $this->getCellByTableId('dml_versions', 1, 4)
         );
 
         $this->assertNotContains(
@@ -122,12 +122,12 @@ class PMA_SeleniumTrackingTest extends PMA_SeleniumBase
 
         $this->assertContains(
             "DROP TABLE IF EXISTS `test_table`",
-            $this->getTable('ddl_versions', 1, 4)
+            $this->getCellByTableId('ddl_versions', 1, 4)
         );
 
         $this->assertContains(
             "CREATE TABLE `test_table` (",
-            $this->getTable('ddl_versions', 2, 4)
+            $this->getCellByTableId('ddl_versions', 2, 4)
         );
 
         // only data
@@ -143,7 +143,7 @@ class PMA_SeleniumTrackingTest extends PMA_SeleniumBase
 
         $this->assertContains(
             "UPDATE test_table SET val = val + 1",
-            $this->getTable('dml_versions', 1, 4)
+            $this->getCellByTableId('dml_versions', 1, 4)
         );
 
         $this->assertNotContains(
@@ -201,12 +201,12 @@ class PMA_SeleniumTrackingTest extends PMA_SeleniumBase
 
         $this->assertContains(
             "test_table",
-            $this->getTable('noversions', 1, 1)
+            $this->getCellByTableId('noversions', 1, 1)
         );
 
         $this->assertContains(
             "test_table_2",
-            $this->getTable('noversions', 2, 1)
+            $this->getCellByTableId('noversions', 2, 1)
         );
     }
 
@@ -224,22 +224,22 @@ class PMA_SeleniumTrackingTest extends PMA_SeleniumBase
 
         $this->assertContains(
             "id",
-            $this->getTable('tablestructure', 1, 1)
+            $this->getCellByTableId('tablestructure', 1, 1)
         );
 
         $this->assertContains(
             "val",
-            $this->getTable('tablestructure', 2, 1)
+            $this->getCellByTableId('tablestructure', 2, 1)
         );
 
         $this->assertContains(
             "PRIMARY",
-            $this->getTable('tablestructure_indexes', 1, 1)
+            $this->getCellByTableId('tablestructure_indexes', 1, 1)
         );
 
         $this->assertContains(
             "id",
-            $this->getTable('tablestructure_indexes', 1, 5)
+            $this->getCellByTableId('tablestructure_indexes', 1, 5)
         );
     }
 
diff --git a/test/selenium/TestBase.php b/test/selenium/TestBase.php
index c1dfebf885..38c8a010c3 100644
--- a/test/selenium/TestBase.php
+++ b/test/selenium/TestBase.php
@@ -431,7 +431,7 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
     }
 
     /**
-     * Get table cell data
+     * Get table cell data by the ID of the table
      *
      * @param string $tableID Table identifier
      * @param int    $row     Table row
@@ -439,7 +439,7 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
      *
      * @return text Data from the particular table cell
      */
-    public function getTable($tableID, $row, $column)
+    public function getCellByTableId($tableID, $row, $column)
     {
         $sel = "table#{$tableID} tbody tr:nth-child({$row}) "
             . "td:nth-child({$column})";
@@ -449,6 +449,25 @@ abstract class PMA_SeleniumBase extends PHPUnit_Extensions_Selenium2TestCase
         return $element->text();
     }
 
+    /**
+     * Get table cell data by the class attribute of the table
+     *
+     * @param string $tableClass Class of the table
+     * @param int    $row        Table row
+     * @param int    $column     Table column
+     *
+     * @return text Data from the particular table cell
+     */
+    public function getCellByTableClass($tableClass, $row, $column)
+    {
+        $sel = "table.{$tableClass} tbody tr:nth-child({$row}) "
+            . "td:nth-child({$column})";
+        $element = $this->byCssSelector(
+            $sel
+        );
+        return $element->text();
+    }
+
     /**
      * Wrapper around keys method to not use it on not supported
      * browsers.
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index 05a19c316f..bcc33d0862 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -89,7 +89,7 @@ h2 a img {
     width: 100%;
 }
 
-#table_results td.data {
+.table_results td.data {
 border-right: 1px solid #bbb;
 }
 

From 8c215b4a841ec5d7578420d891a8d266759867e6 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 1 Dec 2014 15:54:08 +0530
Subject: [PATCH 28/29] Do no use ID attributes for bookmark fields

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/sql.lib.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
index 61877c8c48..f3569b4e14 100644
--- a/libraries/sql.lib.php
+++ b/libraries/sql.lib.php
@@ -636,16 +636,12 @@ function PMA_getHtmlForBookmark($disp_mode, $cfgBookmark, $sql_query, $db, $tabl
         );
         $html .= '</legend>';
         $html .= '<div class="formelement">';
-        $html .= '<label for="fields_label_">' . __('Label:') . '</label>';
-        $html .= '<input type="text" id="fields_label_"'
-            . ' name="bkm_fields[bkm_label]" value="" />';
+        $html .= '<label>' . __('Label:') . '</label>';
+        $html .= '<input type="text" name="bkm_fields[bkm_label]" value="" />';
         $html .= '</div>';
         $html .= '<div class="formelement">';
-        $html .= '<input type="checkbox" name="bkm_all_users"'
-            . ' id="bkm_all_users" value="true" />';
-        $html .= '<label for="bkm_all_users">'
-            . __('Let every user access this bookmark')
-            . '</label>';
+        $html .= '<input type="checkbox" name="bkm_all_users" value="true" />';
+        $html .= '<label>' . __('Let every user access this bookmark') . '</label>';
         $html .= '</div>';
         $html .= '<div class="clearfloat"></div>';
         $html .= '</fieldset>';

From 8d9054f7328458913466150f17ae1d8ebdb12929 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Mon, 1 Dec 2014 16:49:17 +0530
Subject: [PATCH 29/29] Use class attribute to select result_query div

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 js/db_search.js                               |  2 +-
 js/functions.js                               | 22 ++++++++---------
 js/indexes.js                                 |  6 ++---
 js/normalization.js                           |  2 +-
 js/tbl_structure.js                           | 24 +++++++++----------
 libraries/Util.class.php                      |  2 +-
 .../common/PMA_showMessage_test_disabled.php  |  2 +-
 themes/original/css/common.css.php            |  4 ++--
 themes/pmahomme/css/common.css.php            |  4 ++--
 9 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/js/db_search.js b/js/db_search.js
index 575f880bb0..3562b1345f 100644
--- a/js/db_search.js
+++ b/js/db_search.js
@@ -84,7 +84,7 @@ function deleteResult(result_path, msg)
             var $msg = PMA_ajaxShowMessage(PMA_messages.strDeleting, false);
             /** Load the deleted option to the page*/
             $('#sqlqueryform').html('');
-            var url = result_path + "#result_query, #sqlqueryform";
+            var url = result_path;
             $.get(url, {'ajax_request': true, 'is_js_confirmed': true},
                 function (data) {
                     if (typeof data !== 'undefined' && data.success) {
diff --git a/js/functions.js b/js/functions.js
index 565286c3a9..5ec3ab83ef 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2701,8 +2701,8 @@ AJAX.registerOnload('functions.js', function () {
         if ($(".sqlqueryresults").length !== 0) {
             $(".sqlqueryresults").remove();
         }
-        if ($("#result_query").length !== 0) {
-            $("#result_query").remove();
+        if ($(".result_query").length !== 0) {
+            $(".result_query").remove();
         }
         //variables which stores the common attributes
         $.post($(this).attr('href'), { ajax_request: 1 }, function (data) {
@@ -2719,7 +2719,7 @@ AJAX.registerOnload('functions.js', function () {
             } else if (typeof data !== 'undefined' && data.success === true) {
                 var $temp_div = $("<div id='temp_div'></div>");
                 $temp_div.html(data.message);
-                var $success = $temp_div.find("#result_query .success");
+                var $success = $temp_div.find(".result_query .success");
                 PMA_ajaxShowMessage($success);
                 $("<div class='sqlqueryresults ajax'></div>").prependTo("#page_content");
                 $(".sqlqueryresults").html(data.message);
@@ -3416,17 +3416,17 @@ function indexEditorDialog(url, title, callback_success, callback_failure)
             }
             if (typeof data !== 'undefined' && data.success === true) {
                 PMA_ajaxShowMessage(data.message);
-                if ($('#result_query').length) {
-                    $('#result_query').remove();
+                if ($('.result_query').length) {
+                    $('.result_query').remove();
                 }
                 if (data.sql_query) {
-                    $('<div id="result_query"></div>')
+                    $('<div class="result_query"></div>')
                         .html(data.sql_query)
                         .prependTo('#page_content');
                     PMA_highlightSQL($('#page_content'));
                 }
-                $("#result_query .notice").remove();
-                $("#result_query").prepend(data.message);
+                $(".result_query .notice").remove();
+                $(".result_query").prepend(data.message);
                 /*Reload the field form*/
                 $("#table_index").remove();
                 var $temp_div = $("<div id='temp_div'><div>").append(data.index_table);
@@ -4101,8 +4101,8 @@ AJAX.registerOnload('functions.js', function () {
                 if ($(".sqlqueryresults").length !== 0) {
                     $(".sqlqueryresults").remove();
                 }
-                if ($("#result_query").length !== 0) {
-                    $("#result_query").remove();
+                if ($(".result_query").length !== 0) {
+                    $(".result_query").remove();
                 }
                 if (typeof data !== 'undefined' && data.success === true) {
                     PMA_ajaxShowMessage(data.message);
@@ -4348,7 +4348,7 @@ function PMA_createViewDialog($this)
                     PMA_ajaxRemoveMessage($msg);
                     if (typeof data !== 'undefined' && data.success === true) {
                         $('#createViewDialog').dialog("close");
-                        $('#result_query').html(data.message);
+                        $('.result_query').html(data.message);
                         PMA_reloadNavigation();
                     } else {
                         PMA_ajaxShowMessage(data.error, false);
diff --git a/js/indexes.js b/js/indexes.js
index dde9ef7dd0..34f0d81521 100644
--- a/js/indexes.js
+++ b/js/indexes.js
@@ -533,11 +533,11 @@ AJAX.registerOnload('indexes.js', function () {
                             $(this).remove();
                         });
                     }
-                    if ($('#result_query').length) {
-                        $('#result_query').remove();
+                    if ($('.result_query').length) {
+                        $('.result_query').remove();
                     }
                     if (data.sql_query) {
-                        $('<div id="result_query"></div>')
+                        $('<div class="result_query"></div>')
                             .html(data.sql_query)
                             .prependTo('#page_content');
                         PMA_highlightSQL($('#page_content'));
diff --git a/js/normalization.js b/js/normalization.js
index ba6a083dd9..e34ab284c4 100644
--- a/js/normalization.js
+++ b/js/normalization.js
@@ -654,7 +654,7 @@ AJAX.registerOnload('normalization.js', function() {
         indexEditorDialog(url, title, function(){
             //on success
             $(".sqlqueryresults").remove();
-            $('#result_query').remove();
+            $('.result_query').remove();
             $('.tblFooters').html('');
             goToStep2('goToStep3');
         });
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 759561319c..36b8c7823f 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -122,7 +122,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
                         .append(data.sql_query)
                         .show();
                     PMA_highlightSQL($('#page_content'));
-                    $("#result_query .notice").remove();
+                    $(".result_query .notice").remove();
                     reloadFieldForm();
                     $form.remove();
                     PMA_ajaxRemoveMessage($msg);
@@ -166,11 +166,11 @@ AJAX.registerOnload('tbl_structure.js', function () {
             $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true, 'ajax_page_request' : true}, function (data) {
                 if (typeof data !== 'undefined' && data.success === true) {
                     PMA_ajaxRemoveMessage($msg);
-                    if ($('#result_query').length) {
-                        $('#result_query').remove();
+                    if ($('.result_query').length) {
+                        $('.result_query').remove();
                     }
                     if (data.sql_query) {
-                        $('<div id="result_query"></div>')
+                        $('<div class="result_query"></div>')
                             .html(data.sql_query)
                             .prependTo('#page_content');
                         PMA_highlightSQL($('#page_content'));
@@ -224,11 +224,11 @@ AJAX.registerOnload('tbl_structure.js', function () {
                     $(this).remove();
                     if (typeof data.reload != 'undefined') {
                         PMA_commonActions.refreshMain(false, function () {
-                            if ($('#result_query').length) {
-                                $('#result_query').remove();
+                            if ($('.result_query').length) {
+                                $('.result_query').remove();
                             }
                             if (data.sql_query) {
-                                $('<div id="result_query"></div>')
+                                $('<div class="result_query"></div>')
                                     .html(data.sql_query)
                                     .prependTo('#page_content');
                                 PMA_highlightSQL($('#page_content'));
@@ -270,11 +270,11 @@ AJAX.registerOnload('tbl_structure.js', function () {
                 function (data) {
                 if (typeof data !== 'undefined' && data.success === true) {
                     PMA_ajaxRemoveMessage($msg);
-                    if ($('#result_query').length) {
-                        $('#result_query').remove();
+                    if ($('.result_query').length) {
+                        $('.result_query').remove();
                     }
                     if (data.sql_query) {
-                        $('<div id="result_query"></div>')
+                        $('<div class="result_query"></div>')
                             .html(data.sql_query)
                             .prependTo('#page_content');
                         PMA_highlightSQL($('#page_content'));
@@ -314,8 +314,8 @@ AJAX.registerOnload('tbl_structure.js', function () {
                 function (data) {
                 if (typeof data !== 'undefined' && data.success === true) {
                     PMA_ajaxRemoveMessage($msg);
-                    if ($('#result_query').length) {
-                        $('#result_query').remove();
+                    if ($('.result_query').length) {
+                        $('.result_query').remove();
                     }
                     if (data.sql_query) {
                         $('<div id="result_query"></div>')
diff --git a/libraries/Util.class.php b/libraries/Util.class.php
index ad96c72be2..da039bf6c5 100644
--- a/libraries/Util.class.php
+++ b/libraries/Util.class.php
@@ -1019,7 +1019,7 @@ class PMA_Util
 
         // In an Ajax request, $GLOBALS['cell_align_left'] may not be defined. Hence,
         // check for it's presence before using it
-        $retval .= '<div id="result_query" class="result_query"'
+        $retval .= '<div class="result_query"'
             . ( isset($GLOBALS['cell_align_left'])
                 ? ' style="text-align: ' . $GLOBALS['cell_align_left'] . '"'
                 : '' )
diff --git a/test/libraries/common/PMA_showMessage_test_disabled.php b/test/libraries/common/PMA_showMessage_test_disabled.php
index d20b848c25..89c24c5a50 100644
--- a/test/libraries/common/PMA_showMessage_test_disabled.php
+++ b/test/libraries/common/PMA_showMessage_test_disabled.php
@@ -56,7 +56,7 @@ class PMA_ShowMessage_Test extends PHPUnit_Framework_TestCase
         $GLOBALS['sql_query'] = "SELECT * FROM tblPatient ";
 
         $this->expectOutputString(
-            "<div id=\"result_query\" align=\"\">
+            "<div class=\"result_query\" align=\"\">
             <div class=\"notice\">msg</div><code class=\"sql\"><span class=\"syntax\"><span class=\"inner_sql\"><a href=\"./url.php?url=http%3A%2F%2Fdev.mysql.com%2Fdoc%2Frefman%2F5.0%2Fen%2Fselect.html&amp;server=server&amp;lang=en&amp;token=647a62ad301bf9025e3b13bc7caa02cb\" target=\"mysql_doc\"><span class=\"syntax_alpha syntax_alpha_reservedWord\">SELECT</span></a>  <span class=\"syntax_punct\">*</span> <br /><span class=\"syntax_alpha syntax_alpha_reservedWord\">FROM</span> <span class=\"syntax_alpha syntax_alpha_identifier\">tblPatient</span></span></span></code><div class=\"tools\"><form action=\"sql.php\" method=\"post\"><input type=\"hidden\" name=\"db\" value=\"db\" /><input type=\"hidden\" name=\"table\" value=\"tbl\" /><input type=\"hidden\" name=\"server\" value=\"server\" /><input type=\"hidden\" name=\"lang\" value=\"en\" /><input type=\"hidden\" name=\"token\" value=\"647a62ad301bf9025e3b13bc7caa02cb\" /><input type=\"hidden\" name=\"sql_query\" value=\"SELECT * FROM tblPatient \" /></form><script type=\"text/javascript\">
             //<![CDATA[
             $('.tools form').last().after('[<a href=\"#\" title=\"Inline edit of this query\" class=\"inline_edit_sql\">Inline</a>]');
diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php
index 4462537c58..22fad0cb7a 100644
--- a/themes/original/css/common.css.php
+++ b/themes/original/css/common.css.php
@@ -1391,7 +1391,7 @@ div.sqlvalidate {
     overflow:           auto;
 }
 
-#result_query div.sqlOuter,
+.result_query div.sqlOuter,
 div.sqlvalidate  {
     border:             <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;
     border-top:         0;
@@ -2649,7 +2649,7 @@ div#page_content form#db_search_form.ajax fieldset {
     margin-top: -0.3em;
 }
 
-div#page_content div#tableslistcontainer, div#page_content div.notice, div#page_content div#result_query {
+div#page_content div#tableslistcontainer, div#page_content div.notice, div#page_content div.result_query {
     margin-top: 1em;
 }
 
diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php
index bcc33d0862..6a2204f34f 100644
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@@ -1844,7 +1844,7 @@ div.sqlvalidate {
     overflow: auto;
 }
 
-#result_query div.sqlOuter {
+.result_query div.sqlOuter {
     background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
     padding: 1em;
 }
@@ -2963,7 +2963,7 @@ div#page_content form#db_search_form.ajax fieldset {
     margin-top: -0.3em;
 }
 
-div#page_content div#tableslistcontainer, div#page_content div.notice, div#page_content div#result_query {
+div#page_content div#tableslistcontainer, div#page_content div.notice, div#page_content div.result_query {
     margin-top: 1em;
 }