updated themes;

fixed bug #1452131 Fonts too large;
fixed bug #1446211 Colors hardcoded in theme css files;

ChangeLog

@@ -5,6 +5,12 @@ phpMyAdmin - ChangeLog
 $Id$
 $Source$
 
+2006-04-26 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * themes/*:
+      updated themes;
+      fixed bug #1452131 Fonts too large;
+      fixed bug #1446211 Colors hardcoded in theme css files;
+
 2006-04-25 Michal Čihař  <michal@cihar.com>
     * libraries/common.lib.php: Make cookie login form work with token
       protection.

themes/darkblue_orange/css/theme_left.css.php

@@ -3,28 +3,33 @@
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
     }
-?> 
+?>
 /******************************************************************************/
 /* general tags */
-body {
+<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
+* {
-    font-size:        10px;
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
-    background-color: #666699;
+}
-    color:            #ffffff;
+<?php } if (! empty($GLOBALS['cfg']['FontSize'])) { ?>
-    margin: 0;
+body, table, tbody, tr, td {
-    padding: 2px 2px 2px 2px;
+    font-size:          <?php echo $GLOBALS['cfg']['FontSize']; ?>;
+}
+select, input, textarea {
+    font-size:          0.7em;
+}
+<?php } ?>
+
+body, table, tbody, tr, td {
+    background-color:   <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
+    margin:             0;
+    padding:            2px 2px 2px 2px;
 }
 
 a img {
     border: 0;
 }
 
-/* gecko FIX, font size is not correctly assigned to all child elements */
-body * {
-    font-family:      inherit;
-    font-size:        inherit;
-}
-
 form {
     margin:             0;
     padding:            0;
@@ -34,7 +39,7 @@ form {
 select {
     background-color:   #ffffff;
     color:              #000000;
-    width:              150px;
+    width:              100%;
 }
 
 /* buttons in some browsers (eg. Konqueror) are block elements,
@@ -66,7 +71,7 @@ div#pmalogo,
 div#leftframelinks,
 div#databaseList {
     text-align:         center;
-    border-bottom:      0.05em solid #ffffff;
+    border-bottom:      0.05em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
     margin-bottom:      0.5em;
     padding-bottom:     0.5em;
 }
@@ -77,13 +82,13 @@ div#leftframelinks .icon {
 }
 
 div#leftframelinks a {
-    margin:             0.1em;
+    margin:             0;
     padding:            0.2em;
-    border:             0.05em solid #ffffff;
+    border:             0.05em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
 }
 
 div#leftframelinks a:hover {
-    background-color:   #ffffff;
+    background-color:   <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
 }
 
 /* leftdatabaselist */
@@ -93,7 +98,7 @@ div#left_tableList ul {
     margin:             0;
     padding:            0;
     font-size:          80%;
-    background-color:   #666699;
+    background-color:   <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
 }
 
 div#left_tableList ul ul {
@@ -101,12 +106,12 @@ div#left_tableList ul ul {
 }
 
 div#left_tableList a {
-    color:              #ffffff;
+    color:              <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
     text-decoration:    none;
 }
 
 div#left_tableList a:hover {
-    color:              #ffffff;
+    color:              <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
     text-decoration:    underline;
 }
 
@@ -128,9 +133,9 @@ div#left_tableList img {
 }
 
 div#left_tableList ul ul {
-    margin-left:        0em;
+    margin-left:        0;
     padding-left:       0.1em;
-    border-left:        0.1em solid #ffffff;
+    border-left:        0.1em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
     padding-bottom:     0.1em;
-    border-bottom:      0.1em solid #ffffff;
+    border-bottom:      0.1em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
 }

themes/darkblue_orange/css/theme_right.css.php

@@ -3,21 +3,31 @@
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
     }
-?> 
+?>
 /******************************************************************************/
 /* general tags */
