nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LeftPointerEnable

Browse Source
This commit is contained in:
Marc Delisle
2004-06-24 12:41:10 +00:00
parent 43acfce4ea
commit de04757024
8 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -5,6 +5,12 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2004-06-24 Marc Delisle <lem9@users.sourceforge.net>
* 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 <me@derrabus.de> 2004-06-24 Alexander M. Turek <me@derrabus.de>
* libraries/dbi/mysqli.dbi.php: Undefined variable if PMA_DBI_getError() is * libraries/dbi/mysqli.dbi.php: Undefined variable if PMA_DBI_getError() is
called although no error occured. called although no error occured.

27
Documentation.html
View File

@@ -334,7 +334,9 @@ GRANT SELECT, INSERT, UPDATE, DELETE ON &lt;pma_db&gt;.* TO 'pma'@'localhost';
</p> </p>
<p> <p>
All configurable data is placed in <i>config.inc.php</i>. Except these you Almost all configurable data is placed in <i>config.inc.php</i>. The
parameters which relate to design (like colors) are placed in
<tt>themes/themename/colors.inc.php</tt>. You
might also want to modify <i>config.footer.inc.php</i> and might also want to modify <i>config.footer.inc.php</i> and
<i>config.header.inc.php</i> files to add your site specific code to be <i>config.header.inc.php</i> files to add your site specific code to be
included on start and end of each page. included on start and end of each page.
@@ -1504,7 +1506,7 @@ Defaults to FALSE (drop-down). <br />
<dt><b>$cfg['LeftWidth'] </b>integer</dt> <dt><b>$cfg['LeftWidth'] </b>integer</dt>
<dd> <dd>
Left frame width in pixel. Left frame width in pixel. See <tt>themes/themename/colors.inc.php</tt>.
<br /><br /> <br /><br />
</dd> </dd>
@@ -1514,6 +1516,7 @@ Defaults to FALSE (drop-down). <br />
</dt> </dt>
<dd> <dd>
The background colors (HTML) used for both the frames. The background colors (HTML) used for both the frames.
See <tt>themes/themename/colors.inc.php</tt>.
<br /><br /> <br /><br />
</dd> </dd>
@@ -1522,37 +1525,43 @@ Defaults to FALSE (drop-down). <br />
</dt> </dt>
<dd> <dd>
The URI of the background image used for the right frame. It must be The URI of the background image used for the right frame. It must be
an absolute URI. an absolute URI. See <tt>themes/themename/colors.inc.php</tt>.
</dd> </dd>
<dt><b>$cfg['LeftPointerColor'] </b>string [HTML color]</dt> <dt><b>$cfg['LeftPointerColor'] </b>string [HTML color]</dt>
<dd> <dd>
The color (HTML) used for the pointer in the left frame (does not work The color (HTML) used for the pointer in the left frame (does not work
with Netscape 4). with Netscape 4). See <tt>themes/themename/colors.inc.php</tt>.
<br /><br />
</dd>
<dt><b>$cfg['LeftPointerEnable'] </b>boolean</dt>
<dd>
Activates the left pointer (when LeftFrameLight is FALSE).
<br /><br /> <br /><br />
</dd> </dd>
<dt><b>$cfg['Border'] </b>integer</dt> <dt><b>$cfg['Border'] </b>integer</dt>
<dd> <dd>
The size of a table's border. The size of a table's border. See <tt>themes/themename/colors.inc.php</tt>.
<br /><br /> <br /><br />
</dd> </dd>
<dt><b>$cfg['ThBgcolor'] </b>string [HTML color]</dt> <dt><b>$cfg['ThBgcolor'] </b>string [HTML color]</dt>
<dd> <dd>
The color (HTML) used for table headers. The color (HTML) used for table headers. See <tt>themes/themename/colors.inc.php</tt>.
<br /><br /> <br /><br />
</dd> </dd>
<dt><b>$cfg['BgcolorOne'] </b>string [HTML color]</dt> <dt><b>$cfg['BgcolorOne'] </b>string [HTML color]</dt>
<dd> <dd>
The color (HTML) #1 for table rows. The color (HTML) #1 for table rows. See <tt>themes/themename/colors.inc.php</tt>.
<br /><br /> <br /><br />
</dd> </dd>
<dt><b>$cfg['BgcolorTwo'] </b>string [HTML color]</dt> <dt><b>$cfg['BgcolorTwo'] </b>string [HTML color]</dt>
<dd> <dd>
The color (HTML) #2 for table rows. The color (HTML) #2 for table rows. See <tt>themes/themename/colors.inc.php</tt>.
<br /><br /> <br /><br />
</dd> </dd>
@@ -1567,7 +1576,7 @@ Defaults to FALSE (drop-down). <br />
and the latter lets you visually mark/unmark rows by clicking on and the latter lets you visually mark/unmark rows by clicking on
them.<br /> them.<br />
You can disable both of these features by emptying the respective You can disable both of these features by emptying the respective
directive. directive. See <tt>themes/themename/colors.inc.php</tt>.
<br /><br /> <br /><br />
</dd> </dd>

