improved themes

This commit is contained in:
Sebastian Mendel
2006-04-27 13:18:42 +00:00
parent ab0c647e18
commit 9a4e3a65c2
11 changed files with 236 additions and 212 deletions

View File

@@ -3,11 +3,11 @@
// vim: expandtab sw=4 ts=4 sts=4: // vim: expandtab sw=4 ts=4 sts=4:
chdir('..'); chdir('..');
define( 'PMA_MINIMUM_COMMON', TRUE ); define('PMA_MINIMUM_COMMON', true);
require_once('./libraries/common.lib.php'); require_once './libraries/common.lib.php';
require_once('./libraries/sqlparser.lib.php'); require_once './libraries/sqlparser.lib.php';
if ( $GLOBALS['text_dir'] === 'ltr' ) { if ($GLOBALS['text_dir'] === 'ltr') {
$right = 'right'; $right = 'right';
$left = 'left'; $left = 'left';
} else { } else {
@@ -29,7 +29,7 @@ div.nowrap {
} }
<?php <?php
if ( $_SESSION['PMA_Theme']->checkVersion( '2.7.0' ) ) { if ($_SESSION['PMA_Theme']->checkVersion('2.7.0')) {
?> ?>
form { form {
@@ -75,7 +75,7 @@ div#tablestatistics {
} }
div#tablestatistics table { div#tablestatistics table {
float: left; float: <?php echo $left; ?>;
margin-bottom: 0.5em; margin-bottom: 0.5em;
margin-right: 0.5em; margin-right: 0.5em;
} }
@@ -124,7 +124,7 @@ div#left_tableList li {
white-space: nowrap; white-space: nowrap;
} }
<?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']['LeftPointerColor']; ?>; background-color: <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
} }
@@ -315,7 +315,7 @@ a.tabcaution:hover {
background-color: #FF0000; background-color: #FF0000;
} }
<?php if ( $GLOBALS['cfg']['LightTabs'] ) { ?> <?php if ($GLOBALS['cfg']['LightTabs']) { ?>
/* active tab */ /* active tab */
a.tabactive { a.tabactive {
color: black; color: black;
@@ -471,7 +471,7 @@ img.lightbulb {
<?php <?php
} // end styles 2.7.0 } // end styles 2.7.0
if ( $_SESSION['PMA_Theme']->checkVersion( '2.7.1' ) ) { if ($_SESSION['PMA_Theme']->checkVersion('2.7.1')) {
?> ?>
/********************/ /********************/
@@ -516,7 +516,7 @@ form.login label {
/* END main page */ /* END main page */
<?php if ( $GLOBALS['cfg']['MainPageIconic'] ) { ?> <?php if ($GLOBALS['cfg']['MainPageIconic']) { ?>
/* iconic view for ul items */ /* iconic view for ul items */
li#li_create_database { li#li_create_database {
list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_newdb.png); list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/b_newdb.png);
@@ -689,16 +689,18 @@ li#li_flush_privileges {
float: <?php echo $left; ?>; float: <?php echo $left; ?>;
} }
<?php <?php
$GLOBALS['cfg']['BgOne'] = $GLOBALS['cfg']['BgcolorOne'];
$GLOBALS['cfg']['BgTwo'] = $GLOBALS['cfg']['BgcolorTwo'];
} // end styles 2.7.1 } // end styles 2.7.1
if ( $_SESSION['PMA_Theme']->checkVersion( '2.9' ) ) { if ($_SESSION['PMA_Theme']->checkVersion('2.9')) {
?> ?>
/********************/ /********************/
/* NEW in PMA 2.9 */ /* NEW in PMA 2.9 */
/********************/ /********************/
<?php if ( $GLOBALS['cfg']['BrowseMarkerColor'] ) { ?> <?php if ($GLOBALS['cfg']['BrowseMarkerColor']) { ?>
div#left_tableList li.marked { div#left_tableList li.marked {
background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>; background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
} }
@@ -706,12 +708,12 @@ div#left_tableList li.marked {
/* odd items 1,3,5,7,... */ /* odd items 1,3,5,7,... */
.odd { .odd {
background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>; background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
} }
/* even items 2,4,6,8,... */ /* even items 2,4,6,8,... */
.even { .even {
background-color: <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>; background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
} }
/* marked items */ /* marked items */
@@ -738,10 +740,10 @@ th.condition {
label.desc { label.desc {
width: 30em; width: 30em;
float: left; float: <?php echo $left; ?>;
} }
<?php <?php
} // end styles 2.9 } // end styles 2.9
$_SESSION['PMA_Theme']->loadCss( $_REQUEST['js_frame'] ); $_SESSION['PMA_Theme_Manager']->printCss($_REQUEST['js_frame']);
?> ?>

View File

@@ -11,7 +11,7 @@
* @uses $GLOBALS['cfg']['Server']['user'] * @uses $GLOBALS['cfg']['Server']['user']
* @uses $GLOBALS['cfg']['DefaultTabServer'] as src for the mainframe * @uses $GLOBALS['cfg']['DefaultTabServer'] as src for the mainframe
* @uses $GLOBALS['cfg']['DefaultTabDatabase'] as src for the mainframe * @uses $GLOBALS['cfg']['DefaultTabDatabase'] as src for the mainframe
* @uses $GLOBALS['cfg']['LeftWidth'] for left frame width * @uses $GLOBALS['cfg']['NaviWidth'] for navi frame width
* @uses $GLOBALS['collation_connection'] from $_REQUEST (grab_globals.lib.php) * @uses $GLOBALS['collation_connection'] from $_REQUEST (grab_globals.lib.php)
* or common.lib.php * or common.lib.php
* @uses $GLOBALS['available_languages'] from common.lib.php (select_lang.lib.php) * @uses $GLOBALS['available_languages'] from common.lib.php (select_lang.lib.php)
@@ -137,7 +137,7 @@ header('Content-Type: text/html; charset=' . $GLOBALS['charset']);
if ($GLOBALS['text_dir'] === 'rtl') { if ($GLOBALS['text_dir'] === 'rtl') {
echo '*,'; echo '*,';
} }
echo $GLOBALS['cfg']['LeftWidth']; echo $GLOBALS['cfg']['NaviWidth'];
if ($GLOBALS['text_dir'] === 'ltr') { if ($GLOBALS['text_dir'] === 'ltr') {
echo ',*'; echo ',*';
} }

View File

@@ -3009,9 +3009,14 @@ $GLOBALS['pmaThemeImage'] = $_SESSION['PMA_Theme']->getImgPath();
*/ */
if (@file_exists($_SESSION['PMA_Theme']->getLayoutFile())) { if (@file_exists($_SESSION['PMA_Theme']->getLayoutFile())) {
include $_SESSION['PMA_Theme']->getLayoutFile(); include $_SESSION['PMA_Theme']->getLayoutFile();
// @todo remove if all themes are update use Navi instead of Left as frame name
if (! isset($GLOBALS['cfg']['NaviWidth'])
&& isset($GLOBALS['cfg']['LeftWidth'])) {
$GLOBALS['cfg']['NaviWidth'] = $GLOBALS['cfg']['LeftWidth'];
}
} }
if (!defined('PMA_MINIMUM_COMMON')) { if (! defined('PMA_MINIMUM_COMMON')) {
/** /**
* Charset conversion. * Charset conversion.
*/ */

View File

@@ -24,10 +24,10 @@ select, input, textarea {
<?php } ?> <?php } ?>
body { body {
margin: 5px; padding: 0;
color: <?php echo $GLOBALS['cfg']['RightColor']; ?>; margin: 0.5em;
background-color: <?php echo $GLOBALS['cfg']['RightBgColor']; ?>; color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
} }
h1 { h1 {
@@ -73,18 +73,14 @@ dfn:hover {
th { th {
font-weight: bold; font-weight: bold;
color: <?php echo $GLOBALS['cfg']['RightColor']; ?>; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
background-color: <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>; background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
background-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/tbl_th.png);
background-repeat: repeat-x;
background-position: top;
height: 18px;
} }
th a:link, th a:link,
th a:active, th a:active,
th a:visited { th a:visited {
color: <?php echo $GLOBALS['cfg']['RightColor']; ?>; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
text-decoration: underline; text-decoration: underline;
} }
@@ -107,6 +103,7 @@ hr {
form { form {
padding: 0; padding: 0;
margin: 0; margin: 0;
display: inline;
} }
textarea { textarea {
@@ -127,7 +124,7 @@ fieldset fieldset {
fieldset legend { fieldset legend {
color: #666699; color: #666699;
font-weight: bold; font-weight: bold;
background-color: <?php echo $GLOBALS['cfg']['RightBgColor']; ?>; background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
padding: 2px 2px 2px 2px; padding: 2px 2px 2px 2px;
} }
@@ -159,14 +156,14 @@ button {
fieldset.tblFooters { fieldset.tblFooters {
margin-top: 0; margin-top: 0;
margin-bottom: 0.5em; margin-bottom: 0.5em;
text-align: right; text-align: <?php echo $right; ?>;
float: none; float: none;
clear: both; clear: both;
} }
fieldset .formelement { fieldset .formelement {
float: left; float: <?php echo $left; ?>;
margin-right: 0.5em; margin-<?php echo $right; ?>: 0.5em;
/* IE */ /* IE */
white-space: nowrap; white-space: nowrap;
} }
@@ -185,16 +182,16 @@ button.mult_submit {
table tr.odd th, table tr.odd th,
table tr.odd { table tr.odd {
background-image: none; background-image: none;
background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>; background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
text-align: left; text-align: <?php echo $left; ?>;
} }
/* even table rows 2,4,6,8,... */ /* even table rows 2,4,6,8,... */
table tr.even th, table tr.even th,
table tr.even { table tr.even {
background-image: none; background-image: none;
background-color: <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>; background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
text-align: left; text-align: <?php echo $left; ?>;
} }
/* marked tbale rows */ /* marked tbale rows */
@@ -214,7 +211,7 @@ table tr.hover {
} }
table .value { table .value {
text-align: right; text-align: <?php echo $right; ?>;
white-space: nowrap; white-space: nowrap;
} }
/* IE doesnt handles 'pre' right */ /* IE doesnt handles 'pre' right */
@@ -222,9 +219,12 @@ table [class=value] {
white-space: pre; white-space: pre;
} }
<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
.value { .value {
font-family: "Courier New", Courier, monospace; font-family: <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
} }
<?php } ?>
.value .attention { .value .attention {
color: red; color: red;
font-weight: bold; font-weight: bold;
@@ -261,10 +261,6 @@ img.lightbulb {
border: 1px dashed #000000; border: 1px dashed #000000;
} }
.print {
font-size: 8pt;
}
/* MySQL Parser */ /* MySQL Parser */
.syntax { .syntax {
} }
@@ -350,6 +346,7 @@ h1.notice,
div.notice { div.notice {
margin: 0.5em 0 0.5em 0; margin: 0.5em 0 0.5em 0;
border: 0.1em solid #FFD700; border: 0.1em solid #FFD700;
width: 90%;
<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?> <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png); background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
background-repeat: no-repeat; background-repeat: no-repeat;
@@ -381,7 +378,6 @@ div.warning {
margin: 0.5em 0 0.5em 0; margin: 0.5em 0 0.5em 0;
border: 0.1em solid #CC0000; border: 0.1em solid #CC0000;
width: 90%; width: 90%;
<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?> <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png); background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
background-repeat: no-repeat; background-repeat: no-repeat;
@@ -466,21 +462,15 @@ fieldset.confirmation legend {
.tblHeaders { .tblHeaders {
font-weight: bold; font-weight: bold;
color: #ffffff; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
background-color: #666699; background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
background-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/tbl_header.png);
background-repeat: repeat-x;
background-position: top;
height: 18px;
} }
.tblFooters { .tblFooters {
font-weight: normal; font-weight: normal;
color: #ffffff; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
background-color: #666699; background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
background-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/tbl_header.png);
background-repeat: repeat-x;
background-position: top;
} }
.tblHeaders a:link, .tblHeaders a:link,
@@ -523,6 +513,9 @@ td.disabled {
background-color: #cccccc; background-color: #cccccc;
} }
/**
* login form
*/
body.loginform h1, body.loginform h1,
body.loginform a.logo { body.loginform a.logo {
display: block; display: block;
@@ -530,7 +523,7 @@ body.loginform a.logo {
} }
form.login label { form.login label {
float: left; float: <?php echo $left; ?>;
width: 10em; width: 10em;
font-weight: bolder; font-weight: bolder;
} }
@@ -548,7 +541,7 @@ ul#topmenu {
} }
ul#topmenu li { ul#topmenu li {
float: left; float: <?php echo $left; ?>;
margin: 0; margin: 0;
padding: 0; padding: 0;
vertical-align: middle; vertical-align: middle;
@@ -556,7 +549,7 @@ ul#topmenu li {
#topmenu img { #topmenu img {
vertical-align: middle; vertical-align: middle;
margin-right: 0.1em; margin-<?php echo $right; ?>: 0.1em;
} }
/* default tab styles */ /* default tab styles */
@@ -603,8 +596,8 @@ ul#topmenu li {
/* default tab styles */ /* default tab styles */
.tab, .tabcaution, .tabactive { .tab, .tabcaution, .tabactive {
background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>; background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
border: 1pt solid <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>; border: 1pt solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
border-bottom: 0; border-bottom: 0;
border-radius-topleft: 0.4em; border-radius-topleft: 0.4em;
border-radius-topright: 0.4em; border-radius-topright: 0.4em;
@@ -624,7 +617,7 @@ a.tabcaution:hover,
a.tab:hover, a.tab:hover,
.tabactive { .tabactive {
background-color: <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>; background-color: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
} }
/* disabled drop/empty tabs */ /* disabled drop/empty tabs */
@@ -676,13 +669,13 @@ div#tablestatistics {
} }
div#tablestatistics table { div#tablestatistics table {
float: left; float: <?php echo $left; ?>;
margin-bottom: 0.5em; margin-bottom: 0.5em;
margin-right: 0.5em; margin-<?php echo $right; ?>: 0.5em;
} }
div#tablestatistics table caption { div#tablestatistics table caption {
margin-right: 0.5em; margin-<?php echo $right; ?>: 0.5em;
} }
/* END table stats */ /* END table stats */
@@ -772,12 +765,12 @@ div#tablestatistics table caption {
} }
#fieldset_add_user_login label { #fieldset_add_user_login label {
float: left; float: <?php echo $left; ?>;
display: block; display: block;
width: 10em; width: 10em;
max-width: 100%; max-width: 100%;
text-align: right; text-align: <?php echo $right; ?>;
padding-right: 0.5em; padding-<?php echo $right; ?>: 0.5em;
} }
#fieldset_add_user_login span.options #select_pred_username, #fieldset_add_user_login span.options #select_pred_username,
@@ -788,16 +781,16 @@ div#tablestatistics table caption {
} }
#fieldset_add_user_login span.options { #fieldset_add_user_login span.options {
float: left; float: <?php echo $left; ?>;
display: block; display: block;
width: 12em; width: 12em;
max-width: 100%; max-width: 100%;
padding-right: 0.5em; padding-<?php echo $right; ?>: 0.5em;
} }
#fieldset_add_user_login input { #fieldset_add_user_login input {
width: 12em; width: 12em;
clear: right; clear: <?php echo $right; ?>;
max-width: 100%; max-width: 100%;
} }
@@ -806,8 +799,8 @@ div#tablestatistics table caption {
} }
#fieldset_user_priv div.item { #fieldset_user_priv div.item {
float: left; float: <?php echo $left; ?>;
width: 8em; width: 9em;
max-width: 100%; max-width: 100%;
} }
@@ -824,20 +817,20 @@ div#tablestatistics table caption {
} }
#fieldset_user_global_rights fieldset { #fieldset_user_global_rights fieldset {
float: left; float: <?php echo $left; ?>;
} }
/* END user privileges */ /* END user privileges */
/* serverstatus */ /* serverstatus */
div#serverstatus table caption a.top { div#serverstatus table caption a.top {
float: right; float: <?php echo $right; ?>;
} }
div#serverstatus div#serverstatusqueriesdetails table, div#serverstatus div#serverstatusqueriesdetails table,
div#serverstatus table#serverstatustraffic, div#serverstatus table#serverstatustraffic,
div#serverstatus table#serverstatusconnections { div#serverstatus table#serverstatusconnections {
float: left; float: <?php echo $left; ?>;
} }
#serverstatussection, #serverstatussection,
@@ -896,13 +889,13 @@ div#querywindowcontainer fieldset {
/* querybox */ /* querybox */
div#sqlquerycontainer { div#sqlquerycontainer {
float: left; float: <?php echo $left; ?>;
width: 69%; width: 69%;
/* height: 15em; */ /* height: 15em; */
} }
div#tablefieldscontainer { div#tablefieldscontainer {
float: right; float: <?php echo $right; ?>;
width: 29%; width: 29%;
/* height: 15em; */ /* height: 15em; */
} }
@@ -1046,12 +1039,12 @@ li#li_flush_privileges {
#body_browse_foreigners { #body_browse_foreigners {
background-color: <?php echo $cfg['LeftBgColor']; ?>; background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
margin: 5px 5px 0 5px; margin: 0.5em 0.5em 0 0.5em;
} }
#bodyquerywindow { #bodyquerywindow {
background-color: <?php echo $cfg['LeftBgColor']; ?>; background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
} }
#bodythemes { #bodythemes {
@@ -1069,7 +1062,7 @@ li#li_flush_privileges {
} }
#fieldset_select_fields { #fieldset_select_fields {
float: left; float: <?php echo $left; ?>;
} }
#selflink { #selflink {
@@ -1122,5 +1115,5 @@ li#li_flush_privileges {
label.desc { label.desc {
width: 30em; width: 30em;
float: left; float: <?php echo $left; ?>;
} }