-body {
+<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
-    font-family:        Verdana, Arial, Helvetica, sans-serif;
+* {
-    font-size:          10px;
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
-    color:              #000000;
-    background-color:   #ffffff;
-    margin:             5px;
 }
+<?php } if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
+textarea {
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
+}
+<?php } if (! empty($GLOBALS['cfg']['FontSize'])) { ?>
+body, table, tbody, tr, td {
+    font-size:          <?php echo $GLOBALS['cfg']['FontSize']; ?>;
+}
+select, input, textarea {
+    font-size:          0.7em;
+}
+<?php } ?>
+
+body {
+    margin:             5px;
+    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['RightBgColor']; ?>;
 
-/* gecko FIX, font size is not correctly assigned to all child elements */
-body * {
-    font-family:        inherit;
-    font-size:          inherit;
 }
 
 h1 {
@@ -63,8 +73,8 @@ dfn:hover {
 
 th {
     font-weight:        bold;
-    color:              #000000;
+    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
-    background-color:   #ff9900;
+    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;
@@ -74,7 +84,7 @@ th {
 th a:link,
 th a:active,
 th a:visited {
-    color:              #000000;
+    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
     text-decoration:    underline;
 }
 
@@ -117,7 +127,7 @@ fieldset fieldset {
 fieldset legend {
     color:              #666699;
     font-weight:        bold;
-    background-color:   #ffffff;
+    background-color:   <?php echo $GLOBALS['cfg']['RightBgColor']; ?>;
     padding:            2px 2px 2px 2px;
 }
 
@@ -175,7 +185,7 @@ button.mult_submit {
 table tr.odd th,
 table tr.odd {
     background-image:   none;
-    background-color:   #E5E5E5;
+    background-color:   <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
     text-align:         left;
 }
 
@@ -183,14 +193,14 @@ table tr.odd {
 table tr.even th,
 table tr.even {
     background-image:   none;
-    background-color:   #D5D5D5;
+    background-color:   <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
     text-align:         left;
 }
 
 /* marked tbale rows */
 table tr.marked th,
 table tr.marked {
-    background-color:   #FFCC99;
+    background-color:   <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
 }
 
 /* hovered table rows */
@@ -200,7 +210,7 @@ table tr.odd:hover th,
 table tr.even:hover th,
 table tr.hover th,
 table tr.hover {
-    background-color:   #CCFFCC;
+    background-color:   <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
 }
 
 table .value {
@@ -341,7 +351,7 @@ div.notice {
     margin:             0.5em 0 0.5em 0;
     border:             0.1em solid #FFD700;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/s_notice.png);
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -373,7 +383,7 @@ div.warning {
     width:              90%;
 
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/s_warn.png);
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -404,7 +414,7 @@ div.error {
     border:             0.1em solid #ff0000;
     width:              90%;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/s_error.png);
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -435,7 +445,7 @@ fieldset.confirmation legend {
     border-right:       0.1em solid #FF0000;
     font-weight:        bold;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/s_really.png);
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_really.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 5px 50%;
@@ -513,6 +523,18 @@ td.disabled {
     background-color:   #cccccc;
 }
 
+body.loginform h1,
+body.loginform a.logo {
+    display: block;
+    text-align: center;
+}
+
+form.login label {
+    float: left;
+    width: 10em;
+    font-weight: bolder;
+}
+
 
 /******************************************************************************/
 /* specific elements */
@@ -557,7 +579,7 @@ span.tabcaution {
 
 /* enabled drop/empty tabs */
 a.tabcaution {
-    color:              FF0000;
+    color:              #FF0000;
 }
 a.tabcaution:hover {
     color: #FFFFFF;
@@ -608,11 +630,12 @@ a.tab:hover,
 /* disabled drop/empty tabs */
 span.tab,
 span.tabcaution {
-    cursor:             url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/darkblue_orange/img/error.ico), default;
+    cursor:             url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
 }
 <?php } ?>
 /* end topmenu */
 
+
 /* Calendar */
 table.calendar {
     width:              100%;
@@ -899,3 +922,200 @@ div#queryboxcontainer div#bookmarkoptions {
 }
 /* end querybox */
 
+/* main page */
+#maincontainer {
+    background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_right.png);
+    background-position: <?php echo $right; ?> bottom;
+    background-repeat: no-repeat;
+    border-bottom: 1px solid silver;
+}
+
+#mysqlmaininformation,
+#pmamaininformation {
+    float: <?php echo $left; ?>;
+    width: 49%;
+}
+
+#maincontainer ul {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_<?php echo $GLOBALS['text_dir']; ?>.png);
+    vertical-align: middle;
+}
+
+#maincontainer li {
+    margin-bottom: 0.3em;
+}
+/* END main page */
+
+
+<?php if ( $GLOBALS['cfg']['MainPageIconic'] ) { ?>
+/* iconic view for ul items */
+li#li_create_database {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_newdb.png);
+}
+
+li#li_select_lang {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_lang.png);
+}
+
+li#li_select_mysql_collation,
+li#li_select_mysql_charset {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
+}
+
+li#li_select_theme{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
+}
+
+li#li_server_info{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
+}
+
+li#li_user_info{
+    /* list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png); */
+}
+
+li#li_mysql_status{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_status.png);
+}
+
+li#li_mysql_variables{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_vars.png);
+}
+
+li#li_mysql_processes{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_process.png);
+}
+
+li#li_mysql_collations{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
+}
+
+li#li_mysql_engines{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_engine.png);
+}
+
+li#li_mysql_binlogs {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_tbl.png);
+}
+
+li#li_mysql_databases {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_db.png);
+}
+
+li#li_export {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_export.png);
+}
+
+li#li_import {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_import.png);
+}
+
+li#li_change_password {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_passwd.png);
+}
+
+li#li_log_out {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_loggoff.png);
+}
+
+li#li_pma_docs {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_docs.png);
+}
+
+li#li_phpinfo {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>php_sym.png);
+}
+
+li#li_pma_homepage {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_home.png);
+}
+
+li#li_mysql_privilegs{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png);
+}
+
+li#li_switch_dbstats {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_dbstatistics.png);
+}
+
+li#li_flush_privileges {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_reload.png);
+}
+/* END iconic view for ul items */
+<?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
+
+
+#body_browse_foreigners {
+    background-color:   <?php echo $cfg['LeftBgColor']; ?>;
+    margin:             5px 5px 0 5px;
+}
+
+#bodyquerywindow {
+    background-color:   <?php echo $cfg['LeftBgColor']; ?>;
+}
+
+#bodythemes {
+    width: 500px;
+    margin: auto;
+    text-align: center;
+}
+
+#bodythemes img {
+    border: 0.1em solid black;
+}
+
+#bodythemes a:hover img {
+    border: 0.1em solid red;
+}
+
+#fieldset_select_fields {
+    float: left;
+}
+
+#selflink {
+    clear: both;
+    display: block;
+    margin-top: 1em;
+    margin-bottom: 1em;
+    width: 100%;
+    border-top: 0.1em solid silver;
+    text-align: <?php echo $right; ?>;
+}
+
+#table_innodb_bufferpool_usage,
+#table_innodb_bufferpool_activity {
+    float: <?php echo $left; ?>;
+}
+
+#div_mysql_charset_collations table {
+    float: <?php echo $left; ?>;
+}
+
+#div_table_order {
+    min-width: 48%;
+    float: <?php echo $left; ?>;
+}
+
+#div_table_rename {
+    min-width: 48%;
+    float: <?php echo $left; ?>;
+}
+
+#div_table_copy {
+    min-width: 48%;
+    float: <?php echo $left; ?>;
+}
+
+#div_table_options {
+    clear: both;
+    min-width: 48%;
+    float: <?php echo $left; ?>;
+}
+
+#qbe_div_table_list {
+    float: <?php echo $left; ?>;
+}
+
+#qbe_div_sql_query {
+    float: <?php echo $left; ?>;
+}

