diff --git a/ChangeLog b/ChangeLog index 28afb65b2..ede5a9983 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,12 @@ phpMyAdmin - Changelog $Id$ $Source$ +2004-06-24 Marc Delisle + * left.php, config.inc.php, Documentation.html, + libraries/config_import.lib.php + common.lib.php, all colors.inc.php: + $cfg['LeftPointerEnable'] + (I am still working for BrowsePointerEnable and BrowseMarkerEnable) + 2004-06-24 Alexander M. Turek * libraries/dbi/mysqli.dbi.php: Undefined variable if PMA_DBI_getError() is called although no error occured. diff --git a/Documentation.html b/Documentation.html index e33ffc7d8..05682e677 100755 --- a/Documentation.html +++ b/Documentation.html @@ -334,7 +334,9 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON <pma_db>.* TO 'pma'@'localhost';

- All configurable data is placed in config.inc.php. Except these you + Almost all configurable data is placed in config.inc.php. The + parameters which relate to design (like colors) are placed in + themes/themename/colors.inc.php. You might also want to modify config.footer.inc.php and config.header.inc.php files to add your site specific code to be included on start and end of each page. @@ -1504,7 +1506,7 @@ Defaults to FALSE (drop-down).

$cfg['LeftWidth'] integer
- Left frame width in pixel. + Left frame width in pixel. See themes/themename/colors.inc.php.

@@ -1514,6 +1516,7 @@ Defaults to FALSE (drop-down).
The background colors (HTML) used for both the frames. + See themes/themename/colors.inc.php.

@@ -1522,37 +1525,43 @@ Defaults to FALSE (drop-down).
The URI of the background image used for the right frame. It must be - an absolute URI. + an absolute URI. See themes/themename/colors.inc.php.
$cfg['LeftPointerColor'] string [HTML color]
The color (HTML) used for the pointer in the left frame (does not work - with Netscape 4). + with Netscape 4). See themes/themename/colors.inc.php. +

+
+ +
$cfg['LeftPointerEnable'] boolean
+
+ Activates the left pointer (when LeftFrameLight is FALSE).

$cfg['Border'] integer
- The size of a table's border. + The size of a table's border. See themes/themename/colors.inc.php.

$cfg['ThBgcolor'] string [HTML color]
- The color (HTML) used for table headers. + The color (HTML) used for table headers. See themes/themename/colors.inc.php.

$cfg['BgcolorOne'] string [HTML color]
- The color (HTML) #1 for table rows. + The color (HTML) #1 for table rows. See themes/themename/colors.inc.php.

$cfg['BgcolorTwo'] string [HTML color]
- The color (HTML) #2 for table rows. + The color (HTML) #2 for table rows. See themes/themename/colors.inc.php.

@@ -1567,7 +1576,7 @@ Defaults to FALSE (drop-down).
and the latter lets you visually mark/unmark rows by clicking on them.
You can disable both of these features by emptying the respective - directive. + directive. See themes/themename/colors.inc.php.