View File

@@ -2,7 +2,5 @@
/* $Id$ */ /* $Id$ */
/* Theme information */ /* Theme information */
$theme_name = 'Darkblue/orange'; $theme_name = 'Darkblue/orange';
$theme_version = 2; $theme_full_version = '2.8';
$theme_generation = 2;
$theme_full_version = '2.7.1.0';
?> ?>

View File

@@ -7,23 +7,33 @@
/** /**
* navi frame * navi frame
*/ */
$GLOBALS['cfg']['LeftWidth'] = 180; // navi frame width // navi frame width
/* colors */ $GLOBALS['cfg']['NaviWidth'] = 180;
$GLOBALS['cfg']['LeftColor'] = '#ffffff'; // foreground (text) color for the navi frame
$GLOBALS['cfg']['LeftBgColor'] = '#666699'; // background color for the navi frame // foreground (text) color for the navi frame
$GLOBALS['cfg']['LeftPointerColor'] = '#9999CC'; // color of the pointer in navi frame $GLOBALS['cfg']['NaviColor'] = '#ffffff';
// background for the navi frame
$GLOBALS['cfg']['NaviBackground'] = '#666699';
// color of the pointer in navi frame
$GLOBALS['cfg']['NaviPointerColor'] = '#9999CC';
/** /**
* main frame * main frame
*/ */
$GLOBALS['cfg']['RightColor'] = '#000000'; // foreground (text) color for the Main frame // foreground (text) color for the main frame
$GLOBALS['cfg']['RightBgColor'] = '#FFFFFF'; // background color for the Main frame $GLOBALS['cfg']['MainColor'] = '#000000';
/** // background for the main frame
* path to a background image for the Main frame $GLOBALS['cfg']['MainBackground'] = '#FFFFFF';
* (leave blank for no background image) //$GLOBALS['cfg']['MainBackground'] = 'url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png)';
*/
$GLOBALS['cfg']['RightBgImage'] = ''; // color of the pointer in browse mode
$GLOBALS['cfg']['BrowsePointerColor'] = '#CCFFCC';
// color of the marker (visually marks row by clicking on it) in browse mode
$GLOBALS['cfg']['BrowseMarkerColor'] = '#FFCC99';
/** /**
* fonts * fonts
@@ -37,34 +47,41 @@ $GLOBALS['cfg']['FontFamily'] = 'Verdana, Arial, Helvetica, sans-serif'
/** /**
* fixed width font family, used in textarea * fixed width font family, used in textarea
*/ */
$GLOBALS['cfg']['FontFamilyFixed'] = ''; $GLOBALS['cfg']['FontFamilyFixed'] = 'monospace';
/** /**
* font size as a valid css font size value, * font size as a valid css font size value,
* 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'] = '10px'; $GLOBALS['cfg']['FontSize'] = '8pt';
/** /**
* tables * tables
*/ */
$GLOBALS['cfg']['Border'] = 0; // border width on tables // border
$GLOBALS['cfg']['ThBgcolor'] = '#ff9900'; // table header row colour $GLOBALS['cfg']['Border'] = 0;
$GLOBALS['cfg']['BgcolorOne'] = '#E5E5E5'; // table data row colour // table header and footer color
$GLOBALS['cfg']['BgcolorTwo'] = '#D5D5D5'; // table data row colour, alternate $GLOBALS['cfg']['ThBackground'] = '#ff9900 url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'tbl_th.png) repeat-x top';
$GLOBALS['cfg']['BrowsePointerColor'] = '#CCFFCC'; // color of the pointer in browse mode // table header and footer background
$GLOBALS['cfg']['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row $GLOBALS['cfg']['ThColor'] = '#000000';
// by clicking on it) in browse mode // table data row background
$GLOBALS['cfg']['BgOne'] = '#E5E5E5';
// table data row background, alternate
$GLOBALS['cfg']['BgTwo'] = '#D5D5D5';
/** /**
* query window * query window
*/ */
$GLOBALS['cfg']['QueryWindowWidth'] = 600; // Width of Query window // Width of Query window
$GLOBALS['cfg']['QueryWindowHeight'] = 400; // Height of Query window $GLOBALS['cfg']['QueryWindowWidth'] = 600;
// Height of Query window
$GLOBALS['cfg']['QueryWindowHeight'] = 400;
/** /**
* SQL Parser Settings * SQL Parser Settings
* Syntax colouring data
*/ */
$GLOBALS['cfg']['SQP']['fmtColor'] = array( // Syntax colouring data $GLOBALS['cfg']['SQP']['fmtColor'] = array(
'comment' => '#808000', 'comment' => '#808000',
'comment_mysql' => '', 'comment_mysql' => '',
'comment_ansi' => '', 'comment_ansi' => '',

View File

@@ -19,9 +19,11 @@ select, input, textarea {
} }
<?php } ?> <?php } ?>
body, table, tbody, tr, td { body {
background-color: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>; background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['LeftColor']; ?>; color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin: 0;
padding: 0.2em 0.2em 0.2em 0.2em;
} }
a img { a img {
@@ -35,8 +37,6 @@ form {
} }
select { select {
background-color: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
color: <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
width: 100%; width: 100%;
} }
@@ -57,10 +57,6 @@ button {
margin-left: 0.3em; margin-left: 0.3em;
} }
img.lightbulb {
cursor: pointer;
}
/******************************************************************************/ /******************************************************************************/
/* specific elements */ /* specific elements */
@@ -69,7 +65,7 @@ div#pmalogo,
div#leftframelinks, div#leftframelinks,
div#databaseList { div#databaseList {
text-align: center; text-align: center;
border-bottom: 0.05em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>; border-bottom: 0.05em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin-bottom: 0.5em; margin-bottom: 0.5em;
padding-bottom: 0.5em; padding-bottom: 0.5em;
} }
@@ -82,11 +78,11 @@ div#leftframelinks .icon {
div#leftframelinks a img.icon { div#leftframelinks a img.icon {
margin: 0; margin: 0;
padding: 0.2em; padding: 0.2em;
border: 0.05em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>; border: 0.05em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
} }
div#leftframelinks a:hover { div#leftframelinks a:hover {
background-color: <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>; background-color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
} }
/* leftdatabaselist */ /* leftdatabaselist */
@@ -96,7 +92,7 @@ div#left_tableList ul {
margin: 0; margin: 0;
padding: 0; padding: 0;
font-size: 80%; font-size: 80%;
background-color: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>; background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
} }
div#left_tableList ul ul { div#left_tableList ul ul {
@@ -104,12 +100,12 @@ div#left_tableList ul ul {
} }
div#left_tableList a { div#left_tableList a {
color: #333399; color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
text-decoration: none; text-decoration: none;
} }
div#left_tableList a:hover { div#left_tableList a:hover {
color: #FF0000; color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
text-decoration: underline; text-decoration: underline;
} }
@@ -121,7 +117,7 @@ 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']['LeftPointerColor']; ?>; background-color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
} }
<?php } ?> <?php } ?>
@@ -133,7 +129,7 @@ div#left_tableList img {
div#left_tableList ul ul { div#left_tableList ul ul {
margin-left: 0; margin-left: 0;
padding-left: 0.1em; padding-left: 0.1em;
border-left: 0.1em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>; border-left: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
padding-bottom: 0.1em; padding-bottom: 0.1em;
border-bottom: 0.1em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>; border-bottom: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
} }

