From 326eb9dab580a95e9cbc1b584d4f499d043af78a Mon Sep 17 00:00:00 2001
From: Sebastian Mendel <cybot_tm@users.sourceforge.net>
Date: Thu, 24 Nov 2005 07:15:55 +0000
Subject: [PATCH] - updated theme - added version, to include only needed
 styles

---
 ChangeLog                               |   5 +
 css/phpmyadmin.css.php                  | 314 ++++++++++++-----------
 themes/original/css/theme_left.css.php  |  37 ++-
 themes/original/css/theme_right.css.php | 317 ++++++++++++++++++++++--
 themes/original/info.inc.php            |   1 +
 5 files changed, 500 insertions(+), 174 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 68cdcce2d..daef419e1 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-11-24 Sebastian Mendel <cybot_tm@users.sourceforge.net>
+    * themes/original/*, css/phpmyadmin.css.php:
+      - updated theme
+      - added version, to include only needed styles
+
 2005-11-23 Sebastian Mendel <cybot_tm@users.sourceforge.net>
     * *REVERTED* libraries/display_select_lang.lib.php: correct lang definition
     * themes/original/*, libraries/auth/*.auth.lib.php, server_privilegs.php,
diff --git a/css/phpmyadmin.css.php b/css/phpmyadmin.css.php
index 71b945071..bba9d6507 100644
--- a/css/phpmyadmin.css.php
+++ b/css/phpmyadmin.css.php
@@ -19,10 +19,31 @@ if ( $GLOBALS['text_dir'] === 'ltr' ) {
 header('Content-Type: text/css; charset=ISO-8859-1');
 
 ?>
-html {
+/* @deprecated */
+#mainheader {
+    border: 0.1px solid transparent;
+    border-bottom: 0.1em solid gray;
+    margin-bottom: 1em;
+}
+#pmalogoright {
+    float: <?php echo $right; ?>;
+}
+.nowrap {
+    white-space: nowrap;
+}
+div.nowrap {
     margin: 0;
     padding: 0;
 }
+.nospace {
+    margin: 0;
+    padding: 0;
+}
+
+<?php
+if ( ! isset( $theme_full_version )
+    || version_compare( $theme_full_version, '2.7.0', 'lt' ) ) {
+    ?>
 
 form {
     margin: 0;
@@ -34,141 +55,6 @@ a img {
     border: 0;
 }
 
-/* main page */
-#maincontainer {
-    background-image: url(../themes/original/img/logo_right.png);
-    background-position: <?php echo $right; ?> bottom;
-    background-repeat: no-repeat;
-    border-bottom: 1px solid silver;
-}
-
-#mysqlmaininformation,
-#pmamaininformation {
-    float: <?php echo $left; ?>;
-}
-
-#mysqlmaininformation {
-    margin-<?php echo $right; ?>: 1em;
-    padding-<?php echo $right; ?>: 1em;
-    border-<?php echo $right; ?>: 0.1em solid silver;
-}
-
-#maincontainer ul {
-    list-style-image: url(../themes/original/img/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(../themes/original/img/b_newdb.png);
-}
-
-li#li_select_lang {
-    list-style-image: url(../themes/original/img/s_lang.png);
-}
-
-li#li_select_mysql_collation,
-li#li_select_mysql_charset {
-    list-style-image: url(../themes/original/img/s_asci.png);
-}
-
-li#li_select_theme{
-    list-style-image: url(../themes/original/img/s_theme.png);
-}
-
-li#li_server_info{
-    list-style-image: url(../themes/original/img/s_host.png);
-}
-
-li#li_user_info{
-    list-style-image: url(../themes/original/img/s_rights.png);
-}
-
-li#li_mysql_status{
-    list-style-image: url(../themes/original/img/s_status.png);
-}
-
-li#li_mysql_variables{
-    list-style-image: url(../themes/original/img/s_vars.png);
-}
-
-li#li_mysql_processes{
-    list-style-image: url(../themes/original/img/s_process.png);
-}
-
-li#li_mysql_collations{
-    list-style-image: url(../themes/original/img/s_asci.png);
-}
-
-li#li_mysql_engines{
-    list-style-image: url(../themes/original/img/b_engine.png);
-}
-
-li#li_mysql_binlogs {
-    list-style-image: url(../themes/original/img/s_tbl.png);
-}
-
-li#li_mysql_databases {
-    list-style-image: url(../themes/original/img/s_db.png);
-}
-
-li#li_export {
-    list-style-image: url(../themes/original/img/b_export.png);
-}
-
-li#li_import {
-    list-style-image: url(../themes/original/img/b_import.png);
-}
-
-li#li_change_password {
-    list-style-image: url(../themes/original/img/s_passwd.png);
-}
-
-li#li_log_out {
-    list-style-image: url(../themes/original/img/s_loggoff.png);
-}
-
-li#li_pma_docs {
-    list-style-image: url(../themes/original/img/b_docs.png);
-}
-
-li#li_phpinfo {
-    list-style-image: url(../themes/original/img/php_sym.png);
-}
-
-li#li_pma_homepage {
-    list-style-image: url(../themes/original/img/b_home.png);
-}
-
-li#li_mysql_privilegs{
-    list-style-image: url(../themes/original/img/s_rights.png);
-}
-
-li#li_switch_dbstats {
-    list-style-image: url(../themes/original/img/b_dbstatistics.png);
-}
-/* END iconic view for ul items */
-<?php } /* end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
-
-
-/* @deprecated */
-#mainheader {
-    border: 0.1px solid transparent;
-    border-bottom: 0.1em solid gray;
-    margin-bottom: 1em;
-}
-/* @deprecated */
-#pmalogoright {
-    float: <?php echo $right; ?>;
-}
-
 
 /* server privileges */
 #tableuserrights td,
