files moved into themes/original

ChangeLog

@@ -5,6 +5,16 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-06-16 Marc Delisle  <lem9@users.sourceforge.net>
+    Changes, thanks to Michael Keck (mkkeck):
+    * libraries/auth/config.auth.lib.php +  http.auth.lib.php:
+      style for error messages
+    * main.php, themes.php, libraries/select_theme.lib.php,
+      css/phpmyadmin.css.php, themes/original/img + css:
+      put original theme under the same structure as darkblue_orange
+ 
+      TODO: fix some table header colors
+
 2004-06-16 Michal Čihař  <michal@cihar.com>
     * header.inc.php: Use rather _SERVER than GLOBALS, should fix bug #973602.
 

css/phpmyadmin.css.php

@@ -37,82 +37,8 @@ if ($js_frame == 'left') {
     // 2004-05-30: Michael Keck (mail@michaelkeck.de)
     //             Check, if theme_left.css.php exists and include
     $tmp_file = './' . $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_left.css.php';
-    if (@file_exists($tmp_file) && $pmaTheme != 'original') {
+    if (@file_exists($tmp_file)) {
         include($tmp_file);
-    }else{ // else use default styles
-    /**
-    * Add styles for positioned layers
-    */
-    if (isset($num_dbs) && $num_dbs == '0') {
-    ?>
-/* No layer effects neccessary */
-div     {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.heada  {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
-.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-.tblItem:hover {color: #FF0000; text-decoration: underline}
-    <?php
-    } else {
-        if (isset($js_capable) && $js_capable != '0') {
-            // Brian Birtles : This is not the ideal method of doing this
-            // but under the 7th June '00 Mozilla build (and many before
-            // it) Mozilla did not treat text between <style> tags as
-            // style information unless it was written with the one call
-            // to write().
-            if (isset($js_isDOM) && $js_isDOM != '0') {
-            ?>
-/* Layer effects neccessary: capable && is_DOM is set. We found a recent CSS-Browser */
-div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
-.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; display: block}
-.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none; display: none}
-.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-.tblItem:hover {color: #FF0000; text-decoration: underline}
-            <?php
-            } else {
-            ?>
-/* Layer effeccts neccessary: capable, but no is_DOM. We found an older CSS-Browser */
-div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
-            <?php
-                if (isset($js_isIE4) && $js_isIE4 != '0') {
-            ?>
-/* Additional effects for IE4 */
-.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; display: block}
-.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none; display: none}
-.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-.tblItem:hover {color: #FF0000; text-decoration: underline}
-            <?php
-                } else {
-            ?>
-/* Additional effects for NON-IE4 */
-.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; position: absolute; visibility: hidden}
-.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; position: absolute; visibility: hidden}
-.item, .tblItem {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-            <?php
-                }
-            }
-        } else {
-        ?>
-/* Additional effects for left frame not required or not possible because of lacking CSS-capability. */
-div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
-.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
-.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
-.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
-.tblItem:hover {color: #FF0000; text-decoration: underline}
-        <?php
-        }
-    }
-    ?>
-/* Always enabled stylesheets (left frame) */
-body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
-input   {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
-select  {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; background-color: #ffffff; color: #000000}
-    <?php
     } // end of include theme_left.css.php
 } elseif ($js_frame == 'print') {
 /************************************************************************************
@@ -121,18 +47,8 @@ select  {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $f
     // 2004-05-30: Michael Keck (mail@michaelkeck.de)
     //             Check, if theme_print.css.php exists and include
     $tmp_file = './' . $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_print.css.php';
-    if (@file_exists($tmp_file) && $pmaTheme != 'original') {
+    if (@file_exists($tmp_file)) {
         include($tmp_file);
-    } else { // else use default styles
-    ?>
-/* For printview */
-body  {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #ffffff}
-h1    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold}
-table {border-width:1px; border-color:#000000; border-style:solid; border-collapse:collapse; border-spacing:0}
-th    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px}
-th.td { color: transparent; background-color: transparent;}
-td    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #ffffff; border-width:1px; border-color:#000000; border-style:solid; padding:2px}
-    <?php
     } // end of include theme_print.css.php
 } else {
 /************************************************************************************
@@ -141,290 +57,8 @@ td    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $fo
     // 2004-05-30: Michael Keck (mail@michaelkeck.de)
     //             Check, if theme_right.css.php exists and include
     $tmp_file = './' . $GLOBALS['cfg']['ThemePath'] . '/' . $pmaTheme . '/css/theme_right.css.php';
-    if (@file_exists($tmp_file) && $pmaTheme != 'original') {
+    if (@file_exists($tmp_file)) {
         include($tmp_file);
-    } else { // else use default styles
-?>
-/* Always enabled stylesheets (right frame) */
-body {
-    font-family: <?php echo $right_font_family; ?>;
-    font-size: <?php echo $font_size; ?>;
-    color: #000000;
-    <?php
-    if ($GLOBALS['cfg']['RightBgImage'] == '') {
-        // calls from a css file are relative to itself, so use ../images
-        echo '    background-image: url(../images/vertical_line.png);' . "\n"
-           . '    background-repeat: repeat-y;' . "\n";
-    } else {
-        echo '    background-image: url(' . $GLOBALS['cfg']['RightBgImage'] . ');' . "\n";
-    } // end if... else...
-    ?>
-    background-color: <?php echo $GLOBALS['cfg']['RightBgColor'] . "\n"; ?>
-}
-
-pre, tt         {font-size: <?php echo $font_size; ?>}
-th              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #000000; background-color: <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>}
-td              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
-form            {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; padding: 0px; margin: 0px;}
-input           {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
-input.textfield {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #FFFFFF}
-select          {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #FFFFFF}
-textarea        {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #FFFFFF}
-h1              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold}
-h2              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold}
-h3              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold}
-a:link          {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000FF}
-a:visited       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000FF}
-a:hover         {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: underline; color: #FF0000}
-a.nav:link      {font-family: <?php echo $right_font_family; ?>; color: #000000}
-a.nav:visited   {font-family: <?php echo $right_font_family; ?>; color: #000000}
-a.nav:hover     {font-family: <?php echo $right_font_family; ?>; color: #FF0000}
-a.h1:link       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #000000}
-a.h1:active     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #000000}
-a.h1:visited    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #000000}
-a.h1:hover      {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #FF0000}
-a.h2:link       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #000000}
-a.h2:active     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #000000}
-a.h2:visited    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #000000}
-a.h2:hover      {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #FF0000}
-a.drop:link     {font-family: <?php echo $right_font_family; ?>; color: #ff0000}
-a.drop:visited  {font-family: <?php echo $right_font_family; ?>; color: #ff0000}
-a.drop:hover    {font-family: <?php echo $right_font_family; ?>; color: #ffffff; background-color:#ff0000; text-decoration: none}
-dfn             {font-style: normal}
-dfn:hover       {font-style: normal; cursor: help}
-.nav            {font-family: <?php echo $right_font_family; ?>; color: #000000}
-.warning        {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #FF0000}
-.tblcomment     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_smallest; ?>; font-weight: normal; color: #000099; }
-td.topline      {font-size: 1px}
-td.tab          {
-    border-top: 1px solid #999;
-    border-right: 1px solid #666;
-    border-left: 1px solid #999;
-    border-bottom: none;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-}
-
-div.tabs        {
-    clear: both;
-}
-
-table.tabs      {
-    border-top: none;
-    border-right: none;
-    border-left: none;
-    border-bottom: 1px solid #666;
-}
-
-fieldset        {
-    border:     #686868 solid 1px;
-    padding:    0.5em;
-}
-fieldset fieldset {
-    margin:     0.8em;
-}
-
-button.mult_submit {
-    border: none;
-    background-color: transparent;
-}
-
-.pdflayout {
-    overflow:         hidden;
-    clip:             inherit;
-    background-color: #FFFFFF;
-    display:          none;
-    border:           1px solid #000000;
-    position:         relative;
-}
-
-.pdflayout_table {
-    background:       <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>;
-    color:            #000000;
-    overflow:         hidden;
-    clip:             inherit;
-    z-index:          2;
-    display:          inline;
-    visibility:       inherit;
-    cursor:           move;
-    position:         absolute;
-    font-size:        <?php echo $font_smaller; ?>;
-    border:           1px dashed #000000;
-}
-
-.print{font-family:arial;font-size:8pt;}
-
-/* MySQL Parser */
-.syntax {font-family: sans-serif; font-size: <?php echo $font_smaller; ?>;}
-.syntax_comment            { padding-left: 4pt; padding-right: 4pt;}
-.syntax_digit              {}
-.syntax_digit_hex          {}
-.syntax_digit_integer      {}
-.syntax_digit_float        {}
-.syntax_punct              {}
-.syntax_alpha              {}
-.syntax_alpha_columnType   {text-transform: uppercase;}
-.syntax_alpha_columnAttrib {text-transform: uppercase;}
-.syntax_alpha_reservedWord {text-transform: uppercase; font-weight: bold;}
-.syntax_alpha_functionName {text-transform: uppercase;}
-.syntax_alpha_identifier   {}
-.syntax_alpha_charset      {}
-.syntax_alpha_variable     {}
-.syntax_quote              {white-space: pre;}
-.syntax_quote_backtick     {}
-
-hr{ color: #666666; background-color: #666666; border: 0; height: 1px; }
-
-/* new styles for navigation */
-
-.nav {
-    font-family: <?php echo $right_font_family; ?>;
-    color: #000000;
-    border-top: none;
-    border-right: none;
-    border-left: none;
-    border-bottom: 1px solid #666;
-}
-.navSpacer {
-    width:            5px;
-    height:           16px;
-}
-.navNormal, .navDrop, .navActive {
-    font-family:      <?php echo $right_font_family; ?>;
-    font-size:        <?php echo $font_size; ?>;
-    font-weight:      bold;
-    border-top: 1px solid #999;
-    border-right: 1px solid #666;
-    border-left: 1px solid #999;
-    border-bottom: none;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    padding: 2px 5px 2px 5px;
-}
-.navNormal {
-    color:            #000000;
-    background-color: #E5E5E5;
-}
-.navActive{
-    font-family:      <?php echo $right_font_family; ?>;
-    font-size:        <?php echo $font_size; ?>;
-    font-weight:      bold;
-    color:            #000000;
-    background-color: #CCCCCC;
-}
-.navDrop{
-    color: #000000;
-    background-color: #E5E5E5;
-}
-.navNormal a:link, .navNormal a:active, .navNormal a:visited, .navActive a:link, .navActive a:active, .navActive a:visited{
-    color: #0000FF;
-}
-
-.navDrop a:link, .navDrop a:active, .navDrop a:visited{
-    color: #FF0000;
-}
-.navDrop a:hover{
-    color: #FFFFFF;
-    background-color: #FF0000;
-}
-.navNormal a:hover, .navActive a:hover{
-    color: #FF0000;
-}
-
-/* Warning showing div with right border and optional icon */
-
-div.errorhead {
-    font-weight: bold;
-    color: #ffffff;
-    text-align: left;
-    <?php if ($cfg['ErrorIconic'] && isset($js_isDOM) && $js_isDOM != '0') { ?>
-    background-image: url(../images/s_error.png);
-    background-repeat: no-repeat;
-    background-position: 5px 50%;
-    padding: 0px 0px 0px 25px;
-    <?php } ?>
-    margin: 0px;
-}
-
-/* tables */
-.tblError {
-    border: 1px solid #FF0000;
-    background-color: #FFFFCC;
-}
-.tblWarn, div.tblWarn {
-    border: 1px solid #FF0000;
-    background-color: #FFFFFF;
-}
-div.tblWarn {
-    padding: 5px 5px 5px 5px;
-    margin:  0px 0px 5px 0px;
-    width:   100%;
-}
-.tblHeaders {
-    background-color: <?php echo $cfg['LeftBgColor']; ?>;
-    font-weight: bold;
-    color: #000000;
-}
-.tblFooters {
-    background-color: <?php echo $cfg['LeftBgColor']; ?>;
-    font-weight: normal;
-    color: #000000;
-}
-.tblHeaders a:link, .tblHeaders a:active, .tblHeaders a:visited, .tblFooters a:link, .tblFooters a:active, .tblFooters a:visited {
-    color: #0000FF;
-}
-.tblHeaders a:hover, .tblFooters a:hover { color: #FF0000; }
-.tblHeadError {
-    background-color: #FF0000;
-    font-weight: bold;
-    color: #FFFFFF;
-}
-.tblHeadWarn {
-    background-color: #FFCC00;
-    font-weight: bold;
-    color: #000000;
-}
-/* forbidden, no privilegs */
-.noPrivileges{
-    color: #FF0000;
-    font-weight: bold;
-}
-
-/* Heading */
-
-.serverinfo {
-    font-family: <?php echo $right_font_family; ?>;
-    font-size: <?php echo $font_size; ?>;
-    font-weight: normal;
-    white-space: nowrap;
-    vertical-align: middle;
-    padding: 0px 0px 10px 0px;
-}
-<?php if (isset($js_isDOM) && $js_isDOM != '0') { ?>
-.serverinfo a:link, .serverinfo a:activ, .serverinfo a:visited {
-    font-family: <?php echo $right_font_family; ?>;
-    font-size: <?php echo $font_size; ?>;
-    font-weight: bolder;
-}
-.serverinfo a img{
-    vertical-align: middle;
-    margin: 0px 1px 0px 2px;
-}
-.serverinfo div{
-    background-image:    url(../images/item_ltr.png);
-    background-repeat:   no-repeat;
-    background-position: 50% 50%;
-    width: 20px;
-    height: 16px;
-}
-#textSQLDUMP {
-    width: 95%;
-    height: 95%;
-    font-family: "Courier New", Courier, mono;
-    font-size:   12px;
-}
-<?php } // end of isDom ?>
-    <?php
     } // end of include theme_right.css.php
     echo PMA_SQP_buildCssData();
 }

libraries/select_theme.lib.php

@@ -55,13 +55,14 @@ if ($PMA_ThemeAvailable == TRUE){ // check after default theme
 } // end check default theme
 
 if ($PMA_ThemeAvailable == TRUE) { // themeManager is available
-    if ($PMA_ThemeDefault == TRUE) {
+    /*if ($PMA_ThemeDefault == TRUE) {
         // we must add default theme, because it has no directory
         $available_themes_choices[]='original';
-    }
+    }*/
     if ($handleThemes = opendir($cfg['ThemePath'])) { // check for themes directory
         while (false !== ($PMA_Theme = readdir($handleThemes))) { // get themes
-            if ($PMA_Theme != "." && $PMA_Theme != ".." && $PMA_Theme!='original' && $PMA_Theme!=$cfg['ThemeDefault'] && $PMA_Theme != 'CVS') { // file check
+            //if ($PMA_Theme != "." && $PMA_Theme != ".." && $PMA_Theme!='original' && $PMA_Theme!=$cfg['ThemeDefault'] && $PMA_Theme != 'CVS') { // file check
+            if ($PMA_Theme != "." && $PMA_Theme != ".."  && $PMA_Theme!=$cfg['ThemeDefault'] && $PMA_Theme != 'CVS') { // file check
                 if (@is_dir($cfg['ThemePath'].'/'.$PMA_Theme)) { // check the theme
                     $available_themes_choices[]=$PMA_Theme;
                 } // end check the theme

main.php

@@ -272,7 +272,7 @@ if ($server > 0) {
 <!-- MySQL server related links -->
 <table cellpadding="3" cellspacing="0">
     <tr>
-        <th<?php if($theme!='original'){ ?> class="tblHeaders"<?php } echo $str_iconic_colspan; ?>>&nbsp;&nbsp;MySQL</th>
+        <th class="tblHeaders"<?php echo $str_iconic_colspan; ?>>&nbsp;&nbsp;MySQL</th>
     </tr>
     <tr><?php
         echo '        ' . ($str_iconic_list != '' ? sprintf($str_iconic_list,'','b_newdb.png',$strCreateNewDatabase,'') : $str_normal_list); 
@@ -466,7 +466,7 @@ echo "\n";
 <td valign="top">
 <table border="0" cellpadding="3" cellspacing="0">
     <tr>
-        <th<?php if($theme!='original'){ ?> class="tblHeaders"<?php } echo $str_iconic_colspan; ?>>&nbsp;&nbsp;phpMyAdmin</th>
+        <th class="tblHeaders"<?php echo $str_iconic_colspan; ?>>&nbsp;&nbsp;phpMyAdmin</th>
     </tr>
 <?php
 // Displays language selection combo
@@ -575,7 +575,7 @@ echo "\n";
 
 if (count($available_themes_choices)>1) {
     $theme_selected = FALSE;
-    $theme_preview_path= './open.php?get=./' . $cfg['ThemePath'] . '/index.php';
+    $theme_preview_path= './themes.php';
     $theme_preview_href = '<a href="' . $theme_preview_path . '" target="themes" onclick="'
                         . "window.open('" . $theme_preview_path . "','themes','left=10,top=20,width=510,height=350,scrollbars=yes,status=yes,resizable=yes');"
                         . '">';
@@ -583,7 +583,7 @@ if (count($available_themes_choices)>1) {
     <!-- Theme Manager -->
     <tr>
 <?php
-        echo '        ' . ($str_iconic_list != '' ? sprintf($str_iconic_list,$theme_preview_href,'s_theme.png','Theme (Style)','</a>') : $str_normal_list) . "\n";
+        echo '        ' . ($str_iconic_list != '' ? sprintf($str_iconic_list,$theme_preview_href,'s_theme.png',(isset($strTheme) ? $strTheme : 'Theme (Style)'),'</a>') : $str_normal_list) . "\n";
 ?>
         <td>
             <form name="setTheme" method="post" action="index.php" target="_parent">

open.php

@@ -1,15 +0,0 @@
-<?php
-/* $Id$ */
-// vim: expandtab sw=4 ts=4 sts=4:
-/**
- * Gets some core libraries and displays a top message if required
- */
-require_once('./libraries/grab_globals.lib.php');
-require_once('./libraries/common.lib.php');
-if (strstr($get,$cfg['ThemePath'])) {
-    $path_to_themes = './' . $cfg['ThemePath'] . '/';
-}
-if (@file_exists($get)) {
-    include_once($get);
-}
-?>

themes.php

@@ -1,8 +1,8 @@
 <?php
-if (!isset($path_to_themes) || empty($path_to_themes)) {
-    $path_to_themes = './'; // set up the path to themes if not exists
-}
+require_once('./libraries/grab_globals.lib.php');
+require_once('./libraries/common.lib.php');
 /* Theme Select */
+$path_to_themes = './' . $cfg['ThemePath'] . '/';
 echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?".">";
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -64,9 +64,10 @@ echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?".">";
 
             <tr><td>&nbsp;</td></tr>
 <?php
+    /*
     $org_theme_screen = $path_to_themes . 'original/screen.png';
     if(@file_exists($org_theme_screen)){ // check if original theme have a screen
-?>
+
             <tr>
                 <td>
                     <?php
@@ -80,11 +81,12 @@ echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?".">";
                     ?>
                 </td>
             </tr>
-<?php
+
     } // end original theme screen
+    */
     if ($handleThemes = opendir($path_to_themes)) { // open themes
         while (false !== ($PMA_Theme = readdir($handleThemes))) {  // get screens
-            if ($PMA_Theme != "." && $PMA_Theme != ".." && !strstr($PMA_Theme,'original')) { // but not the original
+            if ($PMA_Theme != "." && $PMA_Theme != "..") { // && !strstr($PMA_Theme,'original')) { // but not the original
                 $screen_directory = $path_to_themes . $PMA_Theme;
                 if (is_dir($screen_directory) && @file_exists($screen_directory.'/screen.png')) { // if screen exists then output
 ?>
@@ -106,7 +108,7 @@ echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\"?".">";
             </tr>
 <?php   
                 } // end 'screen output'
-            } // end 'check if not original'
+            } // end 'check theme'
         } // end 'get screens'
         closedir($handleThemes); 
     } // end 'open themes'

themes/original/colors.inc.php

@@ -0,0 +1,57 @@
+<?php
+
+$cfg['LeftWidth']           = 200;          // left frame width
+/* colors */
+$cfg['LeftBgColor']         = '#D0DCE0';    // background color for the left frame
+$cfg['RightBgColor']        = '#F5F5F5';    // background color for the right frame
+$cfg['RightBgImage']        = '';           // path to a background image for the right frame
+                                            // (leave blank for no background image)
+$cfg['LeftPointerColor']    = '#CCFFCC';    // color of the pointer in left frame
+                                            // (blank for no pointer)
+$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
+                                            // (blank for no pointer)
+$cfg['BrowseMarkerColor']   = '#FFCC99';    // color of the marker (visually marks row
+                                            // by clicking on it) in browse mode
+                                            // (blank for no marker)
+/* rows and columns for inputs */
+$cfg['TextareaCols']        = 40;           // textarea size (columns) in edit mode
+                                            // (this value will be emphasized (*2) for sql
+                                            // query textareas and (*1.25) for query window)
+$cfg['TextareaRows']        = 7;            // textarea size (rows) in edit mode
+$cfg['CharTextareaCols']    = 40;           // textarea size (columns) for CHAR/VARCHAR
+$cfg['CharTextareaRows']    = 2;            // textarea size (rows) for CHAR/VARCHAR
+
+/**
+ * SQL Parser Settings
+ */
+$cfg['SQP']['fmtType']      = 'html';       // Pretty-printing style to use on queries (html, text, none)
+$cfg['SQP']['fmtInd']       = '1';          // Amount to indent each level (floats ok)
+$cfg['SQP']['fmtIndUnit']   = 'px';         // Units for indenting each level (CSS Types - {em,px,pt})
+$cfg['SQP']['fmtColor']     = array(        // Syntax colouring data
+    'comment'            => '#808000',
+    'comment_mysql'      => '',
+    'comment_ansi'       => '',
+    'comment_c'          => '',
+    'digit'              => '',
+    'digit_hex'          => 'teal',
+    'digit_integer'      => 'teal',
+    'digit_float'        => 'aqua',
+    'punct'              => 'fuchsia',
+    'alpha'              => '',
+    'alpha_columnType'   => '#FF9900',
+    'alpha_columnAttrib' => '#0000FF',
+    'alpha_reservedWord' => '#990099',
+    'alpha_functionName' => '#FF0000',
+    'alpha_identifier'   => 'black',
+    'alpha_charset'      => '#6495ed',
+    'alpha_variable'     => '#800000',
+    'quote'              => '#008000',
+    'quote_double'       => '',
+    'quote_single'       => '',
+    'quote_backtick'     => ''
+);
+?>

themes/original/css/theme_left.css.php

@@ -0,0 +1,70 @@
+<?php
+    if (isset($num_dbs) && $num_dbs == '0') {
+    ?>
+/* No layer effects neccessary */
+div     {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.heada  {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
+.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
+.tblItem:hover {color: #FF0000; text-decoration: underline}
+    <?php
+    } else {
+        if (isset($js_capable) && $js_capable != '0') {
+            // Brian Birtles : This is not the ideal method of doing this
+            // but under the 7th June '00 Mozilla build (and many before
+            // it) Mozilla did not treat text between <style> tags as
+            // style information unless it was written with the one call
+            // to write().
+            if (isset($js_isDOM) && $js_isDOM != '0') {
+            ?>
+/* Layer effects neccessary: capable && is_DOM is set. We found a recent CSS-Browser */
+div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
+.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; display: block}
+.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none; display: none}
+.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
+.tblItem:hover {color: #FF0000; text-decoration: underline}
+            <?php
+            } else {
+            ?>
+/* Layer effeccts neccessary: capable, but no is_DOM. We found an older CSS-Browser */
+div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
+            <?php
+                if (isset($js_isIE4) && $js_isIE4 != '0') {
+            ?>
+/* Additional effects for IE4 */
+.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; display: block}
+.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none; display: none}
+.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
+.tblItem:hover {color: #FF0000; text-decoration: underline}
+            <?php
+                } else {
+            ?>
+/* Additional effects for NON-IE4 */
+.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none; position: absolute; visibility: hidden}
+.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; position: absolute; visibility: hidden}
+.item, .tblItem {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
+            <?php
+                }
+            }
+        } else {
+        ?>
+/* Additional effects for left frame not required or not possible because of lacking CSS-capability. */
+div {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.heada {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000}
+.headaCnt {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #000000}
+.parent {font-family: <?php echo $left_font_family; ?>; color: #000000; text-decoration: none}
+.child {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
+.item, .item:active, .item:hover, .tblItem, .tblItem:active {font-size: <?php echo $font_smaller; ?>; color: #333399; text-decoration: none}
+.tblItem:hover {color: #FF0000; text-decoration: underline}
+        <?php
+        }
+    }
+    ?>
+/* Always enabled stylesheets (left frame) */
+body {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; }
+input   {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>}
+select  {font-family: <?php echo $left_font_family; ?>; font-size: <?php echo $font_size; ?>; background-color: #ffffff; color: #000000}

themes/original/css/theme_print.css.php

@@ -0,0 +1,41 @@
+/* For printview */
+body{
+    font-family:       Verdana, Arial, Hevetica, sans-serif;
+    font-size:         10px;
+    color:             #000000;
+    background-color:  #ffffff;
+}
+h1{
+    font-family:       Verdana, Arial, Hevetica, sans-serif;
+    font-size:         16px;
+    font-weight:       bold;
+    color:             #000000;
+}
+table{
+    border-width:      1px;
+    border-color:      #000000;
+    border-style:      solid;
+    border-collapse:   collapse;
+    border-spacing:    0;
+}
+th{
+    font-family:       Verdana, Arial, Hevetica, sans-serif;
+    font-size:         10px;
+    font-weight:       bold;
+    color:             #000000;
+    background-color:  #e5e5e5;
+    border-width:      1px;
+    border-color:      #000000;
+    border-style:      solid;
+    padding:           2px;
+}
+td{
+    font-family:       Verdana, Arial, Hevetica, sans-serif;
+    font-size:         10px;
+    color:             #000000;
+    background-color:  #ffffff;
+    border-width:      1px;
+    border-color:      #000000;
+    border-style:      solid;
+    padding:           2px;
+}

themes/original/css/theme_right.css.php

@@ -0,0 +1,279 @@
+/* Always enabled stylesheets (right frame) */
+body {
+    font-family: <?php echo $right_font_family; ?>;
+    font-size: <?php echo $font_size; ?>;
+    color: #000000;
+    <?php
+    if ($GLOBALS['cfg']['RightBgImage'] == '') {
+        // calls from a css file are relative to itself, so use ../images
+        echo '    background-image: url(../images/vertical_line.png);' . "\n"
+           . '    background-repeat: repeat-y;' . "\n";
+    } else {
+        echo '    background-image: url(' . $GLOBALS['cfg']['RightBgImage'] . ');' . "\n";
+    } // end if... else...
+    ?>
+    background-color: <?php echo $GLOBALS['cfg']['RightBgColor'] . "\n"; ?>
+}
+
+pre, tt         {font-size: <?php echo $font_size; ?>}
+th              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #000000; background-color: <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>}
+td              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
+form            {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; padding: 0px; margin: 0px;}
+input           {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>}
+input.textfield {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #FFFFFF}
+select          {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #FFFFFF}
+textarea        {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; color: #000000; background-color: #FFFFFF}
+h1              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold}
+h2              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold}
+h3              {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold}
+a:link          {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000FF}
+a:visited       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: none; color: #0000FF}
+a:hover         {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; text-decoration: underline; color: #FF0000}
+a.nav:link      {font-family: <?php echo $right_font_family; ?>; color: #000000}
+a.nav:visited   {font-family: <?php echo $right_font_family; ?>; color: #000000}
+a.nav:hover     {font-family: <?php echo $right_font_family; ?>; color: #FF0000}
+a.h1:link       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #000000}
+a.h1:active     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #000000}
+a.h1:visited    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #000000}
+a.h1:hover      {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_biggest; ?>; font-weight: bold; color: #FF0000}
+a.h2:link       {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #000000}
+a.h2:active     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #000000}
+a.h2:visited    {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #000000}
+a.h2:hover      {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_bigger; ?>; font-weight: bold; color: #FF0000}
+a.drop:link     {font-family: <?php echo $right_font_family; ?>; color: #ff0000}
+a.drop:visited  {font-family: <?php echo $right_font_family; ?>; color: #ff0000}
+a.drop:hover    {font-family: <?php echo $right_font_family; ?>; color: #ffffff; background-color:#ff0000; text-decoration: none}
+dfn             {font-style: normal}
+dfn:hover       {font-style: normal; cursor: help}
+.nav            {font-family: <?php echo $right_font_family; ?>; color: #000000}
+.warning        {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_size; ?>; font-weight: bold; color: #FF0000}
+.tblcomment     {font-family: <?php echo $right_font_family; ?>; font-size: <?php echo $font_smallest; ?>; font-weight: normal; color: #000099; }
+td.topline      {font-size: 1px}
+td.tab          {
+    border-top: 1px solid #999;
+    border-right: 1px solid #666;
+    border-left: 1px solid #999;
+    border-bottom: none;
+    border-radius: 2px;
+    -moz-border-radius: 2px;
+}
+
+div.tabs        {
+    clear: both;
+}
+
+table.tabs      {
+    border-top: none;
+    border-right: none;
+    border-left: none;
+    border-bottom: 1px solid #666;
+}
+
+fieldset        {
+    border:     #686868 solid 1px;
+    padding:    0.5em;
+}
+fieldset fieldset {
+    margin:     0.8em;
+}
+
+button.mult_submit {
+    border: none;
+    background-color: transparent;
+}
+
+.pdflayout {
+    overflow:         hidden;
+    clip:             inherit;
+    background-color: #FFFFFF;
+    display:          none;
+    border:           1px solid #000000;
+    position:         relative;
+}
+
+.pdflayout_table {
+    background:       <?php echo $GLOBALS['cfg']['ThBgcolor']; ?>;
+    color:            #000000;
+    overflow:         hidden;
+    clip:             inherit;
+    z-index:          2;
+    display:          inline;
+    visibility:       inherit;
+    cursor:           move;
+    position:         absolute;
+    font-size:        <?php echo $font_smaller; ?>;
+    border:           1px dashed #000000;
+}
+
+.print{font-family:arial;font-size:8pt;}
+
+/* MySQL Parser */
+.syntax {font-family: sans-serif; font-size: <?php echo $font_smaller; ?>;}
+.syntax_comment            { padding-left: 4pt; padding-right: 4pt;}
+.syntax_digit              {}
+.syntax_digit_hex          {}
+.syntax_digit_integer      {}
+.syntax_digit_float        {}
+.syntax_punct              {}
+.syntax_alpha              {}
+.syntax_alpha_columnType   {text-transform: uppercase;}
+.syntax_alpha_columnAttrib {text-transform: uppercase;}
+.syntax_alpha_reservedWord {text-transform: uppercase; font-weight: bold;}
+.syntax_alpha_functionName {text-transform: uppercase;}
+.syntax_alpha_identifier   {}
+.syntax_alpha_charset      {}
+.syntax_alpha_variable     {}
+.syntax_quote              {white-space: pre;}
+.syntax_quote_backtick     {}
+
+hr{ color: #666666; background-color: #666666; border: 0; height: 1px; }
+
+/* new styles for navigation */
+
+.nav {
+    font-family: <?php echo $right_font_family; ?>;
+    color: #000000;
+    border-top: none;
+    border-right: none;
+    border-left: none;
+    border-bottom: 1px solid #666;
+}
+.navSpacer {
+    width:            5px;
+    height:           16px;
+}
+.navNormal, .navDrop, .navActive {
+    font-family:      <?php echo $right_font_family; ?>;
+    font-size:        <?php echo $font_size; ?>;
+    font-weight:      bold;
+    border-top: 1px solid #999;
+    border-right: 1px solid #666;
+    border-left: 1px solid #999;
+    border-bottom: none;
+    border-radius: 2px;
+    -moz-border-radius: 2px;
+    padding: 2px 5px 2px 5px;
+}
+.navNormal {
+    color:            #000000;
+    background-color: #E5E5E5;
+}
+.navActive{
+    font-family:      <?php echo $right_font_family; ?>;
+    font-size:        <?php echo $font_size; ?>;
+    font-weight:      bold;
+    color:            #000000;
+    background-color: #CCCCCC;
+}
+.navDrop{
+    color: #000000;
+    background-color: #E5E5E5;
+}
+.navNormal a:link, .navNormal a:active, .navNormal a:visited, .navActive a:link, .navActive a:active, .navActive a:visited{
+    color: #0000FF;
+}
+
+.navDrop a:link, .navDrop a:active, .navDrop a:visited{
+    color: #FF0000;
+}
+.navDrop a:hover{
+    color: #FFFFFF;
+    background-color: #FF0000;
+}
+.navNormal a:hover, .navActive a:hover{
+    color: #FF0000;
+}
+
+/* Warning showing div with right border and optional icon */
+
+div.errorhead {
+    font-weight: bold;
+    color: #ffffff;
+    text-align: left;
+    <?php if ($cfg['ErrorIconic'] && isset($js_isDOM) && $js_isDOM != '0') { ?>
+    background-image: url(../images/s_error.png);
+    background-repeat: no-repeat;
+    background-position: 5px 50%;
+    padding: 0px 0px 0px 25px;
+    <?php } ?>
+    margin: 0px;
+}
+
+/* tables */
+.tblError {
+    border: 1px solid #FF0000;
+    background-color: #FFFFCC;
+}
+.tblWarn, div.tblWarn {
+    border: 1px solid #FF0000;
+    background-color: #FFFFFF;
+}
+div.tblWarn {
+    padding: 5px 5px 5px 5px;
+    margin:  0px 0px 5px 0px;
+    width:   100%;
+}
+.tblHeaders {
+    background-color: <?php echo $cfg['LeftBgColor']; ?>;
+    font-weight: bold;
+    color: #000000;
+}
+.tblFooters {
+    background-color: <?php echo $cfg['LeftBgColor']; ?>;
+    font-weight: normal;
+    color: #000000;
+}
+.tblHeaders a:link, .tblHeaders a:active, .tblHeaders a:visited, .tblFooters a:link, .tblFooters a:active, .tblFooters a:visited {
+    color: #0000FF;
+}
+.tblHeaders a:hover, .tblFooters a:hover { color: #FF0000; }
+.tblHeadError {
+    background-color: #FF0000;
+    font-weight: bold;
+    color: #FFFFFF;
+}
+.tblHeadWarn {
+    background-color: #FFCC00;
+    font-weight: bold;
+    color: #000000;
+}
+/* forbidden, no privilegs */
+.noPrivileges{
+    color: #FF0000;
+    font-weight: bold;
+}
+
+/* Heading */
+
+.serverinfo {
+    font-family: <?php echo $right_font_family; ?>;
+    font-size: <?php echo $font_size; ?>;
+    font-weight: normal;
+    white-space: nowrap;
+    vertical-align: middle;
+    padding: 0px 0px 10px 0px;
+}
+<?php if (isset($js_isDOM) && $js_isDOM != '0') { ?>
+.serverinfo a:link, .serverinfo a:activ, .serverinfo a:visited {
+    font-family: <?php echo $right_font_family; ?>;
+    font-size: <?php echo $font_size; ?>;
+    font-weight: bolder;
+}
+.serverinfo a img{
+    vertical-align: middle;
+    margin: 0px 1px 0px 2px;
+}
+.serverinfo div{
+    background-image:    url(../images/item_ltr.png);
+    background-repeat:   no-repeat;
+    background-position: 50% 50%;
+    width: 20px;
+    height: 16px;
+}
+#textSQLDUMP {
+    width: 95%;
+    height: 95%;
+    font-family: "Courier New", Courier, mono;
+    font-size:   12px;
+}
+<?php } // end of isDom ?>