diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php index d9aec6615..092109357 100644 --- a/css/phpmyadmin.css.php +++ b/css/phpmyadmin.css.php @@ -3,11 +3,11 @@ // vim: expandtab sw=4 ts=4 sts=4: chdir('..'); -define( 'PMA_MINIMUM_COMMON', TRUE ); -require_once('./libraries/common.lib.php'); -require_once('./libraries/sqlparser.lib.php'); +define('PMA_MINIMUM_COMMON', true); +require_once './libraries/common.lib.php'; +require_once './libraries/sqlparser.lib.php'; -if ( $GLOBALS['text_dir'] === 'ltr' ) { +if ($GLOBALS['text_dir'] === 'ltr') { $right = 'right'; $left = 'left'; } else { @@ -29,7 +29,7 @@ div.nowrap { } checkVersion( '2.7.0' ) ) { +if ($_SESSION['PMA_Theme']->checkVersion('2.7.0')) { ?> form { @@ -75,7 +75,7 @@ div#tablestatistics { } div#tablestatistics table { - float: left; + float: ; margin-bottom: 0.5em; margin-right: 0.5em; } @@ -124,7 +124,7 @@ div#left_tableList li { white-space: nowrap; } - + div#left_tableList li:hover { background-color: ; } @@ -315,7 +315,7 @@ a.tabcaution:hover { background-color: #FF0000; } - + /* active tab */ a.tabactive { color: black; @@ -471,7 +471,7 @@ img.lightbulb { checkVersion( '2.7.1' ) ) { +if ($_SESSION['PMA_Theme']->checkVersion('2.7.1')) { ?> /********************/ @@ -516,7 +516,7 @@ form.login label { /* END main page */ - + /* iconic view for ul items */ li#li_create_database { list-style-image: url(..//original/img/b_newdb.png); @@ -689,16 +689,18 @@ li#li_flush_privileges { float: ; } checkVersion( '2.9' ) ) { +if ($_SESSION['PMA_Theme']->checkVersion('2.9')) { ?> /********************/ /* NEW in PMA 2.9 */ /********************/ - + div#left_tableList li.marked { background-color: ; } @@ -706,12 +708,12 @@ div#left_tableList li.marked { /* odd items 1,3,5,7,... */ .odd { - background-color: ; + background: ; } /* even items 2,4,6,8,... */ .even { - background-color: ; + background: ; } /* marked items */ @@ -738,10 +740,10 @@ th.condition { label.desc { width: 30em; - float: left; + float: ; } loadCss( $_REQUEST['js_frame'] ); +$_SESSION['PMA_Theme_Manager']->printCss($_REQUEST['js_frame']); ?> diff --git a/index.php b/index.php index 141dcd053..034c553fb 100644 --- a/index.php +++ b/index.php @@ -11,7 +11,7 @@ * @uses $GLOBALS['cfg']['Server']['user'] * @uses $GLOBALS['cfg']['DefaultTabServer'] 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) * or common.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') { echo '*,'; } -echo $GLOBALS['cfg']['LeftWidth']; +echo $GLOBALS['cfg']['NaviWidth']; if ($GLOBALS['text_dir'] === 'ltr') { echo ',*'; } diff --git a/libraries/common.lib.php b/libraries/common.lib.php index b65a04d96..8ef0c59d8 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -3009,9 +3009,14 @@ $GLOBALS['pmaThemeImage'] = $_SESSION['PMA_Theme']->getImgPath(); */ if (@file_exists($_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. */ diff --git a/themes/darkblue_orange/css/theme_right.css.php b/themes/darkblue_orange/css/theme_right.css.php index 5b5a6fe49..d57037c1c 100644 --- a/themes/darkblue_orange/css/theme_right.css.php +++ b/themes/darkblue_orange/css/theme_right.css.php @@ -24,10 +24,10 @@ select, input, textarea { body { - margin: 5px; - color: ; - background-color: ; - + padding: 0; + margin: 0.5em; + color: ; + background: ; } h1 { @@ -73,18 +73,14 @@ dfn:hover { th { font-weight: bold; - color: ; - background-color: ; - background-image: url(..//darkblue_orange/img/tbl_th.png); - background-repeat: repeat-x; - background-position: top; - height: 18px; + color: ; + background: ; } th a:link, th a:active, th a:visited { - color: ; + color: ; text-decoration: underline; } @@ -107,6 +103,7 @@ hr { form { padding: 0; margin: 0; + display: inline; } textarea { @@ -127,7 +124,7 @@ fieldset fieldset { fieldset legend { color: #666699; font-weight: bold; - background-color: ; + background: ; padding: 2px 2px 2px 2px; } @@ -159,14 +156,14 @@ button { fieldset.tblFooters { margin-top: 0; margin-bottom: 0.5em; - text-align: right; + text-align: ; float: none; clear: both; } fieldset .formelement { - float: left; - margin-right: 0.5em; + float: ; + margin-: 0.5em; /* IE */ white-space: nowrap; } @@ -185,16 +182,16 @@ button.mult_submit { table tr.odd th, table tr.odd { background-image: none; - background-color: ; - text-align: left; + background: ; + text-align: ; } /* even table rows 2,4,6,8,... */ table tr.even th, table tr.even { background-image: none; - background-color: ; - text-align: left; + background: ; + text-align: ; } /* marked tbale rows */ @@ -214,7 +211,7 @@ table tr.hover { } table .value { - text-align: right; + text-align: ; white-space: nowrap; } /* IE doesnt handles 'pre' right */ @@ -222,9 +219,12 @@ table [class=value] { white-space: pre; } + + .value { - font-family: "Courier New", Courier, monospace; + font-family: ; } + .value .attention { color: red; font-weight: bold; @@ -261,10 +261,6 @@ img.lightbulb { border: 1px dashed #000000; } -.print { - font-size: 8pt; -} - /* MySQL Parser */ .syntax { } @@ -350,6 +346,7 @@ h1.notice, div.notice { margin: 0.5em 0 0.5em 0; border: 0.1em solid #FFD700; + width: 90%; background-image: url(../getImgPath(); ?>s_notice.png); background-repeat: no-repeat; @@ -381,7 +378,6 @@ div.warning { margin: 0.5em 0 0.5em 0; border: 0.1em solid #CC0000; width: 90%; - background-image: url(../getImgPath(); ?>s_warn.png); background-repeat: no-repeat; @@ -466,21 +462,15 @@ fieldset.confirmation legend { .tblHeaders { font-weight: bold; - color: #ffffff; - background-color: #666699; - background-image: url(..//darkblue_orange/img/tbl_header.png); - background-repeat: repeat-x; - background-position: top; - height: 18px; + color: ; + background: ; } .tblFooters { font-weight: normal; - color: #ffffff; - background-color: #666699; - background-image: url(..//darkblue_orange/img/tbl_header.png); - background-repeat: repeat-x; - background-position: top; + color: ; + background: ; + } .tblHeaders a:link, @@ -523,6 +513,9 @@ td.disabled { background-color: #cccccc; } +/** + * login form + */ body.loginform h1, body.loginform a.logo { display: block; @@ -530,7 +523,7 @@ body.loginform a.logo { } form.login label { - float: left; + float: ; width: 10em; font-weight: bolder; } @@ -548,7 +541,7 @@ ul#topmenu { } ul#topmenu li { - float: left; + float: ; margin: 0; padding: 0; vertical-align: middle; @@ -556,7 +549,7 @@ ul#topmenu li { #topmenu img { vertical-align: middle; - margin-right: 0.1em; + margin-: 0.1em; } /* default tab styles */ @@ -603,8 +596,8 @@ ul#topmenu li { /* default tab styles */ .tab, .tabcaution, .tabactive { - background-color: ; - border: 1pt solid ; + background-color: ; + border: 1pt solid ; border-bottom: 0; border-radius-topleft: 0.4em; border-radius-topright: 0.4em; @@ -624,7 +617,7 @@ a.tabcaution:hover, a.tab:hover, .tabactive { - background-color: ; + background-color: ; } /* disabled drop/empty tabs */ @@ -676,13 +669,13 @@ div#tablestatistics { } div#tablestatistics table { - float: left; + float: ; margin-bottom: 0.5em; - margin-right: 0.5em; + margin-: 0.5em; } div#tablestatistics table caption { - margin-right: 0.5em; + margin-: 0.5em; } /* END table stats */ @@ -772,12 +765,12 @@ div#tablestatistics table caption { } #fieldset_add_user_login label { - float: left; + float: ; display: block; width: 10em; max-width: 100%; - text-align: right; - padding-right: 0.5em; + text-align: ; + padding-: 0.5em; } #fieldset_add_user_login span.options #select_pred_username, @@ -788,16 +781,16 @@ div#tablestatistics table caption { } #fieldset_add_user_login span.options { - float: left; + float: ; display: block; width: 12em; max-width: 100%; - padding-right: 0.5em; + padding-: 0.5em; } #fieldset_add_user_login input { width: 12em; - clear: right; + clear: ; max-width: 100%; } @@ -806,8 +799,8 @@ div#tablestatistics table caption { } #fieldset_user_priv div.item { - float: left; - width: 8em; + float: ; + width: 9em; max-width: 100%; } @@ -824,20 +817,20 @@ div#tablestatistics table caption { } #fieldset_user_global_rights fieldset { - float: left; + float: ; } /* END user privileges */ /* serverstatus */ div#serverstatus table caption a.top { - float: right; + float: ; } div#serverstatus div#serverstatusqueriesdetails table, div#serverstatus table#serverstatustraffic, div#serverstatus table#serverstatusconnections { - float: left; + float: ; } #serverstatussection, @@ -896,13 +889,13 @@ div#querywindowcontainer fieldset { /* querybox */ div#sqlquerycontainer { - float: left; + float: ; width: 69%; /* height: 15em; */ } div#tablefieldscontainer { - float: right; + float: ; width: 29%; /* height: 15em; */ } @@ -1046,12 +1039,12 @@ li#li_flush_privileges { #body_browse_foreigners { - background-color: ; - margin: 5px 5px 0 5px; + background: ; + margin: 0.5em 0.5em 0 0.5em; } #bodyquerywindow { - background-color: ; + background: ; } #bodythemes { @@ -1069,7 +1062,7 @@ li#li_flush_privileges { } #fieldset_select_fields { - float: left; + float: ; } #selflink { @@ -1122,5 +1115,5 @@ li#li_flush_privileges { label.desc { width: 30em; - float: left; + float: ; } diff --git a/themes/darkblue_orange/info.inc.php b/themes/darkblue_orange/info.inc.php index e721a0ce6..d4b4846ad 100644 --- a/themes/darkblue_orange/info.inc.php +++ b/themes/darkblue_orange/info.inc.php @@ -2,7 +2,5 @@ /* $Id$ */ /* Theme information */ $theme_name = 'Darkblue/orange'; -$theme_version = 2; -$theme_generation = 2; -$theme_full_version = '2.7.1.0'; +$theme_full_version = '2.8'; ?> diff --git a/themes/darkblue_orange/layout.inc.php b/themes/darkblue_orange/layout.inc.php index 54e581ccf..63f103246 100644 --- a/themes/darkblue_orange/layout.inc.php +++ b/themes/darkblue_orange/layout.inc.php @@ -7,23 +7,33 @@ /** * navi frame */ -$GLOBALS['cfg']['LeftWidth'] = 180; // navi frame width -/* colors */ -$GLOBALS['cfg']['LeftColor'] = '#ffffff'; // foreground (text) color for the navi frame -$GLOBALS['cfg']['LeftBgColor'] = '#666699'; // background color for the navi frame -$GLOBALS['cfg']['LeftPointerColor'] = '#9999CC'; // color of the pointer in navi frame +// navi frame width +$GLOBALS['cfg']['NaviWidth'] = 180; + +// foreground (text) color for the 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 */ -$GLOBALS['cfg']['RightColor'] = '#000000'; // foreground (text) color for the Main frame -$GLOBALS['cfg']['RightBgColor'] = '#FFFFFF'; // background color for the Main frame +// foreground (text) color for the main frame +$GLOBALS['cfg']['MainColor'] = '#000000'; -/** - * path to a background image for the Main frame - * (leave blank for no background image) - */ -$GLOBALS['cfg']['RightBgImage'] = ''; +// background for the main frame +$GLOBALS['cfg']['MainBackground'] = '#FFFFFF'; +//$GLOBALS['cfg']['MainBackground'] = '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 @@ -37,34 +47,41 @@ $GLOBALS['cfg']['FontFamily'] = 'Verdana, Arial, Helvetica, sans-serif' /** * fixed width font family, used in textarea */ -$GLOBALS['cfg']['FontFamilyFixed'] = ''; +$GLOBALS['cfg']['FontFamilyFixed'] = 'monospace'; /** * font size as a valid css font size value, * if not set the browser default will be used * (depending on browser, DTD and system settings) */ -$GLOBALS['cfg']['FontSize'] = '10px'; +$GLOBALS['cfg']['FontSize'] = '8pt'; /** * tables */ -$GLOBALS['cfg']['Border'] = 0; // border width on tables -$GLOBALS['cfg']['ThBgcolor'] = '#ff9900'; // table header row colour -$GLOBALS['cfg']['BgcolorOne'] = '#E5E5E5'; // table data row colour -$GLOBALS['cfg']['BgcolorTwo'] = '#D5D5D5'; // table data row colour, alternate -$GLOBALS['cfg']['BrowsePointerColor'] = '#CCFFCC'; // color of the pointer in browse mode -$GLOBALS['cfg']['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row - // by clicking on it) in browse mode +// border +$GLOBALS['cfg']['Border'] = 0; +// table header and footer color +$GLOBALS['cfg']['ThBackground'] = '#ff9900 url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'tbl_th.png) repeat-x top'; +// table header and footer background +$GLOBALS['cfg']['ThColor'] = '#000000'; +// table data row background +$GLOBALS['cfg']['BgOne'] = '#E5E5E5'; +// table data row background, alternate +$GLOBALS['cfg']['BgTwo'] = '#D5D5D5'; + /** * query window */ -$GLOBALS['cfg']['QueryWindowWidth'] = 600; // Width of Query window -$GLOBALS['cfg']['QueryWindowHeight'] = 400; // Height of Query window +// Width of Query window +$GLOBALS['cfg']['QueryWindowWidth'] = 600; +// Height of Query window +$GLOBALS['cfg']['QueryWindowHeight'] = 400; /** * SQL Parser Settings + * Syntax colouring data */ -$GLOBALS['cfg']['SQP']['fmtColor'] = array( // Syntax colouring data +$GLOBALS['cfg']['SQP']['fmtColor'] = array( 'comment' => '#808000', 'comment_mysql' => '', 'comment_ansi' => '', diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php index 4097d11c3..ce114c82b 100644 --- a/themes/original/css/theme_left.css.php +++ b/themes/original/css/theme_left.css.php @@ -19,9 +19,11 @@ select, input, textarea { } -body, table, tbody, tr, td { - background-color: ; - color: ; +body { + background: ; + color: ; + margin: 0; + padding: 0.2em 0.2em 0.2em 0.2em; } a img { @@ -35,8 +37,6 @@ form { } select { - background-color: ; - color: ; width: 100%; } @@ -57,10 +57,6 @@ button { margin-left: 0.3em; } -img.lightbulb { - cursor: pointer; -} - /******************************************************************************/ /* specific elements */ @@ -69,7 +65,7 @@ div#pmalogo, div#leftframelinks, div#databaseList { text-align: center; - border-bottom: 0.05em solid ; + border-bottom: 0.05em solid ; margin-bottom: 0.5em; padding-bottom: 0.5em; } @@ -82,11 +78,11 @@ div#leftframelinks .icon { div#leftframelinks a img.icon { margin: 0; padding: 0.2em; - border: 0.05em solid ; + border: 0.05em solid ; } div#leftframelinks a:hover { - background-color: ; + background-color: ; } /* leftdatabaselist */ @@ -96,7 +92,7 @@ div#left_tableList ul { margin: 0; padding: 0; font-size: 80%; - background-color: ; + background: ; } div#left_tableList ul ul { @@ -104,12 +100,12 @@ div#left_tableList ul ul { } div#left_tableList a { - color: #333399; + color: ; text-decoration: none; } div#left_tableList a:hover { - color: #FF0000; + color: ; text-decoration: underline; } @@ -121,7 +117,7 @@ div#left_tableList li { div#left_tableList li:hover { - background-color: ; + background-color: ; } @@ -133,7 +129,7 @@ div#left_tableList img { div#left_tableList ul ul { margin-left: 0; padding-left: 0.1em; - border-left: 0.1em solid ; + border-left: 0.1em solid ; padding-bottom: 0.1em; - border-bottom: 0.1em solid ; + border-bottom: 0.1em solid ; } diff --git a/themes/original/css/theme_print.css.php b/themes/original/css/theme_print.css.php index 4ae50818c..0b385e6db 100644 --- a/themes/original/css/theme_print.css.php +++ b/themes/original/css/theme_print.css.php @@ -2,7 +2,6 @@ body, table, th, td { color: #000000; background-color: #ffffff; - font-size: 8pt; } img { diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php index f4c9ca8c7..659d33673 100644 --- a/themes/original/css/theme_right.css.php +++ b/themes/original/css/theme_right.css.php @@ -24,12 +24,10 @@ select, input, textarea { body { - margin: 0.5em; padding: 0; - color: ; - background-image: ; - background-repeat: repeat-y; - background-color: ; + margin: 0.5em; + color: ; + background: ; } h1 { @@ -68,8 +66,8 @@ dfn:hover { th { font-weight: bold; - color: ; - background-color: ; + color: ; + background: ; } a img { @@ -77,8 +75,8 @@ a img { } hr { - color: ; - background-color: ; + color: ; + background-color: ; border: 0; height: 1px; } @@ -96,9 +94,9 @@ textarea { fieldset { margin-top: 1em; - border: solid 1px; + border: solid 1px; padding: 0.5em; - background-color: ; + background: ; } fieldset fieldset { @@ -137,14 +135,14 @@ button { fieldset.tblFooters { margin-top: 0; margin-bottom: 0.5em; - text-align: right; + text-align: ; float: none; clear: both; } fieldset .formelement { - float: left; - margin-right: 0.5em; + float: ; + margin-: 0.5em; /* IE */ white-space: nowrap; } @@ -162,15 +160,15 @@ button.mult_submit { /* odd table rows 1,3,5,7,... */ table tr.odd th, table tr.odd { - background-color: ; - text-align: left; + background: ; + text-align: ; } /* even table rows 2,4,6,8,... */ table tr.even th, table tr.even { - background-color: ; - text-align: left; + background: ; + text-align: ; } /* marked tbale rows */ @@ -190,7 +188,7 @@ table tr.hover { } table .value { - text-align: right; + text-align: ; white-space: nowrap; } /* IE doesnt handles 'pre' right */ @@ -198,9 +196,12 @@ table [class=value] { white-space: pre; } + + .value { - font-family: "Courier New", Courier, monospace; + font-family: ; } + .value .attention { color: red; font-weight: bold; @@ -237,10 +238,6 @@ img.lightbulb { border: 1px dashed #000000; } -.print { - font-size: 8pt; -} - /* MySQL Parser */ .syntax { font-size: 80%; @@ -441,14 +438,14 @@ fieldset.confirmation legend { .tblHeaders { font-weight: bold; - color: ; - background-color: ; + color: ; + background: ; } .tblFooters { font-weight: normal; - color: ; - background-color: ; + color: ; + background: ; } @@ -481,6 +478,7 @@ fieldset.confirmation legend { } .disabled a:hover { + color: #666666; text-decoration: none; } @@ -499,11 +497,12 @@ body.loginform a.logo { } form.login label { - float: left; + float: ; width: 10em; font-weight: bolder; } + /******************************************************************************/ /* specific elements */ @@ -516,7 +515,7 @@ ul#topmenu { } ul#topmenu li { - float: left; + float: ; margin: 0; padding: 0; vertical-align: middle; @@ -524,7 +523,7 @@ ul#topmenu li { #topmenu img { vertical-align: middle; - margin-right: 0.1em; + margin-: 0.1em; } /* default tab styles */ @@ -571,8 +570,8 @@ ul#topmenu li { /* default tab styles */ .tab, .tabcaution, .tabactive { - background-color: #E5E5E5; - border: 1pt solid #D5D5D5; + background-color: ; + border: 1pt solid ; border-bottom: 0; border-radius-topleft: 0.4em; border-radius-topright: 0.4em; @@ -592,7 +591,7 @@ a.tabcaution:hover, a.tab:hover, .tabactive { - background-color: #D5D5D5; + background-color: ; } /* disabled drop/empty tabs */ @@ -644,13 +643,13 @@ div#tablestatistics { } div#tablestatistics table { - float: left; + float: ; margin-bottom: 0.5em; - margin-right: 0.5em; + margin-: 0.5em; } div#tablestatistics table caption { - margin-right: 0.5em; + margin-: 0.5em; } /* END table stats */ @@ -690,7 +689,7 @@ div#tablestatistics table caption { width: 95%; height: 95%; font-family: "Courier New", Courier, mono; - font-size: 12px; + font-size: 110%; } #TooltipContainer { @@ -714,12 +713,12 @@ div#tablestatistics table caption { } #fieldset_add_user_login label { - float: left; + float: ; display: block; width: 10em; max-width: 100%; - text-align: right; - padding-right: 0.5em; + text-align: ; + padding-: 0.5em; } #fieldset_add_user_login span.options #select_pred_username, @@ -730,16 +729,16 @@ div#tablestatistics table caption { } #fieldset_add_user_login span.options { - float: left; + float: ; display: block; width: 12em; max-width: 100%; - padding-right: 0.5em; + padding-: 0.5em; } #fieldset_add_user_login input { width: 12em; - clear: right; + clear: ; max-width: 100%; } @@ -748,7 +747,7 @@ div#tablestatistics table caption { } #fieldset_user_priv div.item { - float: left; + float: ; width: 9em; max-width: 100%; } @@ -766,20 +765,20 @@ div#tablestatistics table caption { } #fieldset_user_global_rights fieldset { - float: left; + float: ; } /* END user privileges */ /* serverstatus */ div#serverstatus table caption a.top { - float: right; + float: ; } div#serverstatus div#serverstatusqueriesdetails table, div#serverstatus table#serverstatustraffic, div#serverstatus table#serverstatusconnections { - float: left; + float: ; } #serverstatussection, @@ -838,13 +837,13 @@ div#querywindowcontainer fieldset { /* querybox */ div#sqlquerycontainer { - float: left; + float: ; width: 69%; /* height: 15em; */ } div#tablefieldscontainer { - float: right; + float: ; width: 29%; /* height: 15em; */ } @@ -988,12 +987,12 @@ li#li_flush_privileges { #body_browse_foreigners { - background-color: ; - margin: 5px 5px 0 5px; + background: ; + margin: 0.5em 0.5em 0 0.5em; } #bodyquerywindow { - background-color: ; + background: ; } #bodythemes { @@ -1011,7 +1010,7 @@ li#li_flush_privileges { } #fieldset_select_fields { - float: left; + float: ; } #selflink { @@ -1064,5 +1063,5 @@ li#li_flush_privileges { label.desc { width: 30em; - float: left; + float: ; } diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php index 88fc67530..914e86ac8 100644 --- a/themes/original/info.inc.php +++ b/themes/original/info.inc.php @@ -2,7 +2,5 @@ /* $Id$ */ /* Theme information */ $theme_name = 'Original'; -$theme_version = 2; -$theme_generation = 2; -$theme_full_version = '2.7.1.0'; +$theme_full_version = '2.8'; ?> diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index 4f706eb6d..4d9c70926 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -7,23 +7,33 @@ /** * navi frame */ -$GLOBALS['cfg']['LeftWidth'] = 200; // navi frame width -/* colors */ -$GLOBALS['cfg']['LeftColor'] = '#000000'; // foreground (text) color for the navi frame -$GLOBALS['cfg']['LeftBgColor'] = '#D0DCE0'; // background color for the navi frame -$GLOBALS['cfg']['LeftPointerColor'] = '#CCFFCC'; // color of the pointer in navi frame +// navi frame width +$GLOBALS['cfg']['NaviWidth'] = 200; + +// foreground (text) color for the 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 */ -$GLOBALS['cfg']['RightColor'] = '#000000'; // foreground (text) color for the Main frame -$GLOBALS['cfg']['RightBgColor'] = '#F5F5F5'; // background color for the Main frame +// foreground (text) color for the main frame +$GLOBALS['cfg']['MainColor'] = '#000000'; -/** - * path to a background image for the Main frame - * (leave blank for no background image) - */ -$GLOBALS['cfg']['RightBgImage'] = 'url(../' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png)'; +// background for the main frame +$GLOBALS['cfg']['MainBackground'] = '#F5F5F5'; +//$GLOBALS['cfg']['MainBackground'] = '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 @@ -33,38 +43,45 @@ $GLOBALS['cfg']['RightBgImage'] = 'url(../' . $_SESSION['PMA_Theme']->ge * if not set the browser default will be used * (depending on browser, DTD and system settings) */ -$GLOBALS['cfg']['FontFamily'] = ''; +$GLOBALS['cfg']['FontFamily'] = ''; /** * fixed width font family, used in textarea */ -$GLOBALS['cfg']['FontFamilyFixed'] = ''; +$GLOBALS['cfg']['FontFamilyFixed'] = 'monospace'; /** * font size as a valid css font size value, * if not set the browser default will be used * (depending on browser, DTD and system settings) */ -$GLOBALS['cfg']['FontSize'] = ''; +$GLOBALS['cfg']['FontSize'] = ''; /** * tables */ -$GLOBALS['cfg']['Border'] = 0; // border width on tables -$GLOBALS['cfg']['ThBgcolor'] = '#D3DCE3'; // table header row colour -$GLOBALS['cfg']['BgcolorOne'] = '#E5E5E5'; // table data row colour -$GLOBALS['cfg']['BgcolorTwo'] = '#D5D5D5'; // table data row colour, alternate -$GLOBALS['cfg']['BrowsePointerColor'] = '#CCFFCC'; // color of the pointer in browse mode -$GLOBALS['cfg']['BrowseMarkerColor'] = '#FFCC99'; // color of the marker (visually marks row - // by clicking on it) in browse mode +// border +$GLOBALS['cfg']['Border'] = 0; +// table header and footer color +$GLOBALS['cfg']['ThBackground'] = '#D3DCE3'; +// table header and footer background +$GLOBALS['cfg']['ThColor'] = '#000000'; +// table data row background +$GLOBALS['cfg']['BgOne'] = '#E5E5E5'; +// table data row background, alternate +$GLOBALS['cfg']['BgTwo'] = '#D5D5D5'; + /** * query window */ -$GLOBALS['cfg']['QueryWindowWidth'] = 600; // Width of Query window -$GLOBALS['cfg']['QueryWindowHeight'] = 400; // Height of Query window +// Width of Query window +$GLOBALS['cfg']['QueryWindowWidth'] = 600; +// Height of Query window +$GLOBALS['cfg']['QueryWindowHeight'] = 400; /** * SQL Parser Settings + * Syntax colouring data */ -$GLOBALS['cfg']['SQP']['fmtColor'] = array( // Syntax colouring data +$GLOBALS['cfg']['SQP']['fmtColor'] = array( 'comment' => '#808000', 'comment_mysql' => '', 'comment_ansi' => '',