@@ -295,7 +181,7 @@ div#querywindowcontainer fieldset {
 /* Gecko bug */
 div[class=formelementrow],
 div[id=queryfieldscontainer] {
-    border: 1px solid transparent;
+    border: 1px solid red;
 }
 
 div#sqlquerycontainer {
@@ -387,21 +273,16 @@ fieldset legend {
     background-color: transparent;
 }
 
-.nowrap    { white-space: nowrap; }
-div.nowrap { margin: 0; padding: 0; }
-
 /* buttons in some browsers (eg. Konqueror) are block elements, this breaks design */
 button { display: inline; }
 
 /* Textarea */
 textarea { overflow: auto; }
 
-.nospace { margin: 0; padding: 0; }
-
 
 /* topmenu */
 
-/* Gecko bug */
+/* Gecko 1.7 bug (FF 1.0) */
 #topmenucontainer {
     border: 1px solid <?php echo $GLOBALS['cfg']['RightBgColor']; ?>;
 }
@@ -498,9 +379,9 @@ span.tab, span.tabcaution {
 
 
 /* data tables */
-table.data caption,
-table.data th,
-table.data td {
+table caption,
+table th,
+table td {
     padding: 0.1em 0.5em 0.1em 0.5em;
     margin: 0;
     margin: 0.1em;
@@ -540,18 +421,19 @@ table tr.hover {
 table .value {
     text-align: right;
     white-space: nowrap;
-    font-family: "Courier New", Courier, monospace;
 }
 /* IE doesnt handles 'pre' right */
 table [class=value] {
     white-space: pre;
 }
 
+.value {
+    font-family: "Courier New", Courier, monospace;
+}
 .value .attention {
     color: red;
     font-weight: bold;
 }
-
 .value .allfine {
     color: green;
 }
@@ -605,6 +487,12 @@ img.lightbulb {
     cursor: pointer;
 }
 
+    <?php
+} // end styles 2.7.0
+
+if ( ! isset( $theme_full_version )
+    || version_compare( $theme_full_version, '2.7.1', 'lt' ) ) {
+    ?>
 
 /********************/
 /* NEW in PMA 2.7.1 */
@@ -622,6 +510,131 @@ form.login label {
     font-weight: bolder;
 }
 
+
+/* main page */
+#maincontainer {
+    background-image: url(../themes/original/img/logo_right.png);
+    background-position: <?php echo $right; ?> bottom;
+    background-repeat: no-repeat;
+    border-bottom: 1px solid silver;
+}
+
+#mysqlmaininformation,
+#pmamaininformation {
+    float: <?php echo $left; ?>;
+}
+
+#mysqlmaininformation {
+    margin-<?php echo $right; ?>: 1em;
+    padding-<?php echo $right; ?>: 1em;
+    border-<?php echo $right; ?>: 0.1em solid silver;
+}
+
+#maincontainer ul {
+    list-style-image: url(../themes/original/img/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(../themes/original/img/b_newdb.png);
+}
+
+li#li_select_lang {
+    list-style-image: url(../themes/original/img/s_lang.png);
+}
+
+li#li_select_mysql_collation,
+li#li_select_mysql_charset {
+    list-style-image: url(../themes/original/img/s_asci.png);
+}
+
+li#li_select_theme{
+    list-style-image: url(../themes/original/img/s_theme.png);
+}
+
+li#li_server_info{
+    list-style-image: url(../themes/original/img/s_host.png);
+}
+
+li#li_user_info{
+    list-style-image: url(../themes/original/img/s_rights.png);
+}
+
+li#li_mysql_status{
+    list-style-image: url(../themes/original/img/s_status.png);
+}
+
+li#li_mysql_variables{
+    list-style-image: url(../themes/original/img/s_vars.png);
+}
+
+li#li_mysql_processes{
+    list-style-image: url(../themes/original/img/s_process.png);
+}
+
+li#li_mysql_collations{
+    list-style-image: url(../themes/original/img/s_asci.png);
+}
+
+li#li_mysql_engines{
+    list-style-image: url(../themes/original/img/b_engine.png);
+}
+
+li#li_mysql_binlogs {
+    list-style-image: url(../themes/original/img/s_tbl.png);
+}
+
+li#li_mysql_databases {
+    list-style-image: url(../themes/original/img/s_db.png);
+}
+
+li#li_export {
+    list-style-image: url(../themes/original/img/b_export.png);
+}
+
+li#li_import {
+    list-style-image: url(../themes/original/img/b_import.png);
+}
+
+li#li_change_password {
+    list-style-image: url(../themes/original/img/s_passwd.png);
+}
+
+li#li_log_out {
+    list-style-image: url(../themes/original/img/s_loggoff.png);
+}
+
+li#li_pma_docs {
+    list-style-image: url(../themes/original/img/b_docs.png);
+}
+
+li#li_phpinfo {
+    list-style-image: url(../themes/original/img/php_sym.png);
+}
+
+li#li_pma_homepage {
+    list-style-image: url(../themes/original/img/b_home.png);
+}
+
+li#li_mysql_privilegs{
+    list-style-image: url(../themes/original/img/s_rights.png);
+}
+
+li#li_switch_dbstats {
+    list-style-image: url(../themes/original/img/b_dbstatistics.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;
@@ -654,8 +667,9 @@ form.login label {
     clear: both;
 }
 
-<?php
-
+    <?php
+} // end styles 2.7.1
+    
 $_valid_css = array( 'left', 'right', 'print' );
 if ( empty( $_REQUEST['js_frame'] ) || ! in_array( $_REQUEST['js_frame'], $_valid_css ) ) {
     $js_frame = 'left';
diff --git a/themes/original/css/theme_left.css.php b/themes/original/css/theme_left.css.php
index 608a809c5..88d4720fc 100644
--- a/themes/original/css/theme_left.css.php
+++ b/themes/original/css/theme_left.css.php
@@ -7,11 +7,36 @@ body#body_leftFrame {
     background-color: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
 }
 
