improved themes

2006-04-27 13:18:42 +00:00
parent ab0c647e18
commit 9a4e3a65c2
11 changed files with 236 additions and 212 deletions
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -3,9 +3,9 @@
 // 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') {
    $right = 'right';
@@ -75,7 +75,7 @@ div#tablestatistics {
 }

 div#tablestatistics table {
-    float: left;
+    float: <?php echo $left; ?>;
    margin-bottom: 0.5em;
    margin-right: 0.5em;
 }
@@ -689,6 +689,8 @@ li#li_flush_privileges {
    float: <?php echo $left; ?>;
 }
    <?php
+    $GLOBALS['cfg']['BgOne'] = $GLOBALS['cfg']['BgcolorOne'];
+    $GLOBALS['cfg']['BgTwo'] = $GLOBALS['cfg']['BgcolorTwo'];
 } // end styles 2.7.1

 if ($_SESSION['PMA_Theme']->checkVersion('2.9')) {
@@ -706,12 +708,12 @@ div#left_tableList li.marked {

 /* odd items 1,3,5,7,... */
 .odd {
-    background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
+    background: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
 }

 /* even items 2,4,6,8,... */
 .even {
-    background-color: <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
+    background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
 }

 /* marked items */
@@ -738,10 +740,10 @@ th.condition {

 label.desc {
    width: 30em;
-    float: left;
+    float: <?php echo $left; ?>;
 }
    <?php
 } // end styles 2.9

-$_SESSION['PMA_Theme']->loadCss( $_REQUEST['js_frame'] );
+$_SESSION['PMA_Theme_Manager']->printCss($_REQUEST['js_frame']);
 ?>
--- 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 ',*';
 }
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -3009,6 +3009,11 @@ $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')) {
--- 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 {
 <?php } ?>

 body {
-    margin:             5px;
-    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
-    background-color:   <?php echo $GLOBALS['cfg']['RightBgColor']; ?>;
-
+    padding:            0;
+    margin:             0.5em;
+    color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
 }

 h1 {
@@ -73,18 +73,14 @@ dfn:hover {

 th {
    font-weight:        bold;
-    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
-    background-color:   <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>;
-    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/tbl_th.png);
-    background-repeat:  repeat-x;
-    background-position: top;
-    height:             18px;
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
 }

 th a:link,
 th a:active,
 th a:visited {
-    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
    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:   <?php echo $GLOBALS['cfg']['RightBgColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
    padding:            2px 2px 2px 2px;
 }

@@ -159,14 +156,14 @@ button {
 fieldset.tblFooters {
    margin-top:         0;
    margin-bottom:      0.5em;
-    text-align:         right;
+    text-align:         <?php echo $right; ?>;
    float:              none;
    clear:              both;
 }

 fieldset .formelement {
-    float:              left;
-    margin-right:       0.5em;
+    float:              <?php echo $left; ?>;
+    margin-<?php echo $right; ?>:       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:   <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
-    text-align:         left;
+    background:         <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+    text-align:         <?php echo $left; ?>;
 }

 /* even table rows 2,4,6,8,... */
 table tr.even th,
 table tr.even {
    background-image:   none;
-    background-color:   <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
-    text-align:         left;
+    background:         <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    text-align:         <?php echo $left; ?>;
 }

 /* marked tbale rows */
@@ -214,7 +211,7 @@ table tr.hover {
 }

 table .value {
-    text-align:         right;
+    text-align:         <?php echo $right; ?>;
    white-space:        nowrap;
 }
 /* IE doesnt handles 'pre' right */
@@ -222,9 +219,12 @@ table [class=value] {
    white-space:        pre;
 }

+
+<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
 .value {
-    font-family:        "Courier New", Courier, monospace;
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
 }
+<?php } ?>
 .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%;
    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->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%;
-
    <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->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(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/tbl_header.png);
-    background-repeat:  repeat-x;
-    background-position: top;
-    height:             18px;
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
 }

 .tblFooters {
    font-weight:        normal;
-    color:              #ffffff;
-    background-color:   #666699;
-    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/tbl_header.png);
-    background-repeat:  repeat-x;
-    background-position: top;
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
+
 }

 .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: <?php echo $left; ?>;
    width: 10em;
    font-weight: bolder;
 }