View File

@@ -2,7 +2,6 @@
body, table, th, td { body, table, th, td {
color: #000000; color: #000000;
background-color: #ffffff; background-color: #ffffff;
font-size: 8pt;
} }
img { img {

View File

@@ -24,12 +24,10 @@ select, input, textarea {
<?php } ?> <?php } ?>
body { body {
margin: 0.5em;
padding: 0; padding: 0;
color: <?php echo $GLOBALS['cfg']['RightColor']; ?>; margin: 0.5em;
background-image: <?php echo $GLOBALS['cfg']['RightBgImage']; ?>; color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
background-repeat: repeat-y; background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
background-color: <?php echo $GLOBALS['cfg']['RightBgColor']; ?>;
} }
h1 { h1 {
@@ -68,8 +66,8 @@ dfn:hover {
th { th {
font-weight: bold; font-weight: bold;
color: <?php echo $GLOBALS['cfg']['RightColor']; ?>; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
background-color: <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>; background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
} }
a img { a img {
@@ -77,8 +75,8 @@ a img {
} }
hr { hr {
color: <?php echo $GLOBALS['cfg']['RightColor']; ?>; color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
background-color: <?php echo $GLOBALS['cfg']['RightColor']; ?>; background-color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
border: 0; border: 0;
height: 1px; height: 1px;
} }
@@ -96,9 +94,9 @@ textarea {
fieldset { fieldset {
margin-top: 1em; margin-top: 1em;
border: <?php echo $GLOBALS['cfg']['RightColor']; ?> solid 1px; border: <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;
padding: 0.5em; padding: 0.5em;
background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>; background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
} }
fieldset fieldset { fieldset fieldset {
@@ -137,14 +135,14 @@ button {
fieldset.tblFooters { fieldset.tblFooters {
margin-top: 0; margin-top: 0;
margin-bottom: 0.5em; margin-bottom: 0.5em;
text-align: right; text-align: <?php echo $right; ?>;
float: none; float: none;
clear: both; clear: both;
} }
fieldset .formelement { fieldset .formelement {
float: left; float: <?php echo $left; ?>;
margin-right: 0.5em; margin-<?php echo $right; ?>: 0.5em;
/* IE */ /* IE */
white-space: nowrap; white-space: nowrap;
} }
@@ -162,15 +160,15 @@ button.mult_submit {
/* odd table rows 1,3,5,7,... */ /* odd table rows 1,3,5,7,... */
table tr.odd th, table tr.odd th,
table tr.odd { table tr.odd {
background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>; background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
text-align: left; text-align: <?php echo $left; ?>;
} }
/* even table rows 2,4,6,8,... */ /* even table rows 2,4,6,8,... */
table tr.even th, table tr.even th,
table tr.even { table tr.even {
background-color: <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>; background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
text-align: left; text-align: <?php echo $left; ?>;
} }
/* marked tbale rows */ /* marked tbale rows */
@@ -190,7 +188,7 @@ table tr.hover {
} }
table .value { table .value {
text-align: right; text-align: <?php echo $right; ?>;
white-space: nowrap; white-space: nowrap;
} }
/* IE doesnt handles 'pre' right */ /* IE doesnt handles 'pre' right */
@@ -198,9 +196,12 @@ table [class=value] {
white-space: pre; white-space: pre;
} }
<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
.value { .value {
font-family: "Courier New", Courier, monospace; font-family: <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
} }
<?php } ?>
.value .attention { .value .attention {
color: red; color: red;
font-weight: bold; font-weight: bold;
@@ -237,10 +238,6 @@ img.lightbulb {
border: 1px dashed #000000; border: 1px dashed #000000;
} }
.print {
font-size: 8pt;
}
/* MySQL Parser */ /* MySQL Parser */
.syntax { .syntax {
font-size: 80%; font-size: 80%;
@@ -441,14 +438,14 @@ fieldset.confirmation legend {
.tblHeaders { .tblHeaders {
font-weight: bold; font-weight: bold;
color: <?php echo $GLOBALS['cfg']['RightColor']; ?>; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
background-color: <?php echo $GLOBALS['cfg']['ThBgColor']; ?>; background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
} }
.tblFooters { .tblFooters {
font-weight: normal; font-weight: normal;
color: <?php echo $GLOBALS['cfg']['RightColor']; ?>; color: <?php echo $GLOBALS['cfg']['ThColor']; ?>;
background-color: <?php echo $GLOBALS['cfg']['ThBgColor']; ?>; background: <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
} }
@@ -481,6 +478,7 @@ fieldset.confirmation legend {
} }
.disabled a:hover { .disabled a:hover {
color: #666666;
text-decoration: none; text-decoration: none;
} }
@@ -499,11 +497,12 @@ body.loginform a.logo {
} }
form.login label { form.login label {
float: left; float: <?php echo $left; ?>;
width: 10em; width: 10em;
font-weight: bolder; font-weight: bolder;
} }
/******************************************************************************/ /******************************************************************************/
/* specific elements */ /* specific elements */
@@ -516,7 +515,7 @@ ul#topmenu {
} }
ul#topmenu li { ul#topmenu li {
float: left; float: <?php echo $left; ?>;
margin: 0; margin: 0;
padding: 0; padding: 0;
vertical-align: middle; vertical-align: middle;
@@ -524,7 +523,7 @@ ul#topmenu li {
#topmenu img { #topmenu img {
vertical-align: middle; vertical-align: middle;
margin-right: 0.1em; margin-<?php echo $right; ?>: 0.1em;
} }
/* default tab styles */ /* default tab styles */
@@ -571,8 +570,8 @@ ul#topmenu li {
/* default tab styles */ /* default tab styles */
.tab, .tabcaution, .tabactive { .tab, .tabcaution, .tabactive {
background-color: #E5E5E5; background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
border: 1pt solid #D5D5D5; border: 1pt solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
border-bottom: 0; border-bottom: 0;
border-radius-topleft: 0.4em; border-radius-topleft: 0.4em;
border-radius-topright: 0.4em; border-radius-topright: 0.4em;
@@ -592,7 +591,7 @@ a.tabcaution:hover,
a.tab:hover, a.tab:hover,
.tabactive { .tabactive {
background-color: #D5D5D5; background-color: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
} }
/* disabled drop/empty tabs */ /* disabled drop/empty tabs */
@@ -644,13 +643,13 @@ div#tablestatistics {
} }
div#tablestatistics table { div#tablestatistics table {
float: left; float: <?php echo $left; ?>;
margin-bottom: 0.5em; margin-bottom: 0.5em;
margin-right: 0.5em; margin-<?php echo $right; ?>: 0.5em;
} }
div#tablestatistics table caption { div#tablestatistics table caption {
margin-right: 0.5em; margin-<?php echo $right; ?>: 0.5em;
} }
/* END table stats */ /* END table stats */
@@ -690,7 +689,7 @@ div#tablestatistics table caption {
width: 95%; width: 95%;
height: 95%; height: 95%;
font-family: "Courier New", Courier, mono; font-family: "Courier New", Courier, mono;
font-size: 12px; font-size: 110%;
} }
#TooltipContainer { #TooltipContainer {
@@ -714,12 +713,12 @@ div#tablestatistics table caption {
} }
#fieldset_add_user_login label { #fieldset_add_user_login label {
float: left; float: <?php echo $left; ?>;
display: block; display: block;
width: 10em; width: 10em;
max-width: 100%; max-width: 100%;
text-align: right; text-align: <?php echo $right; ?>;
padding-right: 0.5em; padding-<?php echo $right; ?>: 0.5em;
} }
#fieldset_add_user_login span.options #select_pred_username, #fieldset_add_user_login span.options #select_pred_username,
@@ -730,16 +729,16 @@ div#tablestatistics table caption {
} }
#fieldset_add_user_login span.options { #fieldset_add_user_login span.options {
float: left; float: <?php echo $left; ?>;
display: block; display: block;
width: 12em; width: 12em;
max-width: 100%; max-width: 100%;
padding-right: 0.5em; padding-<?php echo $right; ?>: 0.5em;
} }
#fieldset_add_user_login input { #fieldset_add_user_login input {
width: 12em; width: 12em;
clear: right; clear: <?php echo $right; ?>;
max-width: 100%; max-width: 100%;
} }
@@ -748,7 +747,7 @@ div#tablestatistics table caption {
} }
#fieldset_user_priv div.item { #fieldset_user_priv div.item {
float: left; float: <?php echo $left; ?>;
width: 9em; width: 9em;
max-width: 100%; max-width: 100%;
} }
@@ -766,20 +765,20 @@ div#tablestatistics table caption {
} }
#fieldset_user_global_rights fieldset { #fieldset_user_global_rights fieldset {
float: left; float: <?php echo $left; ?>;
} }
/* END user privileges */ /* END user privileges */
/* serverstatus */ /* serverstatus */
div#serverstatus table caption a.top { div#serverstatus table caption a.top {
float: right; float: <?php echo $right; ?>;
} }
div#serverstatus div#serverstatusqueriesdetails table, div#serverstatus div#serverstatusqueriesdetails table,
div#serverstatus table#serverstatustraffic, div#serverstatus table#serverstatustraffic,
div#serverstatus table#serverstatusconnections { div#serverstatus table#serverstatusconnections {
float: left; float: <?php echo $left; ?>;
} }
#serverstatussection, #serverstatussection,
@@ -838,13 +837,13 @@ div#querywindowcontainer fieldset {
/* querybox */ /* querybox */
div#sqlquerycontainer { div#sqlquerycontainer {
float: left; float: <?php echo $left; ?>;
width: 69%; width: 69%;
/* height: 15em; */ /* height: 15em; */
} }
div#tablefieldscontainer { div#tablefieldscontainer {
float: right; float: <?php echo $right; ?>;
width: 29%; width: 29%;
/* height: 15em; */ /* height: 15em; */
} }
@@ -988,12 +987,12 @@ li#li_flush_privileges {
#body_browse_foreigners { #body_browse_foreigners {
background-color: <?php echo $cfg['LeftBgColor']; ?>; background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
margin: 5px 5px 0 5px; margin: 0.5em 0.5em 0 0.5em;
} }
#bodyquerywindow { #bodyquerywindow {
background-color: <?php echo $cfg['LeftBgColor']; ?>; background: <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
} }
#bodythemes { #bodythemes {
@@ -1011,7 +1010,7 @@ li#li_flush_privileges {
} }
#fieldset_select_fields { #fieldset_select_fields {
float: left; float: <?php echo $left; ?>;
} }
#selflink { #selflink {
@@ -1064,5 +1063,5 @@ li#li_flush_privileges {
label.desc { label.desc {
width: 30em; width: 30em;
float: left; float: <?php echo $left; ?>;
} }