5
config.inc.php
View File

@@ -459,6 +459,11 @@ $cfg['AvailableCharsets'] = array(
* The graphical settings are now located in themes/themename/colors.inc.php * 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 $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)

8
left.php
View File

@@ -82,7 +82,7 @@ function PMA_nestedSetHeaderParent($baseid, $key, $keyhistory, $indent, $indent_
$groupkey = $keyhistory . ($key != $keyhistory ? $GLOBALS['cfg']['LeftFrameTableSeparator'] . $key : ''); $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; $countarray = $val;
if (count($countarray) == 2 && isset($countarray['pma_name']) && isset($countarray['pma_list_item'])) { 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; $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; $loops = 0;
foreach ($tablestack['pma_name'] AS $tkey => $tval) { foreach ($tablestack['pma_name'] AS $tkey => $tval) {
@@ -491,7 +491,7 @@ if ($num_dbs > 1) {
if ($cfg['LeftFrameLight'] == FALSE) { if ($cfg['LeftFrameLight'] == FALSE) {
// Displays the database name // 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 "\n";
echo ' <div id="el' . $j . 'Parent" class="parent nowrap"' . $on_mouse . '>'; echo ' <div id="el' . $j . 'Parent" class="parent nowrap"' . $on_mouse . '>';
@@ -738,7 +738,7 @@ else if ($num_dbs == 1) {
// Displays the database name // Displays the database name
if (!$cfg['LeftFrameLight']) { 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 "\n";
echo ' <div id="el2Parent" class="parent"' . $on_mouse . '>'; echo ' <div id="el2Parent" class="parent"' . $on_mouse . '>';

2
libraries/common.lib.php
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] < 31)) { if ($cfg['FileRevision'][0] < 2 || ($cfg['FileRevision'][0] == 2 && $cfg['FileRevision'][1] < 32)) {
require_once('./libraries/config_import.lib.php'); require_once('./libraries/config_import.lib.php');
} }

7
libraries/config_import.lib.php
View File

@@ -594,6 +594,13 @@ if (!isset($cfg['LeftPointerColor'])) {
} else { } else {
$cfg['LeftPointerColor'] = '#CCFFCC'; $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'])) { if (!isset($cfg['RightBgColor'])) {

1
themes/darkblue_orange/colors.inc.php
View File

@@ -7,7 +7,6 @@ $cfg['RightBgColor'] = '#FFFFFF'; // background color for the right fr
$cfg['RightBgImage'] = ''; // path to a background image for the right frame $cfg['RightBgImage'] = ''; // path to a background image for the right frame
// (leave blank for no background image) // (leave blank for no background image)
$cfg['LeftPointerColor'] = '#9999CC'; // color of the pointer in left frame $cfg['LeftPointerColor'] = '#9999CC'; // color of the pointer in left frame
// (blank for no pointer)
$cfg['Border'] = 0; // border width on tables $cfg['Border'] = 0; // border width on tables
$cfg['ThBgcolor'] = '#666699'; // table header row colour $cfg['ThBgcolor'] = '#666699'; // table header row colour
$cfg['BgcolorOne'] = '#EEEEEE'; // table data row colour $cfg['BgcolorOne'] = '#EEEEEE'; // table data row colour

1
themes/original/colors.inc.php
View File

@@ -7,7 +7,6 @@ $cfg['RightBgColor'] = '#F5F5F5'; // background color for the right fr
$cfg['RightBgImage'] = ''; // path to a background image for the right frame $cfg['RightBgImage'] = ''; // path to a background image for the right frame
// (leave blank for no background image) // (leave blank for no background image)
$cfg['LeftPointerColor'] = '#CCFFCC'; // color of the pointer in left frame $cfg['LeftPointerColor'] = '#CCFFCC'; // color of the pointer in left frame
// (blank for no pointer)
$cfg['Border'] = 0; // border width on tables $cfg['Border'] = 0; // border width on tables
$cfg['ThBgcolor'] = '#D3DCE3'; // table header row colour $cfg['ThBgcolor'] = '#D3DCE3'; // table header row colour
$cfg['BgcolorOne'] = '#E5E5E5'; // table data row colour $cfg['BgcolorOne'] = '#E5E5E5'; // table data row colour