+a img {
+    border: 0;
+}
+
+form {
+    margin: 0;
+    padding: 0;
+    display: inline;
+}
+
 select {
     background-color: #ffffff;
     color: #000000;
 }
 
+/* buttons in some browsers (eg. Konqueror) are block elements, this breaks design */
+button { display: inline; }
+
+
+/* leave some space between icons and text */
+.icon {
+    vertical-align: middle;
+    margin-right: 0.3em;
+    margin-left: 0.3em;
+}
+
+img.lightbulb {
+    cursor: pointer;
+}
+
 div#pmalogo,
 div#leftframelinks,
 div#databaseList {
@@ -21,8 +46,10 @@ div#databaseList {
     padding-bottom: 0.5em;
 }
 
-div#leftframelinks img {
+div#leftframelinks .icon {
     vertical-align: middle;
+    padding: 0;
+    margin: 0;
 }
 
 div#leftframelinks a {
@@ -35,17 +62,14 @@ div#leftframelinks a:hover {
     background-color: #669999;
 }
 
-div#databaseList form {
-    display: inline;
-}
-
 /* leftdatabaselist */
-div#left_tableList {
+div#left_tableList ul {
     list-style-type: none;
     list-style-position: outside;
     margin: 0;
     padding: 0;
     font-size: 80%;
+    background-color: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?>;
 }
 
 div#left_tableList a {
@@ -71,6 +95,7 @@ div#left_tableList li:hover {
 <?php } ?>
 
 div#left_tableList img {
+    padding: 0;
     vertical-align: middle;
 }
 
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 2e4559a90..7811d84b8 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1,9 +1,4 @@
 /* Always enabled stylesheets (right frame) */