themes/darkblue_orange/info.inc.php

@@ -4,5 +4,5 @@
 $theme_name = 'Darkblue/orange';
 $theme_version = 2;
 $theme_generation = 2;
-$theme_full_version = '2.7.0.0';
+$theme_full_version = '2.7.1.0';
 ?>

themes/darkblue_orange/layout.inc.php

@@ -1,27 +1,70 @@
 <?php
+/**
+ * configures general layout
+ * for detailed layout configuration please refer to the css files
+ */
 
-$cfg['LeftWidth']           = 180;          // left frame width
+/**
+ * navi frame
+ */
+$GLOBALS['cfg']['LeftWidth']            = 180;          // navi frame width
 /* colors */
-$cfg['LeftBgColor']         = '#666699';    // background color for the left frame
+$GLOBALS['cfg']['LeftColor']            = '#ffffff';    // foreground (text) color for the navi frame
-$cfg['RightBgColor']        = '#FFFFFF';    // background color for the right frame
+$GLOBALS['cfg']['LeftBgColor']          = '#666699';    // background color for the navi frame
-$cfg['RightBgImage']        = '';           // path to a background image for the right frame
+$GLOBALS['cfg']['LeftPointerColor']     = '#9999CC';    // color of the pointer in navi frame
-                                            // (leave blank for no background image)
-$cfg['LeftPointerColor']    = '#9999CC';    // color of the pointer in left frame
-$cfg['Border']              = 0;            // border width on tables
-$cfg['ThBgcolor']           = '#666699';    // table header row colour
-$cfg['BgcolorOne']          = '#EEEEEE';    // table data row colour
-$cfg['BgcolorTwo']          = '#E5E5E5';    // table data row colour, alternate
-$cfg['BrowsePointerColor']  = '#CCCCFF';    // color of the pointer in browse mode
-$cfg['BrowseMarkerColor']   = '#FFCC99';    // color of the marker (visually marks row
-                                            // by clicking on it) in browse mode
 