@@ -548,7 +541,7 @@ ul#topmenu {
 }

 ul#topmenu li {
-    float:              left;
+    float:              <?php echo $left; ?>;
    margin:             0;
    padding:            0;
    vertical-align:     middle;
@@ -556,7 +549,7 @@ ul#topmenu li {

 #topmenu img {
    vertical-align:     middle;
-    margin-right:       0.1em;
+    margin-<?php echo $right; ?>:       0.1em;
 }

 /* default tab styles */
@@ -603,8 +596,8 @@ ul#topmenu li {

 /* default tab styles */
 .tab, .tabcaution, .tabactive {
-    background-color:   <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
-    border:             1pt solid <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+    border:             1pt solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
    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:   <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
 }

 /* disabled drop/empty tabs */
@@ -676,13 +669,13 @@ div#tablestatistics {
 }

 div#tablestatistics table {
-    float: left;
+    float: <?php echo $left; ?>;
    margin-bottom: 0.5em;
-    margin-right: 0.5em;
+    margin-<?php echo $right; ?>: 0.5em;
 }

 div#tablestatistics table caption {
-    margin-right: 0.5em;
+    margin-<?php echo $right; ?>: 0.5em;
 }
 /* END table stats */

@@ -772,12 +765,12 @@ div#tablestatistics table caption {
 }

 #fieldset_add_user_login label {
-    float:              left;
+    float:              <?php echo $left; ?>;
    display:            block;
    width:              10em;
    max-width:          100%;
-    text-align:         right;
-    padding-right:      0.5em;
+    text-align:         <?php echo $right; ?>;
+    padding-<?php echo $right; ?>:      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: <?php echo $left; ?>;
    display: block;
    width: 12em;
    max-width: 100%;
-    padding-right: 0.5em;
+    padding-<?php echo $right; ?>: 0.5em;
 }

 #fieldset_add_user_login input {
    width: 12em;
-    clear: right;
+    clear: <?php echo $right; ?>;
    max-width: 100%;
 }

@@ -806,8 +799,8 @@ div#tablestatistics table caption {
 }

 #fieldset_user_priv div.item {
-    float: left;
-    width: 8em;
+    float: <?php echo $left; ?>;
+    width: 9em;
    max-width: 100%;
 }

@@ -824,20 +817,20 @@ div#tablestatistics table caption {
 }

 #fieldset_user_global_rights fieldset {
-    float: left;
+    float: <?php echo $left; ?>;
 }
 /* END user privileges */


 /* serverstatus */
 div#serverstatus table caption a.top {
-    float: right;
+    float: <?php echo $right; ?>;
 }

 div#serverstatus div#serverstatusqueriesdetails table,
 div#serverstatus table#serverstatustraffic,
 div#serverstatus table#serverstatusconnections {
-    float: left;
+    float: <?php echo $left; ?>;
 }

 #serverstatussection,
@@ -896,13 +889,13 @@ div#querywindowcontainer fieldset {
 /* querybox */

 div#sqlquerycontainer {
-    float: left;
+    float: <?php echo $left; ?>;
    width: 69%;
    /* height: 15em; */
 }

 div#tablefieldscontainer {
-    float: right;
+    float: <?php echo $right; ?>;
    width: 29%;
    /* height: 15em; */
 }
@@ -1046,12 +1039,12 @@ li#li_flush_privileges {


 #body_browse_foreigners {
-    background-color:   <?php echo $cfg['LeftBgColor']; ?>;
-    margin:             5px 5px 0 5px;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    margin:             0.5em 0.5em 0 0.5em;
 }

 #bodyquerywindow {
-    background-color:   <?php echo $cfg['LeftBgColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
 }

 #bodythemes {
@@ -1069,7 +1062,7 @@ li#li_flush_privileges {
 }

 #fieldset_select_fields {
-    float: left;
+    float: <?php echo $left; ?>;
 }

 #selflink {
@@ -1122,5 +1115,5 @@ li#li_flush_privileges {

 label.desc {
    width: 30em;
-    float: left;
+    float: <?php echo $left; ?>;
 }
