BrowsePointerEnable

This commit is contained in:
Marc Delisle
2004-06-24 13:47:01 +00:00
parent 084b73acb8
commit f5db2f7cfe
10 changed files with 33 additions and 10 deletions

View File

@@ -1537,7 +1537,7 @@ Defaults to FALSE (drop-down). <br />
<dt><b>$cfg['LeftPointerEnable'] </b>boolean</dt> <dt><b>$cfg['LeftPointerEnable'] </b>boolean</dt>
<dd> <dd>
Activates the left pointer (when LeftFrameLight is FALSE). A value of TRUE activates the left pointer (when LeftFrameLight is FALSE).
<br /><br /> <br /><br />
</dd> </dd>
@@ -1580,6 +1580,12 @@ Defaults to FALSE (drop-down). <br />
<br /><br /> <br /><br />
</dd> </dd>
<dt><b>$cfg['BrowsePointerEnable'] </b>boolean</dt>
<dd>
Whether to activate the browse pointer or not.
<br /><br />
</dd>
<dt> <dt>
<b>$cfg['TextareaCols'] </b>integer<br /> <b>$cfg['TextareaCols'] </b>integer<br />
<b>$cfg['TextareaRows'] </b>integer<br /> <b>$cfg['TextareaRows'] </b>integer<br />

View File

@@ -464,6 +464,10 @@ $cfg['LeftPointerEnable'] = TRUE; // enable the left panel pointer
// see also LeftPointerColor // see also LeftPointerColor
// in colors.inc.php // 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 $cfg['TextareaCols'] = 40; // textarea size (columns) in edit mode
// (this value will be emphasized (*2) for sql // (this value will be emphasized (*2) for sql
// query textareas and (*1.25) for query window) // query textareas and (*1.25) for query window)

View File

@@ -289,9 +289,11 @@ else {
$bgcolor = ($i++ % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; $bgcolor = ($i++ % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
echo "\n"; 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'] . '\');"' $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'] . '\');"'; . ' onmouseout="setPointer(this, ' . $i . ', \'out\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
} else {
$on_mouse = '';
} }
if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') { if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') {
$on_mouse .= ' onmousedown="setPointer(this, ' . $i . ', \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"'; $on_mouse .= ' onmousedown="setPointer(this, ' . $i . ', \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';

View File

@@ -136,7 +136,7 @@ if (isset($cfg['FileRevision'])) {
} else { } else {
$cfg['FileRevision'] = array(1, 1); $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'); require_once('./libraries/config_import.lib.php');
} }

View File

@@ -652,6 +652,10 @@ if (!isset($cfg['BgcolorTwo'])) {
} }
} }
if (!isset($cfg['BrowsePointerEnable'])) {
$cfg['BrowsePointerEnable'] = TRUE;
}
if (!isset($cfg['BrowsePointerColor'])) { if (!isset($cfg['BrowsePointerColor'])) {
if (isset($cfgBrowsePointerColor)) { if (isset($cfgBrowsePointerColor)) {
$cfg['BrowsePointerColor'] = $cfgBrowsePointerColor; $cfg['BrowsePointerColor'] = $cfgBrowsePointerColor;
@@ -659,6 +663,9 @@ if (!isset($cfg['BrowsePointerColor'])) {
} else { } else {
$cfg['BrowsePointerColor'] = '#CCFFCC'; $cfg['BrowsePointerColor'] = '#CCFFCC';
} }
// no longer accept an empty value to mean "disable the pointer"
} elseif ($cfg['BrowsePointerColor'] == '') {
$cfg['BrowsePointerColor'] = '#CCFFCC';
} }
if (!isset($cfg['BrowseMarkerColor'])) { if (!isset($cfg['BrowseMarkerColor'])) {

View File

@@ -1060,9 +1060,11 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql)
// loic1: pointer code part // loic1: pointer code part
$on_mouse = ''; $on_mouse = '';
if (!isset($GLOBALS['printview']) || ($GLOBALS['printview'] != '1')) { 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'] . '\');"' $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'] . '\');"'; . ' onmouseout="setPointer(this, ' . $row_no . ', \'out\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
} else {
$on_mouse = '';
} }
if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') { if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') {
$on_mouse .= ' onmousedown="setPointer(this, ' . $row_no . ', \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $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 ($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'] . '\');"' $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'] . '\');"'; . ' 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 = ''; $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'] . '\');"' $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'] . '\');"'; . ' onmouseout="setVerticalPointer(this, ' . $row_no . ', \'out\', \'' . $GLOBALS['cfg']['BgcolorOne'] . '\', \'' . $GLOBALS['cfg']['BgcolorTwo'] . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
} }