-$cfg['QueryWindowWidth']    = 600;          // Width of Query window
+/**
-$cfg['QueryWindowHeight']   = 400;          // Height of Query window
+ * main frame
+ */
+$GLOBALS['cfg']['RightColor']           = '#000000';    // foreground (text) color for the Main frame
+$GLOBALS['cfg']['RightBgColor']         = '#FFFFFF';    // background color for the Main frame
+
+/**
+ * path to a background image for the Main frame
+ * (leave blank for no background image)
+ */
+$GLOBALS['cfg']['RightBgImage']         = '';
+
+/**
+ * fonts
+ */
+/**
+ * the font family as a valid css font family value,
+ * if not set the browser default will be used
+ * (depending on browser, DTD and system settings)
+ */
+$GLOBALS['cfg']['FontFamily']          = 'Verdana, Arial, Helvetica, sans-serif';
+/**
+ * fixed width font family, used in textarea
+ */
+$GLOBALS['cfg']['FontFamilyFixed']     = '';
+/**
+ * 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';
+
+/**
+ * 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
+/**
+ * query window
+ */
+$GLOBALS['cfg']['QueryWindowWidth']    = 600;          // Width of Query window
+$GLOBALS['cfg']['QueryWindowHeight']   = 400;          // Height of Query window
 
 /**
  * SQL Parser Settings
  */
