diff --git a/ChangeLog b/ChangeLog index c05b8a027..9c43c9b6d 100755 --- a/ChangeLog +++ b/ChangeLog @@ -14,7 +14,10 @@ $Source$ libraries/config_import.lib.php + common.lib.php + display_tbl.lib.php, all colors.inc.php: $cfg['BrowsePointerEnable'] - (I am still working for BrowseMarkerEnable) + * db_details_structure.php, tbl_properties_structure.php, config.inc.php, + Documentation.html, all colors.inc.php, + libraries/config_import.lib.php + common.lib.php + display_tbl.lib.php: + $cfg['BrowseMarkerEnable'] 2004-06-24 Alexander M. Turek * libraries/dbi/mysqli.dbi.php: Undefined variable if PMA_DBI_getError() is diff --git a/Documentation.html b/Documentation.html index 782b6564e..6596d5124 100755 --- a/Documentation.html +++ b/Documentation.html @@ -1585,6 +1585,12 @@ Defaults to FALSE (drop-down).


+
$cfg['BrowseMarkerEnable'] boolean
+
+ Whether to activate the browse marker or not. +

+
+
$cfg['TextareaCols'] integer
$cfg['TextareaRows'] integer
diff --git a/config.inc.php b/config.inc.php index dd66a7959..b548a76d5 100644 --- a/config.inc.php +++ b/config.inc.php @@ -468,6 +468,10 @@ $cfg['BrowsePointerEnable'] = FALSE; // enable the browse pointer // see also BrowsePointerColor // in colors.inc.php +$cfg['BrowseMarkerEnable'] = FALSE; // enable the browse marker + // see also BrowseMarkerColor + // 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 f0dd612d7..a3c55b6d5 100644 --- a/db_details_structure.php +++ b/db_details_structure.php @@ -295,7 +295,7 @@ else { } else { $on_mouse = ''; } - if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') { + if ($GLOBALS['cfg']['BrowseMarkerEnable'] == TRUE) { $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 a221b5147..08268c722 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] < 33)) { +if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 34)) { require_once('./libraries/config_import.lib.php'); } diff --git a/libraries/config_import.lib.php b/libraries/config_import.lib.php index 473e04fb5..a78ec06c2 100644 --- a/libraries/config_import.lib.php +++ b/libraries/config_import.lib.php @@ -668,6 +668,10 @@ if (!isset($cfg['BrowsePointerColor'])) { $cfg['BrowsePointerColor'] = '#CCFFCC'; } +if (!isset($cfg['BrowseMarkerEnable'])) { + $cfg['BrowseMarkerEnable'] = TRUE; +} + if (!isset($cfg['BrowseMarkerColor'])) { if (isset($cfgBrowseMarkerColor)) { $cfg['BrowseMarkerColor'] = $cfgBrowseMarkerColor; @@ -685,6 +689,9 @@ if (!isset($cfg['BrowseMarkerColor'])) { } else { $cfg['BrowseMarkerColor'] = '#FFCC99'; } +// no longer accept an empty value to mean "disable the marker" +} elseif ($cfg['BrowseMarkerColor'] == '') { + $cfg['BrowseMarkerColor'] = '#FFCC99'; } if (!isset($cfg['TextareaCols'])) { diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 8e860d3ff..c3e0fda7d 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1066,7 +1066,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) } else { $on_mouse = ''; } - if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') { + if ($GLOBALS['cfg']['BrowseMarkerEnable'] == TRUE) { $on_mouse .= ' onmousedown="setPointer(this, ' . $row_no . ', \'click\', \'' . $bgcolor . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"'; } } // end if @@ -1222,7 +1222,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) $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'] . '\');"'; } - if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') { + if ($GLOBALS['cfg']['BrowseMarkerEnable'] == TRUE) { $column_style .= ' onmousedown="setVerticalPointer(this, ' . $row_no . ', \'click\', \'' . $GLOBALS['cfg']['BgcolorOne'] . '\', \'' . $GLOBALS['cfg']['BgcolorTwo'] . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\'); setCheckboxColumn(\'id_rows_to_delete' . $row_no . '\');"'; } else { $column_style .= ' onmousedown="setCheckboxColumn(\'id_rows_to_delete' . $row_no . '\');" '; @@ -1496,7 +1496,7 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) . ' onmouseout="setVerticalPointer(this, ' . $row_no . ', \'out\', \'' . $GLOBALS['cfg']['BgcolorOne'] . '\', \'' . $GLOBALS['cfg']['BgcolorTwo'] . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');"'; } $column_marker_vertical = ''; - if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') { + if ($GLOBALS['cfg']['BrowseMarkerEnable'] == TRUE) { $column_marker_vertical .= 'setVerticalPointer(this, ' . $row_no . ', \'click\', \'' . $GLOBALS['cfg']['BgcolorOne'] . '\', \'' . $GLOBALS['cfg']['BgcolorTwo'] . '\', \'' . $GLOBALS['cfg']['BrowsePointerColor'] . '\', \'' . $GLOBALS['cfg']['BrowseMarkerColor'] . '\');'; } diff --git a/tbl_properties_structure.php b/tbl_properties_structure.php index 73afd0c80..48f865379 100644 --- a/tbl_properties_structure.php +++ b/tbl_properties_structure.php @@ -125,7 +125,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { } else { $on_mouse = ''; } - if ($GLOBALS['cfg']['BrowseMarkerColor'] != '') { + if ($GLOBALS['cfg']['BrowseMarkerEnable'] == TRUE) { $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 11d2c1ab0..35fff21cb 100644 --- a/themes/darkblue_orange/colors.inc.php +++ b/themes/darkblue_orange/colors.inc.php @@ -14,7 +14,6 @@ $cfg['BgcolorTwo'] = '#E5E5E5'; // table data row colour, alternate $cfg['BrowsePointerColor'] = '#CCCCFF'; // color of the pointer in browse mode $cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row // by clicking on it) in browse mode - // (blank for no marker) /** * SQL Parser Settings */ diff --git a/themes/original/colors.inc.php b/themes/original/colors.inc.php index 504f6c6b6..b48b320f6 100644 --- a/themes/original/colors.inc.php +++ b/themes/original/colors.inc.php @@ -14,7 +14,6 @@ $cfg['BgcolorTwo'] = '#D5D5D5'; // table data row colour, alternate $cfg['BrowsePointerColor'] = '#CCFFCC'; // color of the pointer in browse mode $cfg['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row // by clicking on it) in browse mode - // (blank for no marker) /** * SQL Parser Settings */