--- 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';
 ?>
--- 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'       => '',
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -19,9 +19,11 @@ select, input, textarea {
 }
 <?php } ?>

-body, table, tbody, tr, td {
-    background-color:   <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
-    color:              <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
+body {
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    margin:             0;
+    padding:            0.2em 0.2em 0.2em 0.2em;
 }

 a img {
@@ -35,8 +37,6 @@ form {
 }

 select {
-    background-color:   <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
-    color:              <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
    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 <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
+    border-bottom:      0.05em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
    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 <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
+    border:             0.05em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
 }

 div#leftframelinks a:hover {
-    background-color:   <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
 }

 /* leftdatabaselist */
@@ -96,7 +92,7 @@ div#left_tableList ul {
    margin:             0;
    padding:            0;
    font-size:          80%;
-    background-color:   <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
 }

 div#left_tableList ul ul {
@@ -104,12 +100,12 @@ div#left_tableList ul ul {
 }

 div#left_tableList a {
-    color:              #333399;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
    text-decoration:    none;
 }

 div#left_tableList a:hover {
-    color:              #FF0000;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
    text-decoration:    underline;
 }

@@ -121,7 +117,7 @@ div#left_tableList li {

 <?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
 div#left_tableList li:hover {
-    background-color:   <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
 }
 <?php } ?>

@@ -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 <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
+    border-left:        0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
    padding-bottom:     0.1em;
-    border-bottom:      0.1em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
+    border-bottom:      0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
 }
--- 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 {
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -24,12 +24,10 @@ select, input, textarea {
 <?php } ?>

 body {
-    margin:             0.5em;
    padding:            0;
-    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
-    background-image:   <?php echo $GLOBALS['cfg']['RightBgImage']; ?>;
-    background-repeat:  repeat-y;
-    background-color:   <?php echo $GLOBALS['cfg']['RightBgColor']; ?>;
+    margin:             0.5em;
+    color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
 }

 h1 {
@@ -68,8 +66,8 @@ dfn:hover {

 th {
    font-weight:        bold;
-    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
-    background-color:   <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
 }

 a img {
@@ -77,8 +75,8 @@ a img {
 }

 hr {
-    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
-    background-color:   <?php echo $GLOBALS['cfg']['RightColor']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['MainColor']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['MainColor']; ?>;
    border:             0;
    height:             1px;
 }
@@ -96,9 +94,9 @@ textarea {

 fieldset {
    margin-top:         1em;
-    border:             <?php echo $GLOBALS['cfg']['RightColor']; ?> solid 1px;
+    border:             <?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;
    padding:            0.5em;
-    background-color:   <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['BgOne']; ?>;
 }

 fieldset fieldset {
@@ -137,14 +135,14 @@ button {
 fieldset.tblFooters {
    margin-top:         0;
    margin-bottom:      0.5em;
-    text-align:         right;
+    text-align:         <?php echo $right; ?>;
    float:              none;
    clear:              both;
 }

 fieldset .formelement {
-    float:              left;
-    margin-right:       0.5em;
+    float:              <?php echo $left; ?>;
+    margin-<?php echo $right; ?>:       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:   <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
-    text-align:         left;
+    background:         <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+    text-align:         <?php echo $left; ?>;
 }

 /* even table rows 2,4,6,8,... */
 table tr.even th,
 table tr.even {
-    background-color:   <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
-    text-align:         left;
+    background:         <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
+    text-align:         <?php echo $left; ?>;
 }

 /* marked tbale rows */
@@ -190,7 +188,7 @@ table tr.hover {
 }

 table .value {
-    text-align:         right;
+    text-align:         <?php echo $right; ?>;
    white-space:        nowrap;
 }
 /* IE doesnt handles 'pre' right */
@@ -198,9 +196,12 @@ table [class=value] {
    white-space:        pre;
 }

+
+<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
 .value {
-    font-family:        "Courier New", Courier, monospace;
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
 }
+<?php } ?>
 .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:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
-    background-color:   <?php echo $GLOBALS['cfg']['ThBgColor']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;
 }

 .tblFooters {
    font-weight:        normal;
-    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
-    background-color:   <?php echo $GLOBALS['cfg']['ThBgColor']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['ThColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['ThBackground']; ?>;

 }

@@ -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: <?php echo $left; ?>;
    width: 10em;
    font-weight: bolder;
 }

+
 /******************************************************************************/
 /* specific elements */

@@ -516,7 +515,7 @@ ul#topmenu {
 }

 ul#topmenu li {
-    float:              left;
+    float:              <?php echo $left; ?>;
    margin:             0;
    padding:            0;
    vertical-align:     middle;
@@ -524,7 +523,7 @@ ul#topmenu li {

 #topmenu img {
    vertical-align:     middle;
-    margin-right:       0.1em;
+    margin-<?php echo $right; ?>:       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:   <?php echo $GLOBALS['cfg']['BgOne']; ?>;
+    border:             1pt solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
    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:   <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
 }

 /* disabled drop/empty tabs */
@@ -644,13 +643,13 @@ div#tablestatistics {
 }

 div#tablestatistics table {
-    float: left;
+    float: <?php echo $left; ?>;
    margin-bottom: 0.5em;
-    margin-right: 0.5em;
+    margin-<?php echo $right; ?>: 0.5em;
 }

 div#tablestatistics table caption {
-    margin-right: 0.5em;
+    margin-<?php echo $right; ?>: 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:              <?php echo $left; ?>;
    display:            block;
    width:              10em;
    max-width:          100%;
-    text-align:         right;
-    padding-right:      0.5em;
+    text-align:         <?php echo $right; ?>;
+    padding-<?php echo $right; ?>:      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: <?php echo $left; ?>;
    display: block;
    width: 12em;
    max-width: 100%;
-    padding-right: 0.5em;
+    padding-<?php echo $right; ?>: 0.5em;
 }

 #fieldset_add_user_login input {
    width: 12em;