-html {
-    margin: 0;
-    padding: 0;
-}
-
 body {
     margin: 0.5em;
     padding: 0;
@@ -21,9 +16,65 @@ body {
     background-color: <?php echo $GLOBALS['cfg']['RightBgColor'] . "\n"; ?>
 }
 
+
+/* querywindow */
+body#bodyquerywindow {
+    margin: 0;
+    padding: 0;
+    background-image: none;
+    background-color: <?php echo $GLOBALS['cfg']['RightBgColor'] . "\n"; ?>
+}
+
+div#querywindowcontainer {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+}
+
+div#querywindowcontainer fieldset {
+    margin-top: 0;
+}
+/* END querywindow */
+
+
+/* querybox */
+
+div#sqlquerycontainer {
+    float: left;
+    width: 69%;
+    /* height: 15em; */
+}
+
+div#tablefieldscontainer  {
+    float: right;
+    width: 29%;
+    /* height: 15em; */
+}
+
+div#tablefieldscontainer select  {
+    width: 100%;
+    /* height: 12em; */
+}
+
+textarea#sqlquery {
+    width: 100%;
+    /* height: 100%; */
+}
+
+div#queryboxcontainer div#bookmarkoptions {
+    margin-top: 0.5em;
+}
+/* end querybox */
+
+
 th              {font-family: <?php echo $right_font_family; ?>;  font-weight: bold; color: #000000; background-color: <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>}
 td              {font-family: <?php echo $right_font_family; ?>; }
-form            {font-family: <?php echo $right_font_family; ?>;  padding: 0px; margin: 0px;}
+form {
+    font-family: <?php echo $right_font_family; ?>;
+    padding: 0;
+    margin: 0;
+    display: inline;
+}
 input           {font-family: <?php echo $right_font_family; ?>; }
 input.textfield {font-family: <?php echo $right_font_family; ?>;  color: #000000; background-color: #FFFFFF}
 select          {font-family: <?php echo $right_font_family; ?>;  color: #000000; background-color: #FFFFFF}
@@ -37,19 +88,142 @@ a:hover         {font-family: <?php echo $right_font_family; ?>;  text-decoratio
 dfn             {font-style: normal}
 dfn:hover       {font-style: normal; cursor: help}
 
+a img {
+    border: 0;
+}
+
+hr {
+    color: #666666;
+    background-color: #666666;
+    border: 0;
+    height: 1px;
+}
+
+
 fieldset        {
+    margin-top: 1em;
     border:     #686868 solid 1px;
     padding:    0.5em;
+    background-color: <?php echo $GLOBALS['cfg']['BgcolorOne']; ?>;
 }
 fieldset fieldset {
     margin:     0.8em;
 }
+fieldset.tblFooters {
+    margin-top: 0;
+    margin-bottom: 0.5em;
+    text-align: right;
+    float: none;
+    clear: both;
+}
+fieldset .formelement {
+    line-height: 2.4em;
+    float: left;
+    margin-right: 0.5em;
+    /* IE */
+    white-space: nowrap;
+}
+/* revert for Gecko */
+fieldset div[class=formelement] {
+    white-space: normal;
+}
+fieldset legend {
+    background-color: transparent;
+}
+
+/* buttons in some browsers (eg. Konqueror) are block elements, this breaks design */
+button { display: inline; }
+
+/* Textarea */
+textarea { overflow: auto; }
+
+
+/* IE */
+fieldset .formelement input,
+fieldset .formelement select {
+    margin-top: 0.5em;
+    margin-bottom: 0.5em;
+}
+/* revert for Gecko */
+fieldset div[class=formelement] input,
+fieldset div[class=formelement] select {
+    margin-top: auto;
+    margin-bottom: auto;
+    height: auto;
+}
 
 button.mult_submit {
     border: none;
     background-color: transparent;
 }
 
+
+/* data tables */
+table caption,
+table th,
+table td {
+    padding: 0.1em 0.5em 0.1em 0.5em;
+    margin: 0;
+    margin: 0.1em;
+    vertical-align: top;
+}
+
+/* odd table rows 1,3,5,7,... */
+table tr.odd th,
+table tr.odd {
+    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: <?php echo $GLOBALS['cfg']['BgcolorTwo']; ?>;
+    text-align: left;
+}
+
+/* marked tbale rows */
+table tr.marked th,
+table tr.marked {
+    background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
+}
+
+/* hovered table rows */
+table tr.odd:hover,
+table tr.even:hover,
+table tr.odd:hover th,
+table tr.even:hover th,
+table tr.hover th,
+table tr.hover {
+    background-color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
+}
+
+table .value {
+    text-align: right;
+    white-space: nowrap;
+}
+/* IE doesnt handles 'pre' right */
+table [class=value] {
+    white-space: pre;
+}
+
+.value {
+    font-family: "Courier New", Courier, monospace;
+}
+.value .attention {
+    color: red;
+    font-weight: bold;
+}
+.value .allfine {
+    color: green;
+}
+
+
+img.lightbulb {
+    cursor: pointer;
+}
+
+
 .pdflayout {
     overflow:         hidden;
     clip:             inherit;
@@ -94,7 +268,23 @@ button.mult_submit {
 .syntax_quote              {white-space: pre;}
 .syntax_quote_backtick     {}
 
-hr{ color: #666666; background-color: #666666; border: 0; height: 1px; }
+
+/* leave some space between icons and text */
+.icon {
+    vertical-align: middle;
+    margin-right: 0.3em;
+    margin-left: 0.3em;
+}
+/* no extra space in table cells */
+td .icon {
+    margin: 0;
+}
+
+.selectallarrow {
+    margin-<?php echo $right; ?>: 0.3em;
+    margin-<?php echo $left; ?>: 0.6em;
+}
+
 
 /* topmenu */
 ul#topmenu {
@@ -188,6 +378,61 @@ span.tab, span.tabcaution {
 /* end topmenu */
 
 
+#fieldsetexport #exportoptions {
+    float: left;
+}
+
+
+/* Calendar */
+table.calendar      { width: 100%; }
+table.calendar td   { text-align: center; }
+table.calendar td a { display: block; }
+
+table.calendar td a:hover {
+    background-color: <?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
+}
+
+table.calendar th {
+    background-color: <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>;
+}
+
+table.calendar td.selected {
+    background-color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
+}
+
+img.calendar { border: none; }
+form.clock   { text-align: center; }
+/* end Calendar */
+
+
+/* table stats */
+div#tablestatistics {
+    border-bottom: 0.1em solid #669999;
+    margin-bottom: 0.5em;
+    padding-bottom: 0.5em;
+}
+
+div#tablestatistics table {
+    float: left;
+    margin-bottom: 0.5em;
+    margin-right: 0.5em;
+}
+
+div#tablestatistics table caption {
+    margin-right: 0.5em;
+}
+/* END tabel stats */
+
+
+/* server privileges */
+#tableuserrights td,
+#tablespecificuserrights td,
+#tabledatabases td {
+    vertical-align: middle;
+}
+/* END server privileges */
+
+
 /* message boxes: warning, error, confirmation */
 .notice {
     color: #000000;
@@ -392,18 +637,8 @@ tr.disabled td, td.disabled {
     font-family:      <?php echo $right_font_family; ?>;
 }
 
-fieldset {
-    margin-top: 1em;
-}
-
-fieldset.tblFooters {
-    margin-top: 0;
-    margin-bottom: 0.5em;
-    text-align: right;
-    float: none;
-    clear: both;
-}
 
+/* user privileges */
 #fieldset_add_user_login div.item {
     border-bottom: 1px solid silver;
     padding-bottom: 0.3em;
@@ -465,3 +700,49 @@ fieldset.tblFooters {
 #fieldset_user_global_rights fieldset {
     float: left;
 }
+/* END user privileges */
+
+
+/* serverstatus */
+div#serverstatus table caption a.top {
+    float: right;
+}
+
+div#serverstatus div#serverstatusqueriesdetails table,
+div#serverstatus table#serverstatustraffic,
+div#serverstatus table#serverstatusconnections {
+    float: left;
+}
+
+#serverstatussection,
+.clearfloat {
+    clear: both;
+}
+div#serverstatussection table {
+    width: 100%;
+    margin-bottom: 1em;
+}
+div#serverstatussection table .name {
+    width: 18em;
+}
+div#serverstatussection table .value {
+    width: 6em;
+}
+
+div#serverstatus table tbody td.descr a,
+div#serverstatus table .tblFooters a {
+    white-space: nowrap;
+}
+div#serverstatus div#statuslinks a:before,
+div#serverstatus div#sectionlinks a:before,
+div#serverstatus table tbody td.descr a:before,
+div#serverstatus table .tblFooters a:before {
+    content: '[';
+}
+div#serverstatus div#statuslinks a:after,
+div#serverstatus div#sectionlinks a:after,
+div#serverstatus table tbody td.descr a:after,
+div#serverstatus table .tblFooters a:after {
+    content: ']';
+}
+/* end serverstatus */
diff --git a/themes/original/info.inc.php b/themes/original/info.inc.php
index fe6b47e6d..d08ab72d3 100644
--- a/themes/original/info.inc.php
+++ b/themes/original/info.inc.php
@@ -4,4 +4,5 @@
 $theme_name = 'Original';
 $theme_version = 2;
 $theme_generation = 2;
+$theme_full_version = '2.7.0.0';
 ?>