fixed code indention

paradice/css/theme_left.css.php

@@ -1,42 +1,39 @@
 <?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * navigation css file from theme
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Paradice
- */
+/* vim: set expandtab sw=4 ts=4 sts=4: */ 	 
+/**     
+ * navigation css file from theme   
+ *      
+ * @version $Id$    
+ * @package phpMyAdmin-theme    
+ * @subpackage Paradice     
+*/
 
-    // unplanned execution path
-    if (!defined('PMA_MINIMUM_COMMON')) {
-        exit();
-    }
-?> 
+// unplanned execution path
+if (!defined('PMA_MINIMUM_COMMON')) {
+    exit();
+}
+?>
 /******************************************************************************/
 /* general tags */
+
 body {
-    font-family:      Verdana, Arial, Helvetica, sans-serif;
-    font-size:        12px;
-    background-color: #3674CF;
-    color:            #ffffff;
-    margin: 0;
-    padding: 2px 2px 2px 2px;
-	background-image: 		url(themes/paradice/img/leftBgnd.jpg);
-	background-position: 	left top;
-	background-repeat: 		repeat-y;
+<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
+    font-family:        <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
+<?php } ?>
+	font-size:			0.8em;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    margin:             0;
+    padding:            0.2em 0.2em 0.2em 0.2em;
+	background-image: 	url(../<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>leftBgnd.png);
+	background-position:left top;
+	background-repeat: 	repeat-y;
 }
 
 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;
@@ -46,8 +43,7 @@ form {
 select {
     background-color:   #ffffff;
     color:              #000000;
-    width:              150px;
-	font-size:			10px;
+    width:              100%;
 }
 
 /* buttons in some browsers (eg. Konqueror) are block elements,
@@ -67,10 +63,6 @@ button {
     margin-left:        0.3em;
 }
 
-img.lightbulb {
-    cursor:             pointer;
-}
-
 
 /******************************************************************************/
 /* specific elements */
@@ -79,36 +71,75 @@ div#pmalogo,
 div#leftframelinks,
 div#databaseList {
     text-align:         center;
-    border-bottom:      0.05em solid #ffffff;
+    border-bottom:      0.05em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
     margin-bottom:      0.5em;
     padding-bottom:     0.5em;
 }
 
-div#leftframelinks img {
-    vertical-align: middle;
+ul#databaseList {
+    border-bottom:      0.05em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    margin-bottom:      0.5em;
+    padding-bottom:     0.5em;
+    padding-left: 	1.5em;
+}
+
+ul#databaseList a {
+    display: block;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+}
+
+ul#databaseList a:hover {
+    background:         <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
+}
+
+ul#databaseList li.selected a {
+    background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
+    color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
+}
+
+div#leftframelinks .icon {
     padding:            0;
     margin:             0;
 }
 
-div#leftframelinks a {
-    margin:             0.1em;
+div#leftframelinks a img.icon {
+    margin:             0;
     padding:            0.2em;
     border:             0;
 }
 
 div#leftframelinks a:hover {
-	background-color: #3674CF;
-    color: #FFFFFF;	
+    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
+}
+
+/* serverlist */
+#body_leftFrame #list_server {
+    list-style-image: url(../<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_host.png);
+    list-style-position: inside;
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
+
+#body_leftFrame #list_server li {
+    margin: 0;
+    padding: 0;
+    font-size:          80%;
 }
 
 /* leftdatabaselist */
+div#left_tableList {
+	background-color:	none;
+}
 div#left_tableList ul {
     list-style-type:    none;
     list-style-position: outside;
     margin:             0;
     padding:            0;
-    font-size:          10px;
-    background-color:   #3674CF;
+    font-size:          80%;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
 }
 
 div#left_tableList ul ul {
@@ -116,13 +147,15 @@ div#left_tableList ul ul {
 }
 
 div#left_tableList a {
-    color:              #ffffff;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
     text-decoration:    none;
 }
 
 div#left_tableList a:hover {
-    color:              #ffffcc;
-    text-decoration: 	none;
+    background:         <?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
+    text-decoration:    underline;
 }
 
 div#left_tableList li {
@@ -131,9 +164,20 @@ div#left_tableList li {
     white-space:        nowrap;
 }
 
+<?php if ($GLOBALS['cfg']['BrowseMarkerColor']) { ?>
+/* marked items */
+div#left_tableList > ul li.marked > a,
+div#left_tableList > ul li.marked {
+    background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
+    color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
+}
+<?php } ?>
+
 <?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
-div#left_tableList li:hover {
-    background-color: #2563BE;
+div#left_tableList > ul li:hover > a,
+div#left_tableList > ul li:hover {
+    background:         <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
+    color:              <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
 }
 <?php } ?>
 
@@ -143,9 +187,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']['NaviColor']; ?>;
     padding-bottom:     0.1em;
-    border-bottom:      0.1em solid #ffffff;
+    border-bottom:      0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
 }

paradice/css/theme_print.css.php

@@ -1,51 +1,38 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * print css file from theme
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Paradice
- */
-?>
+<?php 	 
+/* vim: set expandtab sw=4 ts=4 sts=4: */ 	 
+/** 	 
+ * print css file from theme 	 
+ * 	 
+ * @version $Id$ 	 
+ * @package phpMyAdmin-theme 	 
+ * @subpackage Paradice 	 
+ */ 	 
 /* For printview */