-    clear: right;
+    clear: <?php echo $right; ?>;
    max-width: 100%;
 }

@@ -748,7 +747,7 @@ div#tablestatistics table caption {
 }

 #fieldset_user_priv div.item {
-    float: left;
+    float: <?php echo $left; ?>;
    width: 9em;
    max-width: 100%;
 }
@@ -766,20 +765,20 @@ div#tablestatistics table caption {
 }

 #fieldset_user_global_rights fieldset {
-    float: left;
+    float: <?php echo $left; ?>;
 }
 /* END user privileges */


 /* serverstatus */
 div#serverstatus table caption a.top {
-    float: right;
+    float: <?php echo $right; ?>;
 }

 div#serverstatus div#serverstatusqueriesdetails table,
 div#serverstatus table#serverstatustraffic,
 div#serverstatus table#serverstatusconnections {
-    float: left;
+    float: <?php echo $left; ?>;
 }

 #serverstatussection,
@@ -838,13 +837,13 @@ div#querywindowcontainer fieldset {
 /* querybox */

 div#sqlquerycontainer {
-    float: left;
+    float: <?php echo $left; ?>;
    width: 69%;
    /* height: 15em; */
 }

 div#tablefieldscontainer {
-    float: right;
+    float: <?php echo $right; ?>;
    width: 29%;
    /* height: 15em; */
 }
@@ -988,12 +987,12 @@ li#li_flush_privileges {


 #body_browse_foreigners {
-    background-color:   <?php echo $cfg['LeftBgColor']; ?>;
-    margin:             5px 5px 0 5px;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    margin:             0.5em 0.5em 0 0.5em;
 }

 #bodyquerywindow {
-    background-color:   <?php echo $cfg['LeftBgColor']; ?>;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
 }

 #bodythemes {
@@ -1011,7 +1010,7 @@ li#li_flush_privileges {
 }

 #fieldset_select_fields {
-    float: left;
+    float: <?php echo $left; ?>;
 }

 #selflink {
@@ -1064,5 +1063,5 @@ li#li_flush_privileges {

 label.desc {
    width: 30em;
-    float: left;
+    float: <?php echo $left; ?>;
 }
--- 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';
 ?>
--- 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
@@ -37,7 +47,7 @@ $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
@@ -48,23 +58,30 @@ $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'       => '',