View File

@@ -2,7 +2,5 @@
/* $Id$ */ /* $Id$ */
/* Theme information */ /* Theme information */
$theme_name = 'Original'; $theme_name = 'Original';
$theme_version = 2; $theme_full_version = '2.8';
$theme_generation = 2;
$theme_full_version = '2.7.1.0';
?> ?>

View File

@@ -7,23 +7,33 @@
/** /**
* navi frame * navi frame
*/ */
$GLOBALS['cfg']['LeftWidth'] = 200; // navi frame width // navi frame width
/* colors */ $GLOBALS['cfg']['NaviWidth'] = 200;
$GLOBALS['cfg']['LeftColor'] = '#000000'; // foreground (text) color for the navi frame
$GLOBALS['cfg']['LeftBgColor'] = '#D0DCE0'; // background color for the navi frame // foreground (text) color for the navi frame
$GLOBALS['cfg']['LeftPointerColor'] = '#CCFFCC'; // color of the pointer in navi frame $GLOBALS['cfg']['NaviColor'] = '#000000';
// background for the navi frame
$GLOBALS['cfg']['NaviBackground'] = '#D0DCE0';
// color of the pointer in navi frame
$GLOBALS['cfg']['NaviPointerColor'] = '#CCFFCC';
/** /**
* main frame * main frame
*/ */
$GLOBALS['cfg']['RightColor'] = '#000000'; // foreground (text) color for the Main frame // foreground (text) color for the main frame
$GLOBALS['cfg']['RightBgColor'] = '#F5F5F5'; // background color for the Main frame $GLOBALS['cfg']['MainColor'] = '#000000';
/** // background for the main frame
* path to a background image for the Main frame $GLOBALS['cfg']['MainBackground'] = '#F5F5F5';
* (leave blank for no background image) //$GLOBALS['cfg']['MainBackground'] = 'url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png)';
*/
$GLOBALS['cfg']['RightBgImage'] = 'url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png)'; // color of the pointer in browse mode
$GLOBALS['cfg']['BrowsePointerColor'] = '#CCFFCC';
// color of the marker (visually marks row by clicking on it) in browse mode
$GLOBALS['cfg']['BrowseMarkerColor'] = '#FFCC99';
/** /**
* fonts * fonts
@@ -33,38 +43,45 @@ $GLOBALS['cfg']['RightBgImage'] = 'url(../' . $_SESSION['PMA_Theme']->ge
* 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'] = ''; $GLOBALS['cfg']['FontFamily'] = '';
/** /**
* fixed width font family, used in textarea * fixed width font family, used in textarea
*/ */
$GLOBALS['cfg']['FontFamilyFixed'] = ''; $GLOBALS['cfg']['FontFamilyFixed'] = 'monospace';
/** /**
* font size as a valid css font size value, * font size as a valid css font size value,
* 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
*/ */
$GLOBALS['cfg']['Border'] = 0; // border width on tables // border
$GLOBALS['cfg']['ThBgcolor'] = '#D3DCE3'; // table header row colour $GLOBALS['cfg']['Border'] = 0;
$GLOBALS['cfg']['BgcolorOne'] = '#E5E5E5'; // table data row colour // table header and footer color
$GLOBALS['cfg']['BgcolorTwo'] = '#D5D5D5'; // table data row colour, alternate $GLOBALS['cfg']['ThBackground'] = '#D3DCE3';
$GLOBALS['cfg']['BrowsePointerColor'] = '#CCFFCC'; // color of the pointer in browse mode // table header and footer background
$GLOBALS['cfg']['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row $GLOBALS['cfg']['ThColor'] = '#000000';
// by clicking on it) in browse mode // table data row background
$GLOBALS['cfg']['BgOne'] = '#E5E5E5';
// table data row background, alternate
$GLOBALS['cfg']['BgTwo'] = '#D5D5D5';
/** /**
* query window * query window
*/ */
$GLOBALS['cfg']['QueryWindowWidth'] = 600; // Width of Query window // Width of Query window
$GLOBALS['cfg']['QueryWindowHeight'] = 400; // Height of Query window $GLOBALS['cfg']['QueryWindowWidth'] = 600;
// Height of Query window
$GLOBALS['cfg']['QueryWindowHeight'] = 400;
/** /**
* SQL Parser Settings * SQL Parser Settings
* Syntax colouring data
*/ */
$GLOBALS['cfg']['SQP']['fmtColor'] = array( // Syntax colouring data $GLOBALS['cfg']['SQP']['fmtColor'] = array(
'comment' => '#808000', 'comment' => '#808000',
'comment_mysql' => '', 'comment_mysql' => '',
'comment_ansi' => '', 'comment_ansi' => '',