-body{
-    font-family:       Verdana, Arial, Helvetica, sans-serif;
-    font-size:         10px;
+body, table, th, td {
     color:             #000000;
     background-color:  #ffffff;
 }
-h1{
-    font-family:       Verdana, Arial, Helvetica, sans-serif;
-    font-size:         16px;
-    font-weight:       bold;
-    color:             #000000;
+
+img {
+    border: 0;
 }
-table{
-    border-width:      1px;
+
+table, th, td {
+    border-width:      0.1em;
     border-color:      #000000;
     border-style:      solid;
+}
+
+table {
     border-collapse:   collapse;
     border-spacing:    0;
 }
-th{
-    font-family:       Verdana, Arial, Helvetica, sans-serif;
-    font-size:         10px;
-    font-weight:       bold;
-    color:             #000000;
-    background-color:  #e5e5e5;
-    border-width:      1px;
-    border-color:      #000000;
-    border-style:      solid;
-    padding:           2px;
+
+th, td {
+    padding:           0.2em;
+}
+
+th {
+    font-weight:       bold;
+    background-color:  #e5e5e5;
 }
-td{
-    font-family:       Verdana, Arial, Helvetica, sans-serif;
-    font-size:         10px;
-    color:             #000000;
-    background-color:  #ffffff;
-    border-width:      1px;
-    border-color:      #000000;
-    border-style:      solid;
-    padding:           2px;
-}

paradice/info.inc.php

@@ -1,18 +1,17 @@
 <?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * Theme information
- * 
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Paradice
+/* vim: set expandtab sw=4 ts=4 sts=4: */ 	 
+/** 	 
+ * Theme information 	 
+ * 	 
+ * 	 
+ * @version $Id$ 	 
+ * @package phpMyAdmin-theme 	 
+ * @subpackage Paradice 	 
  */
-
+ 
 /**
  *
  */
 $theme_name = 'Paradice';
-$theme_version = 2;
-$theme_generation = 2;
+$theme_full_version = '2.10';
 ?>

paradice/layout.inc.php

@@ -1,37 +1,92 @@
 <?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- *
- * @version $Id$
- * @package phpMyAdmin-theme
- * @subpackage Paradice
+/* vim: set expandtab sw=4 ts=4 sts=4: */ 	 
+/** 	 
+ * 	 
+ * @version $Id$ 	 
+ * @package phpMyAdmin-theme 	 
+ * @subpackage Paradice 	 
  */
 
 /**
- *
+ * navi frame
  */
-$cfg['LeftWidth']           = 180;          						// left frame width
-/* colors */
-$cfg['LeftBgColor']         = '#3674CF';    						// background color for the left frame
-$cfg['RightBgColor']        = '#FFFFFF';    						// background color for the right frame
-$cfg['RightBgImage']        = 'themes/paradice/img/rightBgnd.jpg';  // path to a background image for the right 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']           = '#79A2DF';    						// 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
+// navi frame width
+$GLOBALS['cfg']['NaviWidth']                = 164;
 
-$cfg['QueryWindowWidth']    = 550;          						// Width of Query window
-$cfg['QueryWindowHeight']   = 310;          						// Height of Query window
+// foreground (text) color for the navi frame
+$GLOBALS['cfg']['NaviColor']                = '#FFFFFF';
+
+// background for the navi frame
+$GLOBALS['cfg']['NaviBackground']           = '#3674CF';
+
+// foreground (text) color of the pointer in navi frame
+$GLOBALS['cfg']['NaviPointerColor']         = '#000000';
+// background of the pointer in navi frame
+$GLOBALS['cfg']['NaviPointerBackground']    = '#5796EF';
+
+/**
+ * main frame
+ */
+// foreground (text) color for the main frame
+$GLOBALS['cfg']['MainColor']                = '#142F56';
+
+// background for the main frame
+$GLOBALS['cfg']['MainBackground']           = '#FFFFFF';
+//$GLOBALS['cfg']['MainBackground']       = '#F5F5F5 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y';
+
+// foreground (text) color of the pointer in browse mode
+$GLOBALS['cfg']['BrowsePointerColor']       = '#FFFFFF';
+
+// background of the pointer in browse mode
+$GLOBALS['cfg']['BrowsePointerBackground']  = '#5287D6';
+
+// foreground (text) color of the marker (visually marks row by clicking on it) in browse mode
+$GLOBALS['cfg']['BrowseMarkerColor']        = '#000000';
+
+// background of the marker (visually marks row by clicking on it) in browse mode
+$GLOBALS['cfg']['BrowseMarkerBackground']   = '#FBAE36';
+
+/**
+ * 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']      = '"Courier New", Courier, monospace';
+
+/**
+ * tables
+ */
+// border
+$GLOBALS['cfg']['Border']               = 0;
+// table header and footer color
+$GLOBALS['cfg']['ThBackground']         = '#79A2DF';
+// table header and footer background
+$GLOBALS['cfg']['ThColor']              = '#000000';
+// table data row background
+$GLOBALS['cfg']['BgOne']                = '#EEEEEE';
+// table data row background, alternate
+$GLOBALS['cfg']['BgTwo']                = '#E5E5E5';
+
+/**
+ * query window
+ */
+// Width of Query window
+$GLOBALS['cfg']['QueryWindowWidth']     = 600;
+// Height of Query window
+$GLOBALS['cfg']['QueryWindowHeight']    = 400;
 
 /**
  * SQL Parser Settings
+ * Syntax colouring data
  */
-$cfg['SQP']['fmtColor']     = array(        						// Syntax colouring data
+$GLOBALS['cfg']['SQP']['fmtColor']      = array(
     'comment'            => '#808000',
     'comment_mysql'      => '',
     'comment_ansi'       => '',