-$cfg['SQP']['fmtColor']     = array(        // Syntax colouring data
+$GLOBALS['cfg']['SQP']['fmtColor']     = array(        // Syntax colouring data
     'comment'            => '#808000',
     'comment_mysql'      => '',
     'comment_ansi'       => '',

themes/original/css/theme_left.css.php

@@ -1,15 +1,27 @@
 <?php
-    // unplanned execution path
+// unplanned execution path
-    if (!defined('PMA_MINIMUM_COMMON')) {
+if (!defined('PMA_MINIMUM_COMMON')) {
-        exit();
+    exit();
-    }
+}
-?> 
+?>
 /******************************************************************************/
 /* general tags */
-body {
+<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
-    font-family:        <?php echo $GLOBALS['left_font_family']; ?>;
+* {
-    background-color:   #D0DCE0;
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
-    color:              #000000;
+}
+<?php } if (! empty($GLOBALS['cfg']['FontSize'])) { ?>
+body, table, tbody, tr, td {
+    font-size:          <?php echo $GLOBALS['cfg']['FontSize']; ?>;
+}
+select, input, textarea {
+    font-size:          0.7em;
+}
+<?php } ?>
+
+body, table, tbody, tr, td {
+    background-color:   <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
 }
 
 a img {
@@ -23,8 +35,9 @@ form {
 }
 
 select {
-    background-color:   #ffffff;
+    background-color:   <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
-    color:              #000000;
+    color:              <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
+    width:              100%;
 }
 
 /* buttons in some browsers (eg. Konqueror) are block elements,
@@ -56,7 +69,7 @@ div#pmalogo,
 div#leftframelinks,
 div#databaseList {
     text-align:         center;
-    border-bottom:      0.05em solid #669999;
+    border-bottom:      0.05em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
     margin-bottom:      0.5em;
     padding-bottom:     0.5em;
 }
@@ -66,14 +79,14 @@ div#leftframelinks .icon {
     margin:             0;
 }
 
-div#leftframelinks a {
+div#leftframelinks a img.icon {
-    margin:             0.1em;
+    margin:             0;
     padding:            0.2em;
-    border:             0.05em solid #669999;
+    border:             0.05em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
 }
 
 div#leftframelinks a:hover {
-    background-color:   #669999;
+    background-color:   <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
 }
 
 /* leftdatabaselist */
@@ -83,7 +96,7 @@ div#left_tableList ul {
     margin:             0;
     padding:            0;
     font-size:          80%;
-    background-color:   #D0DCE0;
+    background-color:   <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
 }
 
 div#left_tableList ul ul {
@@ -108,7 +121,7 @@ div#left_tableList li {
 
 <?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
 div#left_tableList li:hover {
-    background-color:   #CCFFCC;
+    background-color:   <?php echo $GLOBALS['cfg']['LeftPointerColor']; ?>;
 }
 <?php } ?>
 
@@ -118,9 +131,9 @@ div#left_tableList img {
 }
 
 div#left_tableList ul ul {
-    margin-left:        0em;
+    margin-left:        0;
     padding-left:       0.1em;
-    border-left:        0.1em solid #669999;
+    border-left:        0.1em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
     padding-bottom:     0.1em;
-    border-bottom:      0.1em solid #669999;
+    border-bottom:      0.1em solid <?php echo $GLOBALS['cfg']['LeftColor']; ?>;
 }

themes/original/css/theme_right.css.php

@@ -3,17 +3,33 @@
     if (!defined('PMA_MINIMUM_COMMON')) {
         exit();
     }
-?> 
+?>
 /******************************************************************************/
 /* general tags */
+<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
+* {
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
+}
+<?php } if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
+textarea {
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
+}
+<?php } if (! empty($GLOBALS['cfg']['FontSize'])) { ?>
+body, table, tbody, tr, td {
+    font-size:          <?php echo $GLOBALS['cfg']['FontSize']; ?>;
+}
+select, input, textarea {
+    font-size:          0.7em;
+}
+<?php } ?>
+
 body {
     margin:             0.5em;
     padding:            0;
-    font-family:        <?php echo $GLOBALS['right_font_family']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
-    color:              #000000;
+    background-image:   <?php echo $GLOBALS['cfg']['RightBgImage']; ?>;
-    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/vertical_line.png);
     background-repeat:  repeat-y;