View File

@@ -83,9 +83,11 @@ echo '&nbsp;</th>' . "\n";
$useBgcolorOne = TRUE; $useBgcolorOne = TRUE;
$on_mouse=''; $on_mouse='';
foreach ($serverVars as $name => $value) { foreach ($serverVars as $name => $value) {
if ($GLOBALS['cfg']['BrowsePointerColor'] != '') { if ($GLOBALS['cfg']['BrowsePointerEnable'] == TRUE) {
$on_mouse = ' onmouseover="this.style.backgroundColor=\'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\';"' $on_mouse = ' onmouseover="this.style.backgroundColor=\'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\';"'
. ' onmouseout="this.style.backgroundColor=\'' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '\';"'; . ' onmouseout="this.style.backgroundColor=\'' . ($useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']) . '\';"';
} else {
$on_mouse = '';
} }
?> ?>
<tr bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>"<?php echo $on_mouse; ?>> <tr bgcolor="<?php echo $useBgcolorOne ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; ?>"<?php echo $on_mouse; ?>>

View File

@@ -119,9 +119,11 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
$bgcolor = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo']; $bgcolor = ($i % 2) ? $cfg['BgcolorOne'] : $cfg['BgcolorTwo'];
$aryFields[] = $row['Field']; $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'] . '\');"' $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'] . '\');"'; . ' onmouseout="setPointer(this, ' . $i . ', \'out\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';
} else {
$on_mouse = '';
} }
if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') { if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') {
$on_mouse .= ' onmousedown="setPointer(this, ' . $i . ', \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"'; $on_mouse .= ' onmousedown="setPointer(this, ' . $i . ', \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"';

View File

@@ -12,7 +12,6 @@ $cfg['ThBgcolor'] = '#666699'; // table header row colour
$cfg['BgcolorOne'] = '#EEEEEE'; // table data row colour $cfg['BgcolorOne'] = '#EEEEEE'; // table data row colour
$cfg['BgcolorTwo'] = '#E5E5E5'; // table data row colour, alternate $cfg['BgcolorTwo'] = '#E5E5E5'; // table data row colour, alternate
$cfg['BrowsePointerColor'] = '#CCCCFF'; // color of the pointer in browse mode $cfg['BrowsePointerColor'] = '#CCCCFF'; // color of the pointer in browse mode
// (blank for no pointer)
$cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row $cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row
// by clicking on it) in browse mode // by clicking on it) in browse mode
// (blank for no marker) // (blank for no marker)

View File

@@ -12,7 +12,6 @@ $cfg['ThBgcolor'] = '#D3DCE3'; // table header row colour
$cfg['BgcolorOne'] = '#E5E5E5'; // table data row colour $cfg['BgcolorOne'] = '#E5E5E5'; // table data row colour
$cfg['BgcolorTwo'] = '#D5D5D5'; // table data row colour, alternate $cfg['BgcolorTwo'] = '#D5D5D5'; // table data row colour, alternate
$cfg['BrowsePointerColor'] = '#CCFFCC'; // color of the pointer in browse mode $cfg['BrowsePointerColor'] = '#CCFFCC'; // color of the pointer in browse mode
// (blank for no pointer)
$cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row $cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row
// by clicking on it) in browse mode // by clicking on it) in browse mode
// (blank for no marker) // (blank for no marker)