diff --git a/config.inc.php b/config.inc.php index d9cc5e7fa..1a9d055da 100644 --- a/config.inc.php +++ b/config.inc.php @@ -459,6 +459,11 @@ $cfg['AvailableCharsets'] = array( * The graphical settings are now located in themes/themename/colors.inc.php */ +$cfg['LeftPointerEnable'] = TRUE; // enable the left panel pointer + // (used when LeftFrameLight is FALSE) + // see also LeftPointerColor + // 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/left.php b/left.php index 67b8f803a..4397fec67 100644 --- a/left.php +++ b/left.php @@ -82,7 +82,7 @@ function PMA_nestedSetHeaderParent($baseid, $key, $keyhistory, $indent, $indent_ $groupkey = $keyhistory . ($key != $keyhistory ? $GLOBALS['cfg']['LeftFrameTableSeparator'] . $key : ''); - $on_mouse = (($GLOBALS['cfg']['LeftPointerColor'] == '') ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $id . '\', \'' . $GLOBALS['cfg']['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $id . '\', \'' . $GLOBALS['cfg']['LeftBgColor'] . '\')}"'); + $on_mouse = (($GLOBALS['cfg']['LeftPointerEnable'] == FALSE) ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $id . '\', \'' . $GLOBALS['cfg']['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $id . '\', \'' . $GLOBALS['cfg']['LeftBgColor'] . '\')}"'); $countarray = $val; if (count($countarray) == 2 && isset($countarray['pma_name']) && isset($countarray['pma_list_item'])) { @@ -161,7 +161,7 @@ function PMA_nestedSet($baseid, $tablestack, $key = '__protected__', $keyhistory $extra_indent = 0; } - $on_mouse = (($GLOBALS['cfg']['LeftPointerColor'] == '') ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $keyhistory . $key . '\', \'' . $GLOBALS['cfg']['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $keyhistory . $key . '\', \'' . $GLOBALS['cfg']['LeftBgColor'] . '\')}"'); + $on_mouse = (($GLOBALS['cfg']['LeftPointerEnable'] == FALSE) ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $keyhistory . $key . '\', \'' . $GLOBALS['cfg']['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $keyhistory . $key . '\', \'' . $GLOBALS['cfg']['LeftBgColor'] . '\')}"'); $loops = 0; foreach ($tablestack['pma_name'] AS $tkey => $tval) { @@ -491,7 +491,7 @@ if ($num_dbs > 1) { if ($cfg['LeftFrameLight'] == FALSE) { // Displays the database name - $on_mouse = (($cfg['LeftPointerColor'] == '') ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $j . '\', \'' . $cfg['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $j . '\', \'' . $cfg['LeftBgColor'] . '\')}"'); + $on_mouse = (($cfg['LeftPointerEnable'] == FALSE) ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el' . $j . '\', \'' . $cfg['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el' . $j . '\', \'' . $cfg['LeftBgColor'] . '\')}"'); echo "\n"; echo '
'; @@ -738,7 +738,7 @@ else if ($num_dbs == 1) { // Displays the database name if (!$cfg['LeftFrameLight']) { - $on_mouse = (($cfg['LeftPointerColor'] == '') ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el2\', \'' . $cfg['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el2\', \'' . $cfg['LeftBgColor'] . '\')}"'); + $on_mouse = (($cfg['LeftPointerEnable'] == FALSE) ? '' : ' onmouseover="if (isDOM || isIE4) {hilightBase(\'el2\', \'' . $cfg['LeftPointerColor'] . '\')}" onmouseout="if (isDOM || isIE4) {hilightBase(\'el2\', \'' . $cfg['LeftBgColor'] . '\')}"'); echo "\n"; echo '
'; diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 0dd5cece9..c33856bfb 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] < 31)) { +if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 32)) { require_once('./libraries/config_import.lib.php'); } diff --git a/libraries/config_import.lib.php b/libraries/config_import.lib.php index d296fe0e4..f96cc2016 100644 --- a/libraries/config_import.lib.php +++ b/libraries/config_import.lib.php @@ -594,6 +594,13 @@ if (!isset($cfg['LeftPointerColor'])) { } else { $cfg['LeftPointerColor'] = '#CCFFCC'; } +// no longer accept an empty value to mean "disable the pointer" +} elseif ($cfg['LeftPointerColor'] == '') { + $cfg['LeftPointerColor'] = '#CCFFCC'; +} + +if (!isset($cfg['LeftPointerEnable'])) { + $cfg['LeftPointerEnable'] = TRUE; } if (!isset($cfg['RightBgColor'])) { diff --git a/themes/darkblue_orange/colors.inc.php b/themes/darkblue_orange/colors.inc.php index b1263e367..069274edb 100644 --- a/themes/darkblue_orange/colors.inc.php +++ b/themes/darkblue_orange/colors.inc.php @@ -7,7 +7,6 @@ $cfg['RightBgColor'] = '#FFFFFF'; // background color for the right fr $cfg['RightBgImage'] = ''; // path to a background image for the right frame // (leave blank for no background image) $cfg['LeftPointerColor'] = '#9999CC'; // color of the pointer in left frame - // (blank for no pointer) $cfg['Border'] = 0; // border width on tables $cfg['ThBgcolor'] = '#666699'; // table header row colour $cfg['BgcolorOne'] = '#EEEEEE'; // table data row colour diff --git a/themes/original/colors.inc.php b/themes/original/colors.inc.php index d66f76ef5..3b17b4277 100644 --- a/themes/original/colors.inc.php +++ b/themes/original/colors.inc.php @@ -7,7 +7,6 @@ $cfg['RightBgColor'] = '#F5F5F5'; // background color for the right fr $cfg['RightBgImage'] = ''; // path to a background image for the right frame // (leave blank for no background image) $cfg['LeftPointerColor'] = '#CCFFCC'; // color of the pointer in left frame - // (blank for no pointer) $cfg['Border'] = 0; // border width on tables $cfg['ThBgcolor'] = '#D3DCE3'; // table header row colour $cfg['BgcolorOne'] = '#E5E5E5'; // table data row colour