-    background-color:   #F5F5F5;
+    background-color:   <?php echo $GLOBALS['cfg']['RightBgColor']; ?>;
 }
 
 h1 {
@@ -30,11 +46,7 @@ h3 {
     font-weight:        bold;
 }
 
-a:link {
+a:link,
-    text-decoration:    none;
-    color:              #0000FF;
-}
-
 a:visited {
     text-decoration:    none;
     color:              #0000FF;
@@ -56,8 +68,8 @@ dfn:hover {
 
 th {
     font-weight:        bold;
-    color:              #000000;
+    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
-    background-color:   #D3DCE3;
+    background-color:   <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>;
 }
 
 a img {
@@ -65,8 +77,8 @@ a img {
 }
 
 hr {
-    color:              #666666;
+    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
-    background-color:   #666666;
+    background-color:   <?php echo $GLOBALS['cfg']['RightColor']; ?>;
     border:             0;
     height:             1px;
 }
@@ -84,9 +96,9 @@ textarea {
 
 fieldset {
     margin-top:         1em;
-    border:             #686868 solid 1px;
+    border:             <?php echo $GLOBALS['cfg']['RightColor']; ?> solid 1px;
     padding:            0.5em;
-    background-color:   #E5E5E5;
+    background-color:   <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
 }
 
 fieldset fieldset {
@@ -150,21 +162,21 @@ button.mult_submit {
 /* odd table rows 1,3,5,7,... */
 table tr.odd th,
 table tr.odd {
-    background-color:   #E5E5E5;
+    background-color:   <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
     text-align:         left;
 }
 
 /* even table rows 2,4,6,8,... */
 table tr.even th,
 table tr.even {
-    background-color:   #D5D5D5;
+    background-color:   <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
     text-align:         left;
 }
 
 /* marked tbale rows */
 table tr.marked th,
 table tr.marked {
-    background-color:   #FFCC99;
+    background-color:   <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
 }
 
 /* hovered table rows */
@@ -174,7 +186,7 @@ table tr.odd:hover th,
 table tr.even:hover th,
 table tr.hover th,
 table tr.hover {
-    background-color:   #CCFFCC;
+    background-color:   <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
 }
 
 table .value {
@@ -226,13 +238,11 @@ img.lightbulb {
 }
 
 .print {
-    font-family:        arial;
     font-size:          8pt;
 }
 
 /* MySQL Parser */
 .syntax {
-    font-family:        sans-serif;
     font-size:          80%;
 }
 
@@ -318,7 +328,7 @@ div.notice {
     margin:             0.5em 0 0.5em 0;
     border:             0.1em solid #FFD700;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_notice.png);
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_notice.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -348,7 +358,7 @@ div.warning {
     margin:             0.5em 0 0.5em 0;
     border:             0.1em solid #CC0000;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_warn.png);
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_warn.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -378,7 +388,7 @@ div.error {
     margin:             0.5em 0 0.5em 0;
     border:             0.1em solid #ff0000;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_error.png);
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_error.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 10px 50%;
@@ -409,7 +419,7 @@ fieldset.confirmation legend {
     border-right:       0.1em solid #FF0000;
     font-weight:        bold;
     <?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-    background-image:   url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_really.png);
+    background-image:   url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_really.png);
     background-repeat:  no-repeat;
         <?php if ( $GLOBALS['text_dir'] === 'ltr' ) { ?>
     background-position: 5px 50%;
@@ -430,15 +440,16 @@ fieldset.confirmation legend {
 }
 
 .tblHeaders {
-    background-color:   #D0DCE0;
     font-weight:        bold;
-    color:              #000000;
+    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
+    background-color:   <?php echo $GLOBALS['cfg']['ThBgColor']; ?>;
 }
 
 .tblFooters {
     font-weight:        normal;
-    color:              #000000;
+    color:              <?php echo $GLOBALS['cfg']['RightColor']; ?>;
-    background-color:   #D0DCE0;
+    background-color:   <?php echo $GLOBALS['cfg']['ThBgColor']; ?>;
+
 }
 
 .tblHeaders a:link,
@@ -478,6 +489,20 @@ td.disabled {
     background-color:   #cccccc;
 }
 
+/**
+ * login form
+ */
+body.loginform h1,
+body.loginform a.logo {
+    display: block;
+    text-align: center;
+}
+
+form.login label {
+    float: left;
+    width: 10em;
+    font-weight: bolder;
+}
 
 /******************************************************************************/
 /* specific elements */
@@ -573,7 +598,7 @@ a.tab:hover,
 /* disabled drop/empty tabs */
 span.tab,
 span.tabcaution {
-    cursor:             url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/error.ico), default;
+    cursor:             url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>error.ico), default;
 }
 <?php } ?>
 /* end topmenu */
@@ -839,3 +864,200 @@ div#queryboxcontainer div#bookmarkoptions {
 }
 /* end querybox */
 
+/* main page */
+#maincontainer {
+    background-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_right.png);
+    background-position: <?php echo $right; ?> bottom;
+    background-repeat: no-repeat;
+    border-bottom: 1px solid silver;
+}
+
+#mysqlmaininformation,
+#pmamaininformation {
+    float: <?php echo $left; ?>;
+    width: 49%;
+}
+
+#maincontainer ul {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>item_<?php echo $GLOBALS['text_dir']; ?>.png);
+    vertical-align: middle;
+}
+
+#maincontainer li {
+    margin-bottom: 0.3em;
+}
+/* END main page */
+
+
+<?php if ($GLOBALS['cfg']['MainPageIconic']) { ?>
+/* iconic view for ul items */
+li#li_create_database {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_newdb.png);
+}
+
+li#li_select_lang {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_lang.png);
+}
+
+li#li_select_mysql_collation,
+li#li_select_mysql_charset {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
+}
+
+li#li_select_theme{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_theme.png);
+}
+
+li#li_server_info{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_host.png);
+}
+
+li#li_user_info{
+    /* list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png); */
+}
+
+li#li_mysql_status{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_status.png);
+}
+
+li#li_mysql_variables{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_vars.png);
+}
+
+li#li_mysql_processes{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_process.png);
+}
+
+li#li_mysql_collations{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_asci.png);
+}
+
+li#li_mysql_engines{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_engine.png);
+}
+
+li#li_mysql_binlogs {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_tbl.png);
+}
+
+li#li_mysql_databases {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_db.png);
+}
+
+li#li_export {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_export.png);
+}
+
+li#li_import {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_import.png);
+}
+
+li#li_change_password {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_passwd.png);
+}
+
+li#li_log_out {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_loggoff.png);
+}
+
+li#li_pma_docs {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_docs.png);
+}
+
+li#li_phpinfo {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>php_sym.png);
+}
+
+li#li_pma_homepage {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_home.png);
+}
+
+li#li_mysql_privilegs{
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_rights.png);
+}
+
+li#li_switch_dbstats {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>b_dbstatistics.png);
+}
+
+li#li_flush_privileges {
+    list-style-image: url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_reload.png);
+}
+/* END iconic view for ul items */
+<?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
+
+
+#body_browse_foreigners {
+    background-color:   <?php echo $cfg['LeftBgColor']; ?>;
+    margin:             5px 5px 0 5px;
+}
+
+#bodyquerywindow {
+    background-color:   <?php echo $cfg['LeftBgColor']; ?>;
+}
+
+#bodythemes {
+    width: 500px;
+    margin: auto;
+    text-align: center;
+}
+
+#bodythemes img {
+    border: 0.1em solid black;
+}
+
+#bodythemes a:hover img {
+    border: 0.1em solid red;
+}
+
+#fieldset_select_fields {
+    float: left;
+}
+
+#selflink {
+    clear: both;
+    display: block;
+    margin-top: 1em;
+    margin-bottom: 1em;
+    width: 100%;
+    border-top: 0.1em solid silver;
+    text-align: <?php echo $right; ?>;
+}
+
+#table_innodb_bufferpool_usage,
+#table_innodb_bufferpool_activity {
+    float: <?php echo $left; ?>;
+}
+
+#div_mysql_charset_collations table {
+    float: <?php echo $left; ?>;
+}
+
+#div_table_order {
+    min-width: 48%;
+    float: <?php echo $left; ?>;
+}
+
+#div_table_rename {
+    min-width: 48%;
+    float: <?php echo $left; ?>;
+}
+
+#div_table_copy {
+    min-width: 48%;
+    float: <?php echo $left; ?>;
+}
+
+#div_table_options {
+    clear: both;
+    min-width: 48%;
+    float: <?php echo $left; ?>;
+}
+
+#qbe_div_table_list {
+    float: <?php echo $left; ?>;
+}
+
+#qbe_div_sql_query {
+    float: <?php echo $left; ?>;
+}

