diff --git a/Documentation.html b/Documentation.html
index 05682e677..c9c93ffac 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -1537,7 +1537,7 @@ Defaults to FALSE (drop-down).
$cfg['LeftPointerEnable'] boolean
- Activates the left pointer (when LeftFrameLight is FALSE).
+ A value of TRUE activates the left pointer (when LeftFrameLight is FALSE).
@@ -1580,6 +1580,12 @@ Defaults to FALSE (drop-down).
+ $cfg['BrowsePointerEnable'] boolean
+
+ Whether to activate the browse pointer or not.
+
+
+
$cfg['TextareaCols'] integer
$cfg['TextareaRows'] integer
diff --git a/config.inc.php b/config.inc.php
index 1a9d055da..dd66a7959 100644
--- a/config.inc.php
+++ b/config.inc.php
@@ -464,6 +464,10 @@ $cfg['LeftPointerEnable'] = TRUE; // enable the left panel pointer
// see also LeftPointerColor
// in colors.inc.php
+$cfg['BrowsePointerEnable'] = FALSE; // enable the browse pointer
+ // see also BrowsePointerColor
+ // in colors.inc.php
+
$cfg['TextareaCols'] = 40; // textarea size (columns) in edit mode
// (this value will be emphasized (*2) for sql
// query textareas and (*1.25) for query window)
diff --git a/db_details_structure.php b/db_details_structure.php
index 93b3e3c03..f0dd612d7 100644
--- a/db_details_structure.php
+++ b/db_details_structure.php
@@ -289,9 +289,11 @@ else {
$bgcolor = ($i++ % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
echo "\n";
- if ($GLOBALS['cfg']['BrowsePointerColor'] != '') {
+ if ($GLOBALS['cfg']['BrowsePointerEnable'] == TRUE) {
$on_mouse = ' onmouseover="setPointer(this, ' . $i . ', \'over\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"'
. ' onmouseout="setPointer(this, ' . $i . ', \'out\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
+ } else {
+ $on_mouse = '';
}
if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') {
$on_mouse .= ' onmousedown="setPointer(this, ' . $i . ', \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index c33856bfb..a221b5147 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -136,7 +136,7 @@ if (isset($cfg['FileRevision'])) {
} else {
$cfg['FileRevision'] = array(1, 1);
}
-if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 32)) {
+if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 33)) {
require_once('./libraries/config_import.lib.php');
}
diff --git a/libraries/config_import.lib.php b/libraries/config_import.lib.php
index f96cc2016..473e04fb5 100644
--- a/libraries/config_import.lib.php
+++ b/libraries/config_import.lib.php
@@ -652,6 +652,10 @@ if (!isset($cfg['BgcolorTwo'])) {
}
}
+if (!isset($cfg['BrowsePointerEnable'])) {
+ $cfg['BrowsePointerEnable'] = TRUE;
+}
+
if (!isset($cfg['BrowsePointerColor'])) {
if (isset($cfgBrowsePointerColor)) {
$cfg['BrowsePointerColor'] = $cfgBrowsePointerColor;
@@ -659,6 +663,9 @@ if (!isset($cfg['BrowsePointerColor'])) {
} else {
$cfg['BrowsePointerColor'] = '#CCFFCC';
}
+// no longer accept an empty value to mean "disable the pointer"
+} elseif ($cfg['BrowsePointerColor'] == '') {
+ $cfg['BrowsePointerColor'] = '#CCFFCC';
}
if (!isset($cfg['BrowseMarkerColor'])) {
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index f430e81ec..8e860d3ff 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1060,9 +1060,11 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// loic1: pointer code part
$on_mouse = '';
if (!isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1')) {
- if ($GLOBALS['cfg']['BrowsePointerColor'] != '') {
+ if ($GLOBALS['cfg']['BrowsePointerEnable'] == TRUE) {
$on_mouse = ' onmouseover="setPointer(this, ' . $row_no . ', \'over\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"'
. ' onmouseout="setPointer(this, ' . $row_no . ', \'out\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
+ } else {
+ $on_mouse = '';
}
if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') {
$on_mouse .= ' onmousedown="setPointer(this, ' . $row_no . ', \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
@@ -1216,7 +1218,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
}
if ($disp_direction == 'vertical' && (!isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1'))) {
- if ($GLOBALS['cfg']['BrowsePointerColor'] != '') {
+ if ($GLOBALS['cfg']['BrowsePointerColor'] == TRUE) {
$column_style .= ' onmouseover="setVerticalPointer(this, ' . $row_no . ', \'over\', \'' . $GLOBALS['cfg']['BgcolorOne'] . '\', \'' . $GLOBALS['cfg']['BgcolorTwo'] . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"'
. ' onmouseout="setVerticalPointer(this, ' . $row_no . ', \'out\', \'' . $GLOBALS['cfg']['BgcolorOne'] . '\', \'' . $GLOBALS['cfg']['BgcolorTwo'] . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
}
@@ -1489,7 +1491,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
}
$column_style_vertical = '';
- if ($GLOBALS['cfg']['BrowsePointerColor'] != '') {
+ if ($GLOBALS['cfg']['BrowsePointerEnable'] == TRUE) {
$column_style_vertical .= ' onmouseover="setVerticalPointer(this, ' . $row_no . ', \'over\', \'' . $GLOBALS['cfg']['BgcolorOne'] . '\', \'' . $GLOBALS['cfg']['BgcolorTwo'] . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"'
. ' onmouseout="setVerticalPointer(this, ' . $row_no . ', \'out\', \'' . $GLOBALS['cfg']['BgcolorOne'] . '\', \'' . $GLOBALS['cfg']['BgcolorTwo'] . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
}
diff --git a/server_variables.php b/server_variables.php
index 8ebef9d8c..4cf6cb37b 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -83,9 +83,11 @@ echo ' ' . "\n";
$useBgcolorOne = TRUE;
$on_mouse='';
foreach ($serverVars as $name => $value) {
- if ($GLOBALS['cfg']['BrowsePointerColor'] != '') {
+ if ($GLOBALS['cfg']['BrowsePointerEnable'] == TRUE) {
$on_mouse = ' onmouseover="this.style.backgroundColor=\'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\';"'
. ' onmouseout="this.style.backgroundColor=\'' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '\';"';
+ } else {
+ $on_mouse = '';
}
?>
>
diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php
index 5d9356e5f..73afd0c80 100644
--- a/tbl_properties_structure.php
+++ b/tbl_properties_structure.php
@@ -119,9 +119,11 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
$bgcolor = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
$aryFields[] = $row['Field'];
- if ($GLOBALS['cfg']['BrowsePointerColor'] != '') {
+ if ($GLOBALS['cfg']['BrowsePointerEnable'] == TRUE) {
$on_mouse = ' onmouseover="setPointer(this, ' . $i . ', \'over\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"'
. ' onmouseout="setPointer(this, ' . $i . ', \'out\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
+ } else {
+ $on_mouse = '';
}
if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') {
$on_mouse .= ' onmousedown="setPointer(this, ' . $i . ', \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
diff --git a/themes/darkblue_orange/colors.inc.php b/themes/darkblue_orange/colors.inc.php
index 069274edb..11d2c1ab0 100644
--- a/themes/darkblue_orange/colors.inc.php
+++ b/themes/darkblue_orange/colors.inc.php
@@ -12,7 +12,6 @@ $cfg['ThBgcolor'] = '#666699'; // table header row colour
$cfg['BgcolorOne'] = '#EEEEEE'; // table data row colour
$cfg['BgcolorTwo'] = '#E5E5E5'; // table data row colour, alternate
$cfg['BrowsePointerColor'] = '#CCCCFF'; // color of the pointer in browse mode
- // (blank for no pointer)
$cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row
// by clicking on it) in browse mode
// (blank for no marker)
diff --git a/themes/original/colors.inc.php b/themes/original/colors.inc.php
index 3b17b4277..504f6c6b6 100644
--- a/themes/original/colors.inc.php
+++ b/themes/original/colors.inc.php
@@ -12,7 +12,6 @@ $cfg['ThBgcolor'] = '#D3DCE3'; // table header row colour
$cfg['BgcolorOne'] = '#E5E5E5'; // table data row colour
$cfg['BgcolorTwo'] = '#D5D5D5'; // table data row colour, alternate
$cfg['BrowsePointerColor'] = '#CCFFCC'; // color of the pointer in browse mode
- // (blank for no pointer)
$cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row
// by clicking on it) in browse mode
// (blank for no marker)