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

added variables to define (text) color for marked and hovered objects

Browse Source
This commit is contained in:
Sebastian Mendel
2006-08-02 09:09:41 +00:00
parent 5ba79a6950
commit 9b092a37cf
7 changed files with 76 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -5,6 +5,14 @@ phpMyAdmin - ChangeLog
$Id$ $Id$
$Source$ $Source$
2006-08-02 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* css\phpmyadmin.css.php, themes\darkblue_orange\css\theme_right.css.php
themes\darkblue_orange\layout.inc.php, themes\original\layout.inc.php
themes\original\css\theme_left.css.php,
themes\original\css\theme_right.css.php:
added variables to define (text) color for marked and hovered objects
thanks to Juergen Wind - windkiel for hinting this bug (patch #1503529)
2006-08-01 Marc Delisle <lem9@users.sourceforge.net> 2006-08-01 Marc Delisle <lem9@users.sourceforge.net>
* Documentation.html: patch #1532493 + light editing from me, * Documentation.html: patch #1532493 + light editing from me,
thanks to Isaac Bennetch thanks to Isaac Bennetch

16
css/phpmyadmin.css.php
View File

@@ -709,8 +709,10 @@ if ($_SESSION['PMA_Theme']->checkVersion('2.9')) {
/********************/ /********************/
<?php if ($GLOBALS['cfg']['BrowseMarkerColor']) { ?> <?php if ($GLOBALS['cfg']['BrowseMarkerColor']) { ?>
div#left_tableList li.marked { /* marked items */
background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>; .marked {
background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
} }
<?php } ?> <?php } ?>
@@ -724,16 +726,12 @@ div#left_tableList li.marked {
background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>; background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
} }
/* marked items */
.marked {
background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
}
/* hovered items */ /* hovered items */
.odd:hover, .odd:hover,
.even:hover, .even:hover,
.hover { .hover {
background-color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>; background: <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
} }
/** /**
@@ -743,7 +741,7 @@ tr.condition th,
tr.condition td, tr.condition td,
td.condition, td.condition,
th.condition { th.condition {
border: 1px solid <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>; border: 1px solid <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
} }
label.desc { label.desc {

6
themes/darkblue_orange/css/theme_right.css.php
View File

@@ -189,7 +189,8 @@ table tr.even {
/* marked tbale rows */ /* marked tbale rows */
table tr.marked th, table tr.marked th,
table tr.marked { table tr.marked {
background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>; background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
} }
/* hovered table rows */ /* hovered table rows */
@@ -199,7 +200,8 @@ table tr.odd:hover th,
table tr.even:hover th, table tr.even:hover th,
table tr.hover th, table tr.hover th,
table tr.hover { table tr.hover {
background-color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>; background: <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
} }
table .value { table .value {

41
themes/darkblue_orange/layout.inc.php
View File

@@ -8,32 +8,41 @@
* navi frame * navi frame
*/ */
// navi frame width // navi frame width
$GLOBALS['cfg']['NaviWidth'] = 180; $GLOBALS['cfg']['NaviWidth'] = 180;
// foreground (text) color for the navi frame // foreground (text) color for the navi frame
$GLOBALS['cfg']['NaviColor'] = '#ffffff'; $GLOBALS['cfg']['NaviColor'] = '#ffffff';
// background for the navi frame // background for the navi frame
$GLOBALS['cfg']['NaviBackground'] = '#666699'; $GLOBALS['cfg']['NaviBackground'] = '#666699';
// color of the pointer in navi frame // foreground (text) color of the pointer in navi frame
$GLOBALS['cfg']['NaviPointerColor'] = '#9999CC'; $GLOBALS['cfg']['NaviPointerColor'] = '#ffffff';
// background of the pointer in navi frame
$GLOBALS['cfg']['NaviPointerBackground'] = '#9999cc';
/** /**
* main frame * main frame
*/ */
// foreground (text) color for the main frame // foreground (text) color for the main frame
$GLOBALS['cfg']['MainColor'] = '#000000'; $GLOBALS['cfg']['MainColor'] = '#000000';
// background for the main frame // background for the main frame
$GLOBALS['cfg']['MainBackground'] = '#FFFFFF'; $GLOBALS['cfg']['MainBackground'] = '#ffffff';
//$GLOBALS['cfg']['MainBackground'] = 'url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png)'; //$GLOBALS['cfg']['MainBackground'] = 'url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png)';
// color of the pointer in browse mode // foreground (text) color of the pointer in browse mode
$GLOBALS['cfg']['BrowsePointerColor'] = '#CCFFCC'; $GLOBALS['cfg']['BrowsePointerColor'] = '#000000';
// color of the marker (visually marks row by clicking on it) in browse mode // background of the pointer in browse mode
$GLOBALS['cfg']['BrowseMarkerColor'] = '#FFCC99'; $GLOBALS['cfg']['BrowsePointerBackground'] = '#ccffcc';
// foreground (text) color of the marker (visually marks row by clicking on it) in browse mode
$GLOBALS['cfg']['BrowseMarkerColor'] = '#000000';
// background of the marker (visually marks row by clicking on it) in browse mode
$GLOBALS['cfg']['BrowseMarkerBackground'] = '#ffcc99';
/** /**
* fonts * fonts
@@ -43,7 +52,7 @@ $GLOBALS['cfg']['BrowseMarkerColor'] = '#FFCC99';
* if not set the browser default will be used * if not set the browser default will be used
* (depending on browser, DTD and system settings) * (depending on browser, DTD and system settings)
*/ */
$GLOBALS['cfg']['FontFamily'] = 'Verdana, Arial, Helvetica, sans-serif'; $GLOBALS['cfg']['FontFamily'] = 'Verdana, Arial, Helvetica, sans-serif';
/** /**
* fixed width font family, used in textarea * fixed width font family, used in textarea
*/ */
@@ -53,7 +62,7 @@ $GLOBALS['cfg']['FontFamilyFixed'] = 'monospace';
* if not set the browser default will be used * if not set the browser default will be used
* (depending on browser, DTD and system settings) * (depending on browser, DTD and system settings)
*/ */
$GLOBALS['cfg']['FontSize'] = ''; $GLOBALS['cfg']['FontSize'] = '';
/** /**
* tables * tables
@@ -73,15 +82,15 @@ $GLOBALS['cfg']['BgTwo'] = '#D5D5D5';
* query window * query window
*/ */
// Width of Query window // Width of Query window
$GLOBALS['cfg']['QueryWindowWidth'] = 600; $GLOBALS['cfg']['QueryWindowWidth'] = 600;
// Height of Query window // Height of Query window
$GLOBALS['cfg']['QueryWindowHeight'] = 400; $GLOBALS['cfg']['QueryWindowHeight'] = 400;
/** /**
* SQL Parser Settings * SQL Parser Settings
* Syntax colouring data * Syntax colouring data
*/ */
$GLOBALS['cfg']['SQP']['fmtColor'] = array( $GLOBALS['cfg']['SQP']['fmtColor'] = array(
'comment' => '#808000', 'comment' => '#808000',
'comment_mysql' => '', 'comment_mysql' => '',
'comment_ansi' => '', 'comment_ansi' => '',

10
themes/original/css/theme_left.css.php
View File

@@ -73,7 +73,8 @@ div#leftframelinks a img.icon {
} }
div#leftframelinks a:hover { div#leftframelinks a:hover {
background-color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>; background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
} }
/* leftdatabaselist */ /* leftdatabaselist */
@@ -91,12 +92,12 @@ div#left_tableList ul ul {
} }
div#left_tableList a { div#left_tableList a {
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>; color: inherit;
text-decoration: none; text-decoration: none;
} }
div#left_tableList a:hover { div#left_tableList a:hover {
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>; color: inherit;
text-decoration: underline; text-decoration: underline;
} }
@@ -108,7 +109,8 @@ div#left_tableList li {
<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?> <?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
div#left_tableList li:hover { div#left_tableList li:hover {
background-color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>; background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
} }
<?php } ?> <?php } ?>