themes/original/info.inc.php

@@ -4,5 +4,5 @@
 $theme_name = 'Original';
 $theme_version = 2;
 $theme_generation = 2;
-$theme_full_version = '2.7.0.0';
+$theme_full_version = '2.7.1.0';
 ?>

themes/original/layout.inc.php

@@ -1,27 +1,70 @@
 <?php
+/**
+ * configures general layout
+ * for detailed layout configuration please refer to the css files
+ */
 
-$cfg['LeftWidth']           = 200;          // left frame width
+/**
+ * navi frame
+ */
+$GLOBALS['cfg']['LeftWidth']            = 200;          // navi frame width
 /* colors */
-$cfg['LeftBgColor']         = '#D0DCE0';    // background color for the left frame
+$GLOBALS['cfg']['LeftColor']            = '#000000';    // foreground (text) color for the navi frame
-$cfg['RightBgColor']        = '#F5F5F5';    // background color for the right frame
+$GLOBALS['cfg']['LeftBgColor']          = '#D0DCE0';    // background color for the navi frame
-$cfg['RightBgImage']        = '';           // path to a background image for the right frame
+$GLOBALS['cfg']['LeftPointerColor']     = '#CCFFCC';    // color of the pointer in navi frame
-                                            // (leave blank for no background image)
-$cfg['LeftPointerColor']    = '#CCFFCC';    // color of the pointer in left frame
-$cfg['Border']              = 0;            // border width on tables
-$cfg['ThBgcolor']           = '#D3DCE3';    // table header row colour
-$cfg['BgcolorOne']          = '#E5E5E5';    // table data row colour
-$cfg['BgcolorTwo']          = '#D5D5D5';    // table data row colour, alternate
-$cfg['BrowsePointerColor']  = '#CCFFCC';    // color of the pointer in browse mode
-$cfg['BrowseMarkerColor']   = '#FFCC99';    // color of the marker (visually marks row
-                                            // by clicking on it) in browse mode
 
