From b65ba8b5dbf3600423ee5ff3dd2ad1becdd1d4db Mon Sep 17 00:00:00 2001
From: Garvin Hicking <me@supergarv.de>
Date: Mon, 5 Jan 2004 15:27:33 +0000
Subject: [PATCH] Upon clicking on a result row, de/activate      the checkbox
 next to it. Only makes sense for horizontal mode. Can be      deactivated by
 setting BrowseMarkerColor to an empty string in config.inc.php.

---
 ChangeLog                           | 6 ++++++
 libraries/display_tbl.lib.php       | 2 +-
 libraries/display_tbl_links.lib.php | 2 +-
 libraries/functions.js              | 3 +++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 30ef4d819..8ce062ba4 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-01-05 Garvin Hicking <returnofthegarv@supergarv.de>
+    * libraries/display_tbl.lib.php, libraries/display_tbl_links.lib.php,
+      libraries/functions.js: Upon clicking on a result row, de/activate
+      the checkbox next to it. Only makes sense for horizontal mode. Can be
+      deactivated by setting BrowseMarkerColor to an empty string in config.inc.php.
+
 2004-01-05 Alexander M. Turek  <rumors@derrabus.de>
     * tbl_properties_operations.php: Changing a table's charset changed the
       charset of all fields (MySQL >= 4.1.1).
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 909fffdcd..dd844eb5e 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1490,7 +1490,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
 
         if (!empty($del_url)) {
             $vertical_display['row_delete'][$row_no] .= '    <td width="10" align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
-                                                     .  '        <input type="checkbox" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" />' . "\n"
+                                                     .  '        <input type="checkbox" id="id_rows_to_delete' . $row_no . '" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" />' . "\n"
                                                      .  '    </td>' . "\n";
         } else {
             unset($vertical_display['row_delete'][$row_no]);
diff --git a/libraries/display_tbl_links.lib.php b/libraries/display_tbl_links.lib.php
index 6514da1a4..6c7b3fa75 100644
--- a/libraries/display_tbl_links.lib.php
+++ b/libraries/display_tbl_links.lib.php
@@ -4,7 +4,7 @@
 
 if (!empty($del_url)) {
     echo '    <td width="10" align="center" valign="' . ($bookmark_go != '' ? 'top' : 'middle') . '" bgcolor="' . $bgcolor . '">' . "\n"
-       . '        <input type="checkbox" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" />' . "\n"
+       . '        <input type="checkbox" id="id_rows_to_delete' . $row_no . '" name="rows_to_delete[' . $uva_condition . ']" value="' . $del_query . '" />' . "\n"
        . '    </td>' . "\n";
 }
 if (!empty($edit_url)) {
diff --git a/libraries/functions.js b/libraries/functions.js
index 073f76e0c..ddf43546b 100644
--- a/libraries/functions.js
+++ b/libraries/functions.js
@@ -423,6 +423,7 @@ function setPointer(theRow, theRowNum, theAction, theDefaultColor, thePointerCol
         else if (theAction == 'click' && theMarkColor != '') {
             newColor              = theMarkColor;
             marked_row[theRowNum] = true;
+            document.getElementById('id_rows_to_delete' + theRowNum).checked = true;
         }
     }
     // 4.1.2 Current color is the pointer one
@@ -434,6 +435,7 @@ function setPointer(theRow, theRowNum, theAction, theDefaultColor, thePointerCol
         else if (theAction == 'click' && theMarkColor != '') {
             newColor              = theMarkColor;
             marked_row[theRowNum] = true;
+            document.getElementById('id_rows_to_delete' + theRowNum).checked = true;
         }
     }
     // 4.1.3 Current color is the marker one
@@ -445,6 +447,7 @@ function setPointer(theRow, theRowNum, theAction, theDefaultColor, thePointerCol
             marked_row[theRowNum] = (typeof(marked_row[theRowNum]) == 'undefined' || !marked_row[theRowNum])
                                   ? true
                                   : null;
+            document.getElementById('id_rows_to_delete' + theRowNum).checked = false;
         }
     } // end 4