6
themes/original/css/theme_right.css.php
View File

@@ -166,7 +166,8 @@ table tr.even {
/* marked tbale rows */ /* marked tbale rows */
table tr.marked th, table tr.marked th,
table tr.marked { table tr.marked {
background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>; background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
} }
/* hovered table rows */ /* hovered table rows */
@@ -176,7 +177,8 @@ table tr.odd:hover th,
table tr.even:hover th, table tr.even:hover th,
table tr.hover th, table tr.hover th,
table tr.hover { table tr.hover {
background-color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>; background: <?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
} }
table .value { table .value {

36
themes/original/layout.inc.php
View File

@@ -8,32 +8,40 @@
* navi frame * navi frame
*/ */
// navi frame width // navi frame width
$GLOBALS['cfg']['NaviWidth'] = 200; $GLOBALS['cfg']['NaviWidth'] = 200;
// foreground (text) color for the navi frame // foreground (text) color for the navi frame
$GLOBALS['cfg']['NaviColor'] = '#000000'; $GLOBALS['cfg']['NaviColor'] = '#000000';
// background for the navi frame // background for the navi frame
$GLOBALS['cfg']['NaviBackground'] = '#D0DCE0'; $GLOBALS['cfg']['NaviBackground'] = '#D0DCE0';
// color of the pointer in navi frame // foreground (text) color of the pointer in navi frame
$GLOBALS['cfg']['NaviPointerColor'] = '#CCFFCC'; $GLOBALS['cfg']['NaviPointerColor'] = '#CCFFCC';
// background of the pointer in navi frame
$GLOBALS['cfg']['NaviPointerBackground'] = '#9999CC';
/** /**
* main frame * main frame
*/ */
// foreground (text) color for the main frame // foreground (text) color for the main frame
$GLOBALS['cfg']['MainColor'] = '#000000'; $GLOBALS['cfg']['MainColor'] = '#000000';
// background for the main frame // background for the main frame
$GLOBALS['cfg']['MainBackground'] = '#F5F5F5'; $GLOBALS['cfg']['MainBackground'] = '#F5F5F5';
//$GLOBALS['cfg']['MainBackground'] = 'url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png)'; //$GLOBALS['cfg']['MainBackground'] = 'url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png)';
// color of the pointer in browse mode // foreground (text) color of the pointer in browse mode
$GLOBALS['cfg']['BrowsePointerColor'] = '#CCFFCC'; $GLOBALS['cfg']['BrowsePointerColor'] = '#000000';
// color of the marker (visually marks row by clicking on it) in browse mode // background of the pointer in browse mode
$GLOBALS['cfg']['BrowseMarkerColor'] = '#FFCC99'; $GLOBALS['cfg']['BrowsePointerBackground'] = '#CCFFCC';
// foreground (text) color of the marker (visually marks row by clicking on it) in browse mode
$GLOBALS['cfg']['BrowseMarkerColor'] = '#000000';
// background of the marker (visually marks row by clicking on it) in browse mode
$GLOBALS['cfg']['BrowseMarkerBackground'] = '#FFCC99';
/** /**
* fonts * fonts
@@ -73,15 +81,15 @@ $GLOBALS['cfg']['BgTwo'] = '#D5D5D5';
* query window * query window
*/ */
// Width of Query window // Width of Query window
$GLOBALS['cfg']['QueryWindowWidth'] = 600; $GLOBALS['cfg']['QueryWindowWidth'] = 600;
// Height of Query window // Height of Query window
$GLOBALS['cfg']['QueryWindowHeight'] = 400; $GLOBALS['cfg']['QueryWindowHeight'] = 400;
/** /**
* SQL Parser Settings * SQL Parser Settings
* Syntax colouring data * Syntax colouring data
*/ */
$GLOBALS['cfg']['SQP']['fmtColor'] = array( $GLOBALS['cfg']['SQP']['fmtColor'] = array(
'comment' => '#808000', 'comment' => '#808000',
'comment_mysql' => '', 'comment_mysql' => '',
'comment_ansi' => '', 'comment_ansi' => '',