-$cfg['QueryWindowWidth']    = 600;          // Width of Query window
+/**
-$cfg['QueryWindowHeight']   = 400;          // Height of Query window
+ * main frame
+ */
+$GLOBALS['cfg']['RightColor']           = '#000000';    // foreground (text) color for the Main frame
+$GLOBALS['cfg']['RightBgColor']         = '#F5F5F5';    // background color for the Main frame
+
+/**
+ * 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)';
+
+/**
+ * fonts
+ */
+/**
+ * the font family as a valid css font family value,
+ * if not set the browser default will be used
+ * (depending on browser, DTD and system settings)
+ */
+$GLOBALS['cfg']['FontFamily']          = '';
+/**
+ * fixed width font family, used in textarea
+ */
+$GLOBALS['cfg']['FontFamilyFixed']     = '';
+/**
+ * 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']            = '';
+
+/**
+ * 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
+/**
+ * query window
+ */
+$GLOBALS['cfg']['QueryWindowWidth']    = 600;          // Width of Query window
+$GLOBALS['cfg']['QueryWindowHeight']   = 400;          // Height of Query window
 
 /**
  * SQL Parser Settings
  */
-$cfg['SQP']['fmtColor']     = array(        // Syntax colouring data
+$GLOBALS['cfg']['SQP']['fmtColor']     = array(        // Syntax colouring data
     'comment'            => '#808000',
     'comment_mysql'      => '',
     'comment_ansi'       => '',