From f0186983cc3a43ff37e35c5b32273446d6aaf59b Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sun, 25 Feb 2007 13:40:45 +0000
Subject: [PATCH] 2.9d

---
 grid/css/theme_left.css.php  |  238 +++---
 grid/css/theme_right.css.php | 1351 +++++++++-------------------------
 grid/info.inc.php            |   17 +-
 grid/layout.inc.php          |  111 +--
 4 files changed, 491 insertions(+), 1226 deletions(-)

diff --git a/grid/css/theme_left.css.php b/grid/css/theme_left.css.php
index 48a1d7b44..9ccf41ae8 100644
--- a/grid/css/theme_left.css.php
+++ b/grid/css/theme_left.css.php
@@ -1,173 +1,101 @@
-<?php /*jw <-- diff from original  20060922 */
-// 2do: hover background in Gecko not fitting the img size , a hint somebody?
-// unplanned execution path
-if (!defined('PMA_MINIMUM_COMMON')) {
-	exit();
-}
-$VER = substr(PMA_VERSION,0,3); /*jw for use with older versions: */
-if (('2.7'==$VER)or('2.8'==$VER)) echo "/*$VER*/
-html {
-	font-size:	", $GLOBALS['cfg']['FontSize'], ';
+<?php
+// 2do: hover background in Gecko not fitting the img size , has anybody a hint?
+// illegal execution path
+if (!defined('PMA_MINIMUM_COMMON')) exit();
+
+$parts = explode('.', PMA_VERSION );// f.e. 2.11.0-dev
+$last  = explode('-', $parts[2]);   // 2.8.2.4Ğlast part ignored
+$iPmaVersion = 10000 * $parts[0] + 100 * $parts[1] + $last[0];// max 99 ?
+// new  pma 2.11 style image paths:
+if($iPmaVersion < 21100) {
+// old style (causing problems with some MS products) :
+	$GridImgPath = '../' . $_SESSION['PMA_Theme']->getImgPath();
+} else {
+	$GridImgPath = $_SESSION['PMA_Theme']->getImgPath();
 }
+
+if($iPmaVersion < 20900) {
+	echo 'html,
+table{font-size:', $GLOBALS['cfg']['FontSize'],'}
 ';
-?>
-
-/** Navi general v.2.9 for pma2.8+ windkiel 20060917 **/
-* { <?php /*jw general reset and corrected later, if needed (f.e. hr) */ ?>
-	margin:	0;
-	padding:	0
 }
-
-body {
-<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
-	font-family:	<?php echo $GLOBALS['cfg']['FontFamily']; ?>;
-<?php } ?>
-	background:	<?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-	color:	<?php echo $GLOBALS['cfg']['NaviColor']; ?>;
-	padding:	.2em;
+/** general **/
+echo '/*theme "Grid-2.9d" Navi 20070211 windkiel pma 2.8..2.1x*/
+*{margin:0;padding:0}';//1st: general reset and corrected later, if needed (f.e. hr)
+echo '
+body{background:', $GLOBALS['cfg']['NaviBackground'],
+	';color:', $GLOBALS['cfg']['NaviColor'],
+	';padding:.2em';
+if (!empty($GLOBALS['cfg']['FontFamily'])) {
+	echo ';font-family:', $GLOBALS['cfg']['FontFamily'];
 }
+echo '}
+hr{margin:5px 0 5px}
+a img{border:0}
+form{display:inline}
+select{width:100%}
+button{display:inline}'; // buttons in some browsers (eg. Konqueror) are block elements,this breaks design
 
-hr {
-	margin:	5px	0	5px
-}
-
-a img {
-	border:	0;
-}
-
-form {
-	display:	inline;
-}
-
-select {
-	width:	100%;
-}
-
-/* buttons in some browsers (eg. Konqueror) are block elements,
-   this breaks design */
-button {
-	display:	inline;
-}
-
-
-<?php /* * * * * * * * * * * * * * * * * */ ?>
-/* classes */
-
-/* leave some space between icons and text */
-.icon {
-	vertical-align:	middle;
-	margin:	0	.3em	0	.3em;
-}
-
-
-<?php /* * * * * * * * * * * * * * * * * */ ?>
-/* specific elements */
-
-div#pmalogo,
-div#leftframelinks {
-	text-align:	center;
-}
+/* * * * classes * * * * * * * * * * * * * */
+/*
+specific elements div#pmalogo{background:', $GLOBALS['cfg']['NaviLinkBackground'], '}
 div#pmalogo,
+*/
+
+/* leave some space between icons and text: */ echo '
+.icon{vertical-align:middle;margin:0 .1em 0 .1em}
+div#leftframelinks{padding-top:5px;text-align:center}
+div#leftframelinks a img.icon{padding:.1em;border:0}
 div#leftframelinks,
-div#databaseList {
-	border-bottom:	1px solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
-	margin-bottom:	.5em;
-	padding-bottom:	.5em;
+div#databaseList{margin-bottom:.5em;padding-bottom:.5em;border-bottom:1px solid ', $GLOBALS['cfg']['NaviColor'], '}
+div#pmalogo{text-align:center;';
+if($iPmaVersion > 20900) {
+	echo 'background:', $GLOBALS['cfg']['NaviLinkBackground'];
+} else {
+	echo 'border-bottom:1px solid ', $GLOBALS['cfg']['NaviColor'];
 }
-<?php if( ($GLOBALS['cfg']['LeftDisplayServers'])&&($GLOBALS['cfg']['LeftFrameLight']) ) {
-	echo '
-div#databaseList {
-	text-align:	left;
-}'; // looks nicer if LeftDisplayServers==true
-	}; ?>
+echo "}\n";
+if( ($GLOBALS['cfg']['LeftDisplayServers'])&&($GLOBALS['cfg']['LeftFrameLight']) ){
+	echo 'div#databaseList{text-align:left}
+'; // looks nicer if LeftDisplayServers==true
+};
 
-
-div#leftframelinks a img.icon {
-	padding:	.1em;
-	border:	0 <?php /*1px solid */ 
-	//echo $GLOBALS['cfg']['NaviColor']; //top links ?>;
+if($GLOBALS['cfg']['LeftPointerEnable']){
+	echo 'div#leftframelinks a:hover{background:', $GLOBALS['cfg']['NaviPointerBackground'],
+';color:', $GLOBALS['cfg']['NaviPointerColor'], '}
+';
 }
+/*1px solid echo $GLOBALS['cfg']['NaviColor']; top links */
 
-div#leftframelinks a:hover {
-	background:	<?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
-	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;
-}
-
-#body_leftFrame #list_server li {
-	font-size:	<?php echo $GLOBALS['cfg']['NaviFontPercentage']; ?>;
-}
-
-
-/* leftdatabaselist */
-div#left_tableList ul {
-	list-style-type:	none;
-	list-style-position:outside;
-	font-size:	<?php echo $GLOBALS['cfg']['NaviFontPercentage']; ?>;
-	background:	<?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-}
-
-
-div#left_tableList ul ul {
-	font-size:	100%;
-}
-
-
-/*jw*/
-div#left_tableList a {
-	text-decoration:	none;
-	color:	<?php echo $GLOBALS['cfg']['NaviLinkColor']; ?>;
+/* serverlist */ ?>
+#body_leftFrame #list_server{list-style-image: url("<?php
+ echo $GridImgPath; ?>s_host.png");list-style-position: inside;list-style-type:none}
+#body_leftFrame #list_server li{font-size:<?php echo $GLOBALS['cfg']['NaviFontPercentage']; ?>}
+<?php /* leftdatabaselist */ ?>
+div#left_tableList ul{list-style-type:none;list-style-position:outside;font-size:<?php
+ echo $GLOBALS['cfg']['NaviFontPercentage']; ?>;background:<?php echo $GLOBALS['cfg']['NaviBackground']; ?>}
+div#left_tableList ul ul{font-size:100%}
+div#left_tableList a{text-decoration:none;color:<?php echo $GLOBALS['cfg']['NaviLinkColor']; ?>}
 <?php
 // echo 	background:	',$GLOBALS['cfg']['NaviLinkBackground'];
 // makes marking impossibel
 ?>
-}
-
 a,
-div#left_tableList a {
-	padding:	0	2px	0	2px;
-}
-
-<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
+div#left_tableList a{padding:0 2px 0 2px}
+<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ){ ?>
 a:hover,
-div#left_tableList a:hover {
-	background:	<?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
-	color:	<?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
-	text-decoration:	underline;
-}
-<?php } else { ?>
-div#left_tableList a:hover {
-/*
-	background:	<?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-	color:	red <?php #echo $GLOBALS['cfg']['NaviColor']; ?>;
-*/
-	text-decoration:	underline;
-}
+div#left_tableList a:hover{background:<?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;color:<?php
+ echo $GLOBALS['cfg']['NaviPointerColor']; ?>;text-decoration:underline}
+<?php } else{ ?>
+div#left_tableList a:hover{text-decoration:underline}
 <?php } ?>
-
-
-<?php if ($GLOBALS['cfg']['NaviMarkedColor']) { ?>
-/* marked items */
-div#left_tableList ul li.marked {
-	background:	<?php echo $GLOBALS['cfg']['NaviMarkedBackground']; ?>;
-	color:	<?php echo $GLOBALS['cfg']['NaviMarkedColor']; ?>;
-}
-<?php } ?>
-
-div#left_tableList img {
-	vertical-align:	middle;
-}
-
-div#left_tableList ul ul {
-	padding-left:	1px;
-	border-left:	1px solid <?php echo $GLOBALS['cfg']['NaviColor']; // ab__cd ?>;
-	padding-bottom:	1px;
-	border-bottom:	1px solid <?php echo $GLOBALS['cfg']['NaviColor']; //2do ltr rtl ?>;
-}
+<?php
+if( ($GLOBALS['cfg']['LeftMarkerEnable'] ) && ($GLOBALS['cfg']['NaviMarkedColor']) ){
+	echo 'div#left_tableList ul li.marked{background:', $GLOBALS['cfg']['NaviMarkedBackground'], ';color:', $GLOBALS['cfg']['NaviMarkedColor'], '}
+';
+}/* end marked items */
+?>
+div#left_tableList img{vertical-align:middle}
+div#left_tableList ul ul{padding-left:1px;border-left:1px solid <?php
+ echo $GLOBALS['cfg']['NaviColor']; /* ab__cd */ ?>;padding-bottom:1px;border-bottom:1px solid <?php
+ echo $GLOBALS['cfg']['NaviColor']; /*2do ltr rtl*/ ?>}
diff --git a/grid/css/theme_right.css.php b/grid/css/theme_right.css.php
index 4de2fdb3a..6c61db3d2 100644
--- a/grid/css/theme_right.css.php
+++ b/grid/css/theme_right.css.php
@@ -1,1117 +1,436 @@
-<?php /*jw <-- diff from original/theme_right.css.php 2006-12-29 IE6 sql window fix */
-	// unplanned execution path
-if (!defined('PMA_MINIMUM_COMMON')) {
-	exit();
-}
-/*jw*/
-if ('2.8' == substr(PMA_VERSION,0,3)) {
-	echo "/* 2.8 (experimental) */
-html {
-	font-size:	", $GLOBALS['cfg']['FontSize'],'
-}
+<?php
+/* theme_right.css.php 2006-12-29 IE6 sql window fix 2do:pma28 hover th?*/
+// unplanned execution path
+if(!defined('PMA_MINIMUM_COMMON')) exit();
 
-table {
-	font-size:	', $GLOBALS['cfg']['FontSize'],'
+$parts = explode('.', PMA_VERSION );// f.e. 2.11.0-dev
+$last  = explode('-', $parts[2]);   // 2.8.2.4Ğlast part ignored
+$iPmaVersion = 10000 * $parts[0] + 100 * $parts[1] + $last[0];
+// new  pma 2.11 style image paths:
+if($iPmaVersion < 21100) {
+// old style (causing problems with some MS products) :
+	$GridImgPath = '../' . $_SESSION['PMA_Theme']->getImgPath();
+} else {
+	$GridImgPath = $_SESSION['PMA_Theme']->getImgPath();
 }
-';//echo
+echo'
+/** general tags "Grid-2.9d" right 20070211 windkiel pma 2.8 .. 2.1x */';
 
-} //<2.9
+if($iPmaVersion < 20900) {
+	echo '
+html,
+table{font-size:', $GLOBALS['cfg']['FontSize'],'}
+td,
+th{color:', $GLOBALS['cfg']['MainColor'], '}';
+}
+$listImgUrl = 'list-style-image:url("'. $GridImgPath; //.....xxx.png")
+echo'
+body{padding:0;margin:.4em;color:', $GLOBALS['cfg']['MainColor'],';background:', $GLOBALS['cfg']['MainBackgroundColor'];
+if ( 'MOZILLA' != PMA_USR_BROWSER_AGENT ) echo ' url("', $GridImgPath, 'vertical_line.png") repeat-y';
+// http://www.w3.org/TR/CSS21/syndata.html (double) quotes around url ok (just incase someone has spaces in his path)
+if(!empty($GLOBALS['cfg']['FontFamily'])) echo ';font-family:', $GLOBALS['cfg']['FontFamily'];
+echo '}
+';
+
+if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) echo 'textarea,
+tt,
+pre,
+code{font-family:', $GLOBALS['cfg']['FontFamilyFixed'], '}
+';
 ?>
-/** Grid right general tags v. 2.9 20060922 windkiel **/
-body {
-<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
-	font-family:		<?php echo $GLOBALS['cfg']['FontFamily']; ?>;
-<?php } ?>
-	padding:		0;
-	margin:		.4em;/*.5*/
-	color:		<?php echo $GLOBALS['cfg']['MainColor']; ?>;
-	background:		<?php echo $GLOBALS['cfg']['MainBackground']; ?>;
-}
-
-<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
-textarea, tt, pre, code {
-	font-family:	<?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
-}
-<?php } ?>
-input { /*jw*/
-	padding:		0 .3em;
-	font-size:		100%
-}
-
-h1 {
-	font-size:		140%;
-	font-weight:	bold;
-	margin:		0 .8em 0 .8em;/*jw*/
-}
-
-h2 {
-	font-size:		120%;
-	font-weight:	bold;
-}
-
-h3 {
-	font-weight:	bold;
-}
-
-a {
-	padding:		0	.1em	0	.1em
-}
+input{padding:0 .3em;font-size:100%}
+h1{font-size:140%;font-weight:bold;margin:0 .8em 0 .8em}
+h2{font-size:120%;font-weight:bold}
+h3{font-weight:bold}
+a{padding:.1em .1em}
 a:link,
 a:visited,
-a:active {
-	text-decoration:	none;
-	color:	<?php echo $GLOBALS['cfg']['MainLinkColor']; /*jw,was 00f*/ ?>;
-}
+a:active{text-decoration:none;color:<?php echo $GLOBALS['cfg']['MainLinkColor']; ?>}
+a:hover{text-decoration:underline;color:<?php echo $GLOBALS['cfg']['MainLinkColor']; ?>;background:<?php
+ echo $GLOBALS['cfg']['MainLinkBackground']; ?>}
+dfn{font-style:normal}
+dfn:hover{font-style:normal;cursor:help}
 
-a:hover {
-	text-decoration:	underline;
-	color:	<?php echo $GLOBALS['cfg']['MainLinkColor']; /*jw*/ ?>;
-	background:	<?php echo $GLOBALS['cfg']['MainLinkBackground']; /*jw*/ ?>;
-}
-
-dfn {
-	font-style:	normal;
-}
-
-dfn:hover {
-	font-style:	normal;
-	cursor:	help;
-}
-
-th {
-	font-weight:bold;
-	color:	<?php echo $GLOBALS['cfg']['ThColor']; ?>;
-	background:	<?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-}
-
-a img {
-	border:	0;
-}
-
-hr {
-	color:	<?php echo $GLOBALS['cfg']['MainColor']; ?>;
-	background:	<?php echo $GLOBALS['cfg']['MainColor']; ?>;
-	border:	0;
-	height:	1px;
-}
-
-form {
-	padding:	0;
-	margin:	0;
-	display:	inline;
-}
-
-textarea {
-	overflow:	visible;<?php if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 6') > 0) echo 'height:8em;'; ?>
-
-}
-
-fieldset {
-	margin:	1em 0 1px 1px;
-	border:	<?php echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;
-	padding:	.5em;
-	background:	<?php echo $GLOBALS['cfg']['BgOne']; ?>;
-}
-
-fieldset fieldset {
-	margin:	.8em;
-}
-
-fieldset legend {
-	padding:	0 .2em 0 .2em;
-	background:	<?php echo $GLOBALS['cfg']['BgTwo']; #ffffdd transparent ?>
-}
-/* buttons in some browsers (eg. Konqueror) are block elements,
- this breaks design */
-button {
-	display:	inline;
-}
-table {
-	margin:	1px;
-	border-collapse:	collapse
+th{font-weight:bold;color:<?php echo $GLOBALS['cfg']['ThColor']; ?>;background:<?php
+ echo $GLOBALS['cfg']['ThBackground']; ?>}
+a img{border:0}
+hr{color:<?php echo $GLOBALS['cfg']['MainColor']; ?>;background:<?php
+ echo $GLOBALS['cfg']['MainColor']; ?>;border:0;height:1px}
+form{padding:0;margin:0;display:inline}
+textarea{overflow:visible;<?php if (strpos($_SERVER['HTTP_USER_AGENT'], 'MSIE 6') > 0) echo 'height:8em;'; ?>
 }
+fieldset{margin:1em 0 1px 1px;border:<?php
+ echo $GLOBALS['cfg']['MainColor']; ?> solid 1px;padding:.5em;background:<?php echo $GLOBALS['cfg']['BgOne']; ?>}
+fieldset fieldset{margin:.8em}
+fieldset legend{padding:0 .2em 0 .2em;background:<?php echo $GLOBALS['cfg']['BgTwo']; //#ffffdd transparent
 
+/* buttons in some browsers (eg. Konqueror) are block elements, this breaks design */
+?>}
+button{display:inline}
+table{margin:1px;border-collapse:collapse}
 table caption,
 table th,
-table td {
-	padding:		0 2px 0 2px;
-	vertical-align:	top;
-<?php if ($GLOBALS['cfg']['Border']) {
-	echo 'border:	', $GLOBALS['cfg']['Border'], ' solid ', $GLOBALS['cfg']['MainGridColor'];
-	//effects also page navigation table :(
+table td{padding:0 2px 0 2px;vertical-align:top;<?php if ($GLOBALS['cfg']['Border']){
+echo 'border:', $GLOBALS['cfg']['Border'], ' solid ', $GLOBALS['cfg']['MainGridColor'];
+//effects also page navigation table :(
 }
-?>
-
-}
-
+?>}
 img,
 input,
 select,
-button {
-	vertical-align:	middle;
-}
-
-
-<?php /* * * * * * * * * * * * * * * * * * * * * * * * * */ ?>
-/* classes */
-
-fieldset.tblFooters {
-	margin-top:		0;
-	margin-bottom:	.5em;
-	text-align:		<?php echo $right; ?>;
-	float:		none;
-	clear:		both;
-}
-
-fieldset .formelement {
-	float:		<?php echo $left; ?>;
-	margin-<?php echo $right; ?>:	.5em;
-	/* IE */
-	white-space:		nowrap;
-}
-
-/* revert for Gecko */
-fieldset div[class=formelement] {
-	white-space:	normal;
-}
-
-button.mult_submit {
-	border:		none;
-	background:	transparent;
-}
-
-/* odd items 1,3,5,7,... */
+button{vertical-align:middle}
+<?php /* * classes * * * * * * * * * * * * * * * * * * * * * * * */ ?>
+fieldset.tblFooters{margin-top:0;margin-bottom:.5em;text-align:<?php echo $right; ?>;float:none;clear:both}
+fieldset .formelement{float:<?php echo $left; ?>;margin-<?php echo $right; ?>:.5em;/*IE*/white-space:nowrap}
+<?php /* revert for Gecko */ ?>
+fieldset div[class=formelement]{white-space:normal}
+button.mult_submit{border:none;background:transparent}
+<?php /* odd items 1,3,5,7,... */ ?>
 table tr.odd th,
-.odd {
-	background:	<?php echo $GLOBALS['cfg']['BgOne']; ?>;
-}
-
-/* even items 2,4,6,8,... */
+.odd{background:<?php echo $GLOBALS['cfg']['BgOne']; ?>}
+<?php /* even items 2,4,6,8,... */ ?>
 table tr.even th,
-.even {
-	background:	<?php echo $GLOBALS['cfg']['BgTwo']; ?>;
-}
-
-/* odd table rows 1,3,5,7,... */
+.even{background:<?php echo $GLOBALS['cfg']['BgTwo']; ?>}
+<?php /* odd table rows 1,3,5,7,... */ ?>
 table tr.odd th,
 table tr.odd,
 table tr.even th,
-table tr.even {
-	text-align:	<?php echo $left; ?>;
-}
-
-/* marked table rows */
-table tr.marked th,
-table tr.marked {
-	background:	<?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
-	color:	<?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
-}
-
+table tr.even{
+text-align:<?php echo $left; ?>}
+<?php
+if($GLOBALS['cfg']['BrowsePointerEnable']){
 /* hovered items */
+echo '
 .odd:hover,
 .even:hover,
-.hover {
-	background:	<?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>;
-	color:	<?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
+.hover{
+background:', $GLOBALS['cfg']['BrowsePointerBackground'], ';
+color:', $GLOBALS['cfg']['BrowsePointerColor'], '
 }
-
+';
 /* hovered table rows */
+echo '
 table tr.odd:hover th,
 table tr.even:hover th,
-table tr.hover th {
-	background:	<?php echo $GLOBALS['cfg']['BrowsePointerBackground']; ?>;
-	color:	<?php echo $GLOBALS['cfg']['BrowsePointerColor']; ?>;
+table tr.hover th{
+background:', $GLOBALS['cfg']['BrowsePointerBackground'], ';color:', $GLOBALS['cfg']['BrowsePointerColor'], '}
+';
+}//endif BrowsePointerEnabled
+
+if($GLOBALS['cfg']['BrowseMarkerEnable']){
+/* marked table rows */
+echo '
+table tr.marked th,
+table tr.marked{background:', $GLOBALS['cfg']['BrowseMarkerBackground'], ';color:', $GLOBALS['cfg']['BrowseMarkerColor'], '}
+';
 }
 
 /**
  * marks table rows/cells if the db field is in a where condition
  */
+?>
 tr.condition th,
 tr.condition td,
 td.condition,
-th.condition {
-	border:	1px solid <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
-}
-
-table .value {
-	text-align:	<?php echo $right; ?>;
-	white-space:	normal;
-}
+th.condition{border:1px solid <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>}
+table .value{text-align:<?php echo $right; ?>;white-space:normal}
 <?php /* IE? doesnt handles 'pre' right */ ?>
-table [class=value] {
-	white-space:	normal;
-}
-
-
-<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>
-.value {
-	font-family:	<?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>;
-}
+table [class=value]{white-space:normal}
+<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])){ ?>
+.value{font-family:<?php echo $GLOBALS['cfg']['FontFamilyFixed']; ?>}
 <?php } ?>
-.value .attention {
-	color:		red;
-	font-weight:	bold;
-}
-.value .allfine {
-	color:		green;
-}
-
-
-img.lightbulb {
-	cursor:		pointer;
-}
-
-.pdflayout {
-	overflow:		hidden;
-	clip:		inherit;
-	background:		#fff;
-	display:		none;
-	border:		1px solid #000;
-	position:		relative;
-}
-
-.pdflayout_table {
-	background:		#D3DCE3;
-	color:		#000;
-	overflow:		hidden;
-	clip:		inherit;
-	z-index:		2;
-	display:		inline;
-	visibility:		inherit;
-	cursor:		move;
-	position:		absolute;
-	font-size:/*jw??*/80%;
-	border:		1px dashed #000;
-}
-
-/* MySQL Parser */
-.syntax {
-	font-size:/*jw 80*/	90%;
-}
-
-.syntax_comment {
-	padding-left:	4pt;
-	padding-right:	4pt;
-}
-
-.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_quote {
-	white-space:	pre;
-}
-
-.syntax_quote_backtick {
-}
-
-/* leave some space between icons and text */
-.icon {
-	vertical-align:	middle;
-	margin-right:	.3em;
-	margin-left:	.3em;
-}
-/* no extra space in table cells */
-td .icon {
-	margin:	0;
-}
-
-.selectallarrow {
-	margin-<?php echo $right; ?>:	.3em;
-	margin-<?php echo $left; ?>:	.6em;
-}
-
-/* message boxes:	warning, error, confirmation */
-.notice {
-	color:	#000;
-	background:	#FFFFDD;
-}
+.value .attention{color:red;font-weight:bold}
+.value .allfine{color:green}
+img.lightbulb{cursor:pointer}
+.pdflayout{overflow:hidden;clip:inherit;background:#fff;display:none;border:1px solid #000;position:relative}
+.pdflayout_table{background:#D3DCE3;color:#000;overflow:hidden;clip:inherit;z-index:2;display:inline;
+visibility:inherit;cursor:move;position:absolute;font-size:80%;border:1px dashed #000}
+<?php /* MySQL Parser */ ?>
+.syntax{font-size:90%}
+.syntax_comment{padding-left:4pt;padding-right:4pt}
+.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_quote{white-space:pre}
+<?php /*
+.syntax_quote_backtick{}
+leave some space between icons and text */ ?>
+.icon{vertical-align:middle;margin-right:.3em;margin-left:.3em}
+td .icon{margin:0}
+.selectallarrow{margin-<?php echo $right; ?>:.3em;margin-<?php echo $left; ?>:.6em}
+<?php /* message boxes:warning, error, confirmation */ ?>
+.notice{color:#000;background:#FFFFDD}
 h1.notice,
-div.notice {
-	margin:	.5em 0 .5em 0;
-	border:	1px solid #FFD700;
-	<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-	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%;
-	padding:	10px 10px 10px 36px;
-		<?php } else { ?>
-	background-position:	99% 50%;
-	padding:	10px 5% 10px 10px;
-		<?php } ?>
-	<?php } else { ?>
-	padding:	.5em;
-	<?php } ?>
-}
-.notice h1 {
-	border-bottom:	1px solid #FFD700;
-	font-weight:	bold;
-	text-align:		<?php echo $left; ?>;
-	margin:		0 0 .2em 0;
-}
-
-.warning {
-	color:	#c00;
-	background:	#ffc;
-}
+div.notice{margin:.5em 0 .5em 0;border:1px solid #FFD700;<?php if ( $GLOBALS['cfg']['ErrorIconic'] ){ ?>
+background-image:url("<?php echo $GridImgPath; ?>s_notice.png");
+background-repeat:no-repeat;
+<?php if ( $GLOBALS['text_dir'] === 'ltr' ){ ?>background-position:10px 50%;padding:10px 10px 10px 36px;<?php
+} else { ?>background-position:99% 50%;padding:10px 5% 10px 10px;<?php
+} ?>
+<?php } else { ?>padding:.5em;<?php } ?>}
+.notice h1{border-bottom:1px solid #FFD700;font-weight:bold;text-align:<?php echo $left; ?>;margin:0 0 .2em 0}
+.warning{color:#c00;background:#ffc}
 p.warning,
 h1.warning,
-div.warning {
-	margin:	.5em 0 .5em 0;
-	border:	1px solid #c00;
-	<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-	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%;
-	padding:	10px 10px 10px 36px;
-		<?php } else { ?>
-	background-position:	99% 50%;
-	padding:	10px 5% 10px 10px;
-		<?php } ?>
-	<?php } else { ?>
-	padding:	.5em;
-	<?php } ?>
-}
-.warning h1 {
-	border-bottom:	1px solid #c00;
-	font-weight:	bold;
-	text-align:		<?php echo $left; ?>;
-	margin:		0 0 .2em 0;
-}
-
-.error {
-	background:	#ffc;
-	color:	#f00;
-}
+div.warning{margin:.5em 0 .5em 0;border:1px solid #c00;
+<?php if ( $GLOBALS['cfg']['ErrorIconic'] ){ ?>
+background-image:url("<?php echo $GridImgPath; ?>s_warn.png");background-repeat:no-repeat;
+<?php  if ( $GLOBALS['text_dir'] === 'ltr' ){ ?>background-position:10px 50%;padding:10px 10px 10px 36px;
+<?php } else{ ?>
+background-position:99% 50%;padding:10px 5% 10px 10px;
+<?php } ?>
+<?php } else{ ?>
+padding:.5em;
+<?php } ?>}
+.warning h1{border-bottom:1px solid #c00;font-weight:bold;text-align:<?php echo $left; ?>;margin:0 0 .2em 0}
+.error{background:#ffc;color:#f00}
 
 h1.error,
-div.error {
-	margin:	.5em 0 .5em 0;
-	border:	1px solid #f00;
-	<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-	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%;
-	padding:	10px 10px 10px 36px;
-		<?php } else { ?>
-	background-position:	99% 50%;
-	padding:	10px 5% 10px 10px;
-		<?php } ?>
-	<?php } else { ?>
-	padding:	.5em;
-	<?php } ?>
-}
-div.error h1 {
-	border-bottom:	1px solid #f00;
-	font-weight:	bold;
-	text-align:		<?php echo $left; ?>;
-	margin:		0 0 .2em 0;
-}
-
-.confirmation {
-	background:	#ffc;
-}
-fieldset.confirmation {
-	border:	1px solid #f00;
-}
-fieldset.confirmation legend {
-	border-left:	1px solid #f00;
-	border-right:	1px solid #f00;
-	font-weight:	bold;
-	<?php if ( $GLOBALS['cfg']['ErrorIconic'] ) { ?>
-	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%;
-	padding:		.2em .2em .2em 25px;
-		<?php } else { ?>
-	background-position:	97% 50%;
-	padding:		.2em 25px .2em .2em;
-		<?php } ?>
-	<?php } ?>
-}
-/* end messageboxes */
-
-
-.tblcomment {
-	font-size:/*jw70*/ 90%;
-	font-weight:	normal;
-	color:		#009;
-}
-
-.tblHeaders {
-	font-weight:	bold;
-	color:		<?php echo $GLOBALS['cfg']['ThColor']; ?>;
-	background:		<?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-}
-
-.tblFooters {
-	font-weight:	normal;
-	color:		<?php echo $GLOBALS['cfg']['ThColor']; ?>;
-	background:		<?php echo $GLOBALS['cfg']['ThBackground']; ?>;
-
-}
-
+div.error{margin:.5em 0 .5em 0;border:1px solid #f00;
+<?php if ( $GLOBALS['cfg']['ErrorIconic'] ){ ?>
+background-image:url("<?php echo $GridImgPath; ?>s_error.png");background-repeat:no-repeat;
+<?php if ( $GLOBALS['text_dir'] === 'ltr' ){ ?>
+background-position:10px 50%;padding:10px 10px 10px 36px;
+<?php } else{ ?>
+background-position:99% 50%;padding:10px 5% 10px 10px;<?php
+} ?>
+<?php } else{ ?>
+padding:.5em;
+<?php } ?>}
+div.error h1{border-bottom:1px solid #f00;font-weight:bold;text-align:<?php echo $left; ?>;margin:0 0 .2em 0}
+.confirmation{background:#ffc}
+fieldset.confirmation{border:1px solid #f00}
+fieldset.confirmation legend{border-left:1px solid #f00;border-right:1px solid #f00;font-weight:bold;
+<?php if ( $GLOBALS['cfg']['ErrorIconic'] ){ ?>
+background-image:url("<?php echo $GridImgPath; ?>s_really.png");background-repeat:no-repeat;
+<?php if ( $GLOBALS['text_dir'] === 'ltr' ){ ?>
+background-position:5px 50%;padding:.2em .2em .2em 25px;
+<?php } else{ ?>
+background-position:97% 50%;padding:.2em 25px .2em .2em;
+<?php } ?>
+<?php } /* end messageboxes */ ?>}
+.tblcomment{font-size:90%;font-weight:normal;color:#009}
+.tblHeaders{font-weight:bold;color:<?php echo $GLOBALS['cfg']['ThColor']; ?>;background:<?php
+ echo $GLOBALS['cfg']['ThBackground']; ?>}
+.tblFooters{font-weight:normal;
+color:<?php echo $GLOBALS['cfg']['ThColor']; ?>;
+background:<?php echo $GLOBALS['cfg']['ThBackground']; ?>}
 .tblHeaders a:link,
 .tblHeaders a:active,
 .tblHeaders a:visited,
 .tblFooters a:link,
 .tblFooters a:active,
-.tblFooters a:visited {
-	color:	#00f;
-}
-
+.tblFooters a:visited{color:#00f}
 .tblHeaders a:hover,
-.tblFooters a:hover {
-	color:	#f00;
-}
-
-/* forbidden, no privilegs */
-.noPrivileges {
-	color:	#f00;
-	font-weight:bold;
-}
-
-/* disabled text */
+.tblFooters a:hover{color:#f00}
+.noPrivileges{color:#f00;font-weight:bold}
 .disabled,
 .disabled a:link,
 .disabled a:active,
-.disabled a:visited {
-	color:	#666;
-}
-
-.disabled a:hover {
-	color:	#666;
-	text-decoration:	none;
-}
-
+.disabled a:visited{color:#666}
+.disabled a:hover{color:#666;text-decoration:none}
 tr.disabled td,
-td.disabled {
-	background:	#cccccc;
-}
-
-/**
- * login form
- */
+td.disabled{background:#cccccc}
 body.loginform h1,
-body.loginform a.logo {
-	display:	block;
-	text-align:	center;
-}
-
-body.loginform {
-	text-align:	center;
-}
-
-body.loginform div.container {
-	text-align:	<?php echo $left; ?>;
-	width:	30em;
-	margin:	0	auto;
-}
-
-form.login label {
-	float:	<?php echo $left; ?>;
-	width:	10em;
-	font-weight:bolder;
-}
-
-
-<?php /* * * * * * * * * * * * * * * * * * * * * * * * * */ ?>
-/* specific elements */
-
-/* topmenu */
-ul#topmenu {
-	font-weight:	bold;
-	list-style-type:	none;
-	margin:		0;
-	padding:		0;
-}
-
-ul#topmenu li {
-	float:		<?php echo $left;
+body.loginform a.logo{display:block;text-align:center}
+body.loginform{text-align:center}
+body.loginform div.container{text-align:<?php echo $left; ?>;width:30em;margin:0 auto}
+form.login label{float:<?php echo $left; ?>;width:10em;font-weight:bolder}
+<?php /* * specific elements * * * * * * * * * * * * * * * * * * * * * * * */ ?>
+ul#topmenu{font-weight:bold;list-style-type:none;margin:0;padding:0}
+ul#topmenu li{float:<?php echo $left;
 /* "dot problem"
 lem9: xp, ff1507
 C-Dev:
 Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.12) Gecko/20051218 Firefox/1.0.7
-thx to Ci-Dev on irc , workaround : (gecko flaw? should be inherited, ok in original)  */?>;
-	list-style-type: none;
-	margin:		0;
-	padding:		0;
-	vertical-align:	middle;
+thx to Ci-Dev on irc , workaround : (gecko flaw? should be inherited, ok in original)  */
+?>;list-style-type: none;margin:0;padding:0;vertical-align:middle}
+#topmenu img{vertical-align:middle;margin-<?php echo $right; ?>:1px}
+.tab,
+.tabcaution,
+.tabactive{display:block;margin:.2em .2em 0 .2em;padding:.2em .2em 0 .2em;white-space:nowrap}
+span.tab{color:#666}
+span.tabcaution{color:#f66}
+a.tabcaution{color:#f00}
+a.tabcaution:hover{color:#fff;background:#f00}
+<?php if ( $GLOBALS['cfg']['LightTabs'] ){ ?>
+a.tabactive{color:black}
+<?php } else{ ?>
+#topmenu{margin-top:.5em;padding:1px .3em 1px .3em}
+ul#topmenu li{border-bottom:1px/*pt*/ solid black}
+.tab, .tabcaution, .tabactive{background:<?php echo $GLOBALS['cfg']['BgOne']; ?>;border:1px solid <?php
+echo /* default tab styles */ $GLOBALS['cfg']['BgTwo']; ?>;border-bottom:0;<?php
+if (strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') > 0){ /*FF..*/
+echo '-moz-border-radius-topleft:.6em;-moz-border-radius-topright:.6em';
 }
-
-#topmenu img {
-	vertical-align:	middle;
-	margin-<?php echo $right; ?>:	1px;
-}
-
-/* default tab styles */
-.tab, .tabcaution, .tabactive {
-	display:		block;
-	margin:		.2em .2em 0 .2em;
-	padding:		.2em .2em 0 .2em;
-	white-space:	nowrap;
-}
-
-/* disabled tabs */
-span.tab {
-	color:		#666;
-}
-
-/* disabled drop/empty tabs */
-span.tabcaution {
-	color:		#f66;
-}
-
-/* enabled drop/empty tabs */
-a.tabcaution {
-	color:		#f00;
-}
-a.tabcaution:hover {
-	color:		#fff;
-	background:		#f00;
-}
-
-<?php if ( $GLOBALS['cfg']['LightTabs'] ) { ?>
-/* active tab */
-a.tabactive {
-	color:		black;
-}
-<?php } else { ?>
-#topmenu {
-	margin-top:		.5em;
-	padding:		1px .3em 1px .3em;
-}
-
-ul#topmenu li {
-	border-bottom:	1px/*pt*/ solid black;
-}
-
-/* default tab styles */
-.tab, .tabcaution, .tabactive {
-	background:	<?php echo $GLOBALS['cfg']['BgOne']; ?>;
-	border:		1px solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
-	border-bottom:	0;
-	<?php
-	if (strpos($_SERVER['HTTP_USER_AGENT'], 'Gecko') > 0) { /*FF..*/
-		echo '-moz-border-radius-topleft:.6em;
-	-moz-border-radius-topright:.6em';
-	}
 /**
 MSIE:
 Sebastian removed the wrong lines from "original" :(
 neither border-radius-topleft nor border-top-left-radius is css compliant
 http://blogs.msdn.com/ie/archive/2005/06/23/431980.aspx
 **/
-?>
-
-}
-
-/* enabled hover/active tabs */
+?>}
 a.tab:hover,
 a.tabcaution:hover,
 .tabactive,
-.tabactive:hover {
-	margin:		0;
-	padding:		.2em .4em .2em .4em;
-	text-decoration:	none;
-}
-
+.tabactive:hover{margin:0;padding:.2em .4em .2em .4em;text-decoration:none}
 a.tab:hover,
-.tabactive {
-	background:	<?php echo $GLOBALS['cfg']['BgTwo']; ?>;
-}
-
-/* disabled drop/empty tabs 61031*/
-span.tab,
+.tabactive{background:<?php echo $GLOBALS['cfg']['BgTwo'],'}
+';
+if ( 'OPERA' != PMA_USR_BROWSER_AGENT ) {
+echo 'span.tab,
 a.warning,
-span.tabcaution {
-	<?php
-	if (strpos($_SERVER['HTTP_USER_AGENT'], 'Opera') < 0) {
-		echo '	cursor:	url("', $_SESSION['PMA_Theme']->getImgPath(), 'error.ico"), auto;';/*jw*/
-	}
-	?>
-}
-<?php } ?>
-/* end topmenu */
+span.tabcaution{cursor:url("', $GridImgPath, 'error.ico"), auto}
+';//default?
+}//end if not opera (js error)
+?>
+<?php } /* end topmenu */ ?>
+table.calendar{width:100%}
+table.calendar td{text-align:center}
+table.calendar td a{display:block}
+table.calendar td a:hover{background:#cfc}
+table.calendar th{background:#D3DCE3}
+table.calendar td.selected{background:#fc9}
+img.calendar{border:none}
+form.clock{text-align:center}
 
+div#tablestatistics{border-bottom:1px solid #699;margin-bottom:.5em;padding-bottom:.5em}
+div#tablestatistics table{float:<?php echo $left; ?>;margin-bottom:.5em;margin-<?php echo $right; ?>:.5em}
+div#tablestatistics table caption{margin-<?php echo $right; ?>:.5em}
+<?php /* END server privileges */ ?>
 
-/* Calendar */
-table.calendar {
-	width:		100%;
-}
-table.calendar td {
-	text-align:		center;
-}
-table.calendar td a {
-	display:		block;
-}
-
-table.calendar td a:hover {
-	background:	#cfc;
-}
-
-table.calendar th {
-	background:	#D3DCE3;
-}
-
-table.calendar td.selected {
-	background:	#fc9;
-}
-
-img.calendar {
-	border:		none;
-}
-form.clock {
-	text-align:		center;
-}
-/* end Calendar */
-
-
-/* table stats */
-div#tablestatistics {
-	border-bottom:	1px solid #699;
-	margin-bottom:	.5em;
-	padding-bottom:	.5em;
-}
-
-div#tablestatistics table {
-	float:	<?php echo $left; ?>;
-	margin-bottom:	.5em;
-	margin-<?php echo $right; ?>:	.5em;
-}
-
-div#tablestatistics table caption {
-	margin-<?php echo $right; ?>:	.5em;
-}
-/* END table stats */
-
-
-/* server privileges */
 #tableuserrights td,
 #tablespecificuserrights td,
-#tabledatabases td {
-	vertical-align:	middle;
-}
-/* END server privileges */
-
-
-
-/* Heading */
-#serverinfo {
-	font-weight:	bold;
-	margin-bottom:	.5em;
-}
-
-#serverinfo .item {
-	white-space:	nowrap;
-}
-
-#span_table_comment {
-	font-weight:	normal;
-	font-style:		italic;
-	white-space:	nowrap;
-}
-
-#serverinfo img {
-	margin:		0 1px 0 .2em;
-}
-
-
-#textSQLDUMP {
-	width:		95%;
-	height:		95%;
-	font-family:	"Courier New", Courier, mono;
-	font-size:		110%;
-}
-
-#TooltipContainer {
-	position:		absolute;
-	z-index:		99;
-	width:		20em;
-	height:		auto;
-	overflow:		visible;
-	visibility:		hidden;
-	background:	#ffc;
-	color:		#060;
-	border:		1px solid #000;
-	padding:		.5em;
-}
+#tabledatabases td{vertical-align:middle}
 
+<?php /* Heading */ ?>
+#serverinfo{font-weight:bold;margin-bottom:.5em}
+#serverinfo .item{white-space:nowrap}
+#span_table_comment{font-weight:normal;font-style:italic;white-space:nowrap}
+#serverinfo img{margin:0 1px 0 .2em}
+#textSQLDUMP{width:95%;
+height:95%;font-family:"Courier New", Courier, mono;
+font-size:110%}
+#TooltipContainer{position:absolute;z-index:99;width:20em;height:auto;overflow:visible;
+ visibility:hidden;background:#ffc;color:#060;border:1px solid #000;padding:.5em}
+<?php
 /* user privileges */
-#fieldset_add_user_login div.item {
-	border-bottom:	1px solid silver;
-	padding-bottom:	.3em;
-	margin-bottom:	.3em;
-}
-
-#fieldset_add_user_login label {
-	float:		<?php echo $left; ?>;
-	display:		block;
-	width:		10em;
-	max-width:		100%;
-	text-align:		<?php echo $right; ?>;
-	padding-<?php echo $right; ?>:	.5em;
-}
-
+?>
+#fieldset_add_user_login div.item{border-bottom:1px solid silver;padding-bottom:.3em;margin-bottom:.3em}
+#fieldset_add_user_login label{float:<?php echo $left; ?>;display:block;width:10em;max-width:100%;text-align:<?php
+ echo $right; ?>;padding-<?php echo $right; ?>:.5em}
 #fieldset_add_user_login span.options #select_pred_username,
 #fieldset_add_user_login span.options #select_pred_hostname,
-#fieldset_add_user_login span.options #select_pred_password {
-	width:		100%;
-	max-width:		100%;
-}
-
-#fieldset_add_user_login span.options {
-	float:	<?php echo $left; ?>;
-	display:	block;
-	width:	12em;
-	max-width:	100%;
-	padding-<?php echo $right; ?>:	.5em;
-}
-
-#fieldset_add_user_login input {
-	width:	12em;
-	clear:	<?php echo $right; ?>;
-	max-width:	100%;
-}
-
-#fieldset_add_user_login span.options input {
-	width:	auto;
-}
-
-#fieldset_user_priv div.item {
-	float:	<?php echo $left; ?>;
-	width:	9em;
-	max-width:	100%;
-}
-
-#fieldset_user_priv div.item div.item {
-	float:	none;
-}
-
-#fieldset_user_priv div.item label {
-	white-space:	nowrap;
-}
-
-#fieldset_user_priv div.item select {
-	width:	100%;
-}
-
-#fieldset_user_global_rights fieldset {
-	float:	<?php echo $left; ?>;
-}
+#fieldset_add_user_login span.options #select_pred_password{width:100%;max-width:100%}
+#fieldset_add_user_login span.options{float:<?php echo $left; ?>;display:block;width:12em;max-width:100%;padding-<?php
+ echo $right; ?>:.5em}
+#fieldset_add_user_login input{width:12em;clear:<?php echo $right; ?>;max-width:100%}
+#fieldset_add_user_login span.options input{width:auto}
+#fieldset_user_priv div.item{float:<?php echo $left; ?>;width:9em;max-width:100%}
+#fieldset_user_priv div.item div.item{float:none}
+#fieldset_user_priv div.item label{white-space:nowrap}
+#fieldset_user_priv div.item select{width:100%}
+#fieldset_user_global_rights fieldset{
+float:<?php echo $left;
 /* END user privileges */
 
-
 /* serverstatus */
-div#serverstatus table caption a.top {
-	float:	<?php echo $right; ?>;
-}
-
+?>}
+div#serverstatus table caption a.top{float:<?php echo $right; ?>}
 div#serverstatus div#serverstatusqueriesdetails table,
 div#serverstatus table#serverstatustraffic,
-div#serverstatus table#serverstatusconnections {
-	float:	<?php echo $left; ?>;
-}
-
+div#serverstatus table#serverstatusconnections{float:<?php echo $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;
-}
-
+.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 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 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 */
+div#serverstatus table .tblFooters a:after{content:']'}
+<?php /* end serverstatus */
 
-/* querywindow */
-body#bodyquerywindow {
-	margin:	0;
-	padding:	0;
-	background-image:	none;
-	background:	#F5F5F5;
-}
+/* querywindow */ ?>
+body#bodyquerywindow{margin:0;padding:0;background-image:none;background:#F5F5F5}
+div#querywindowcontainer{margin:0;padding:0;width:100%}
+div#querywindowcontainer fieldset{margin-top:0}
+<?php /* END querywindow */
 
-div#querywindowcontainer {
-	margin:	0;
-	padding:	0;
-	width:	100%;
-}
-
-div#querywindowcontainer fieldset {
-	margin-top:	0;
-}
-/* END querywindow */
-
-
-/* querybox */
-
-div#sqlquerycontainer {
-	float:	<?php echo $left; ?>;
-	width:	69%;
-<?php	/* height:	15em; */?>
-}
-
-div#tablefieldscontainer {
-	float:	<?php echo $right; ?>;
-	width:	29%;
-	/* height:	15em; */
-}
-
-div#tablefieldscontainer select {
-	width:	100%;
-	/* height:	12em; */
-}
-
-textarea#sqlquery {
-	width:	100%;
-	/* height:	100%; */
-}
-
-div#queryboxcontainer div#bookmarkoptions {
-	margin-top:	.5em;
-}
-/* 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;
-}
+/* querybox */ ?>
+div#sqlquerycontainer{float:<?php echo $left; /* height:15em; */ ?>;width:69%}
+div#tablefieldscontainer{float:<?php echo $right; ?>;width:29%}
+div#tablefieldscontainer select{width:100%}<?php /* height:12em; */ ?>
+textarea#sqlquery{width:100%}<?php /* height:100%;??? */ ?>
+div#queryboxcontainer div#bookmarkoptions{margin-top:.5em}
+<?php /* end querybox */
 
+/* main page */ ?>
+#maincontainer{background-image:url("<?php echo $GridImgPath; ?>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:	.3em;
-	padding:		0 .3em 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");
-}
-
+#pmamaininformation{float:<?php echo $left; ?>;width:49%}
+#maincontainer ul{list-style-image:url("<?php echo $GridImgPath, 'item_', $GLOBALS['text_dir']; ?>.png");vertical-align:middle}
+#maincontainer li{margin-bottom:.3em;padding:0 .3em 0 .3em}
+<?php /* END main page */
+if ($GLOBALS['cfg']['MainPageIconic']){ /* iconic view for ul items */
+echo'
+li#li_create_database{',	$listImgUrl,'b_newdb.png")}
+li#li_select_lang{',		$listImgUrl,'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");
-}
-<?php /*
+li#li_select_mysql_charset{',	$listImgUrl,'s_asci.png")}
+li#li_select_theme{',		$listImgUrl,'s_theme.png")}
+li#li_server_info{',		$listImgUrl,'s_host.png")}
+li#li_mysql_status{',		$listImgUrl,'s_status.png")}
+li#li_mysql_variables{',	$listImgUrl,'s_vars.png")}
+li#li_mysql_processes{',	$listImgUrl,'s_process.png")}
+li#li_mysql_collations{',	$listImgUrl,'s_asci.png")}
+li#li_mysql_engines{',		$listImgUrl,'b_engine.png")}
+li#li_mysql_binlogs{',		$listImgUrl,'s_tbl.png")}
+li#li_mysql_databases{',	$listImgUrl,'s_db.png")}
+li#li_export{',			$listImgUrl,'b_export.png")}
+li#li_import{',			$listImgUrl,'b_import.png")}
+li#li_change_password{',	$listImgUrl,'s_passwd.png")}
+li#li_log_out{',			$listImgUrl,'s_loggoff.png")}
+li#li_pma_docs{',			$listImgUrl,'b_docs.png")}
+li#li_phpinfo{',			$listImgUrl,'php_sym.png")}
+li#li_pma_homepage{',		$listImgUrl,'b_home.png")}
+li#li_mysql_privilegs{',	$listImgUrl,'s_rights.png")}
+li#li_switch_dbstats{',		$listImgUrl,'b_dbstatistics.png")}
+li#li_flush_privileges{',	$listImgUrl,'s_reload.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");
+',	$listImgUrl,'s_rights.png")
 }
+*/
 
-li#li_mysql_variables{
-	list-style-image:	url("<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>s_vars.png");
-}
+}//END iconic view for ul items
 
-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:	<?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-	margin:	.5em .5em 0 .5em;
-}
-
-#bodyquerywindow {
-	background:	<?php echo $GLOBALS['cfg']['NaviBackground']; ?>;
-}
-
-#bodythemes {
-	width:	500px;
-	margin:	auto;
-	text-align:	center;
-}
-
-#bodythemes img {
-	border:	1px solid black;
-}
-
-#bodythemes a:hover img {
-	border:	1px solid red;
-}
-
-#fieldset_select_fields {
-	float:	<?php echo $left; ?>;
-}
-
-#selflink {
-	clear:	both;
-	display:	block;
-	margin-top:	1em;
-	margin-bottom:	1em;
-	width:	100%;
-	border-top:	1px solid silver;
-	text-align:	<?php echo $right; ?>;
-}
+/*  - end if $GLOBALS['cfg']['MainPageIconic'] */ ?>
 
+#body_browse_foreigners{background:<?php echo $GLOBALS['cfg']['NaviBackground']; ?>;margin:.5em .5em 0 .5em}
+#bodyquerywindow{background:<?php echo $GLOBALS['cfg']['NaviBackground'], "}
+#bodythemes{width:500px;margin:auto;text-align:center}
+#bodythemes img{border:1px solid black}
+#bodythemes a:hover img{border:1px solid red}
+#fieldset_select_fields{float:$left}
+#selflink{clear:both;display:block;margin-top:1em;margin-bottom:1em;width:100%;border-top:1px solid silver;text-align:$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; ?>;
-}
-
-label.desc {
-	width:	30em;
-	float:	<?php echo $left; ?>;
-}
+#table_innodb_bufferpool_activity{float:$left}
+#div_mysql_charset_collations table{float:$left}
+#div_table_order{min-width:48%;float:$left}
+#div_table_rename{min-width:48%;float:$left}
+#div_table_copy{min-width:48%;float:$left}
+#div_table_options{clear:both;min-width:48%;float:$left}
+#qbe_div_table_list{float:$left}
+#qbe_div_sql_query{float:$left}
+label.desc{width:30em;float:$left}
+"; ?>
diff --git a/grid/info.inc.php b/grid/info.inc.php
index e82008b63..69f36862d 100644
--- a/grid/info.inc.php
+++ b/grid/info.inc.php
@@ -1,24 +1,23 @@
 <?php
-/* info.inc.php 2006/06/19  cybot_tm / 2006/09/20 windkiel */
+/* info.inc.php 2006/06/19 cybot_tm | 2007/02/11 windkiel */
 
 /**
+ * 2007-02-11 working with version 2.8 .. 2.1x.x ...
+ * differs from theme "original" (2.9) in:
  *
- * differs from theme "original" (2.9) in :
- * 
- * working with pma >= 2.8,  
  * smaller table margins/paddings
- * border-rounding only working in Geckos like Firefox 1.5 ( -moz...), 
- * IE6 ( left pointer/marker working with links ), 
- * Opera 7 ~ 9.01 ( switching cursor on hover not supported ) 
+ * border-rounding only working in Geckos like Firefox 1 .. 2 ( -moz...),
+ * IE6 ( left pointer/marker working with links ),
+ * Opera 7 ~ 9.01 ( changing cursor "error.ico" on hover not supported )
  * ( Opera 9.01 needs a Ctrl F5 or restart to show theme/fontsize changes ! )
  *
  * comments, suggestions, bugreports are welcome:
  * http://sourceforge.net/users/windkiel/
- * 
+ *
  */
 
 /* Theme information */
 $theme_name = 'Grid';
 $theme_version = 2;
 $theme_full_version = '2.9';
-?>
+?>
\ No newline at end of file
diff --git a/grid/layout.inc.php b/grid/layout.inc.php
index c78ca8995..20f18d9f6 100644
--- a/grid/layout.inc.php
+++ b/grid/layout.inc.php
@@ -1,78 +1,91 @@
 <?php
 /**
- * derived from theme "original" pma 2.9, HEAD
- * modifications by windkiel 2006-08-19 ~ 10-31 marked with "*jw"
- * works with pma 2.8
- * no '' allowed, except for Font.. ..Link.. ..Marke...
+ * derived from theme "original" pma 2.9
+ * 20070211: error.ico cursor for non Opera browsers, vertical line IE only, pma 2.8 td{color:black} necessary!
+ * 20070208 bug 1653769 fixed: BrowsePointerEnable, BrowseMarkerEnable
+ * by windkiel (started 2006-08-19)
+ * works with pma 2.8+
  * for detailed layout configuration please refer to the css files
  * comments, suggestions, bugreports are welcome:
  * http://sourceforge.net/users/windkiel/
+ * no '' allowed, except for Font.. ..Link.. ..Marke...(frame reload may be needed after changes)
  */
 
 /**
- * navi frame
+ * Navi frame (called "Left frame" in older versions)
  */
-// navi frame width for index.php :
-$GLOBALS['cfg']['NaviWidth'] = 200; //only for >= 2.9
-$GLOBALS['cfg']['LeftWidth'] = 200; //backward compatibility 2.8
+
+// for this theme almost all settings (except "SPQ") can be done in config.inc.php :
+// like "$cfg['LeftMarkerEnable'] = false;"
+
+// Whether to activate the Navi marker. Similar settings see libraries/config.default.php
+if(!isset($GLOBALS['cfg']['LeftMarkerEnable']))
+	$GLOBALS['cfg']['LeftMarkerEnable'] = $GLOBALS['cfg']['LeftPointerEnable'];
+
+// Navi (left) frame width for index.php :
+if(!isset($GLOBALS['cfg']['NaviWidth'])) $GLOBALS['cfg']['NaviWidth'] = 180; 
+
+// backward compatibility :
+if('2.8' == substr(PMA_VERSION,0,3)) $GLOBALS['cfg']['LeftWidth'] = $GLOBALS['cfg']['NaviWidth']; 
 
 // foreground (text) color for the navi frame
-$GLOBALS['cfg']['NaviColor']                = '#000';
+if(!isset($GLOBALS['cfg']['NaviColor'])) $GLOBALS['cfg']['NaviColor'] = '#000';
 
 // background for the navi frame
-$GLOBALS['cfg']['NaviBackground']           = '#D3DCE6';#dee
+if(!isset($GLOBALS['cfg']['NaviBackground'])) $GLOBALS['cfg']['NaviBackground'] = '#D3DCE6';#dee
 
 // link color
-$GLOBALS['cfg']['NaviLinkColor']        = '#00a';/*jw*/
+if(!isset($GLOBALS['cfg']['NaviLinkColor'])) $GLOBALS['cfg']['NaviLinkColor'] = '#00a';
 
 // link background-color
-$GLOBALS['cfg']['NaviLinkBackground']       = 'white';/*jw*/
+if(!isset($GLOBALS['cfg']['NaviLinkBackground'])) $GLOBALS['cfg']['NaviLinkBackground'] = 'white';
 
 // foreground (text) color of the pointer in navi frame
-$GLOBALS['cfg']['NaviPointerColor']         = '#00f';
+if(!isset($GLOBALS['cfg']['NaviPointerColor'])) $GLOBALS['cfg']['NaviPointerColor']	= '#00f';
 // background of the pointer in navi frame
 
-$GLOBALS['cfg']['NaviPointerBackground']    = 'white';
+if(!isset($GLOBALS['cfg']['NaviPointerBackground'])) $GLOBALS['cfg']['NaviPointerBackground'] = 'white';
 
 // color of the marked (visually marks selected) item
-$GLOBALS['cfg']['NaviMarkedColor'] = $GLOBALS['cfg']['NaviColor'];/*jw*/
+if(!isset($GLOBALS['cfg']['NaviMarkedColor'])) $GLOBALS['cfg']['NaviMarkedColor'] = $GLOBALS['cfg']['NaviColor'];
 
 // background of the marked item
-$GLOBALS['cfg']['NaviMarkedBackground']     = '#fc9';
+if( $GLOBALS['cfg']['LeftMarkerEnable'] ) {
+	$GLOBALS['cfg']['NaviMarkedBackground'] = '#fc9';
+} else {
+	$GLOBALS['cfg']['NaviMarkedBackground'] = $GLOBALS['cfg']['NaviBackground'];
+}
 
 // "zoom" factor for list items
-$GLOBALS['cfg']['NaviFontPercentage']       = '90%';/*jw*/
+if(!isset($GLOBALS['cfg']['NaviFontPercentage'])) $GLOBALS['cfg']['NaviFontPercentage'] = '90%';
 
 /**
  * main frame
  */
 // foreground (text) color for the main frame
-$GLOBALS['cfg']['MainColor']                = '#000';
+if(!isset($GLOBALS['cfg']['MainColor'])) $GLOBALS['cfg']['MainColor'] = '#000';
 
-// background for the main frame
-$GLOBALS['cfg']['MainBackground']           = '#d0d0d0';//e7
+// BackgroundColor for the main frame, other solution than in original!
+if(!isset($GLOBALS['cfg']['MainBackgroundColor'])) $GLOBALS['cfg']['MainBackgroundColor'] = '#d0d0d0';
 
-if ( PMA_USR_BROWSER_AGENT != 'MOZILLA' ) { 	/*jw index.php: NO frameborder="0"*/
-$GLOBALS['cfg']['MainBackground'] .=
-' url(' . $_SESSION['PMA_Theme']->getImgPath() . 'vertical_line.png) repeat-y';
-}
 // link color
-$GLOBALS['cfg']['MainLinkColor']       = '#00d';/*jw*/
+if(!isset($GLOBALS['cfg']['MainLinkColor'])) $GLOBALS['cfg']['MainLinkColor'] = '#00d';
 
 // link BGcolor
-$GLOBALS['cfg']['MainLinkBackground']       = '#fff';/*jw*/
+if(!isset($GLOBALS['cfg']['MainLinkBackground'])) $GLOBALS['cfg']['MainLinkBackground'] = '#fff';
 
 // foreground (text) color of the pointer in browse mode
-$GLOBALS['cfg']['BrowsePointerColor']       = '#000';
+if(!isset($GLOBALS['cfg']['BrowsePointerColor'])) $GLOBALS['cfg']['BrowsePointerColor'] = '#000';
 
 // background of the pointer in browse mode
-$GLOBALS['cfg']['BrowsePointerBackground']  = '#cfc';
+if(!isset($GLOBALS['cfg']['BrowsePointerBackground'])) $GLOBALS['cfg']['BrowsePointerBackground'] = '#cfc';
 
 // foreground (text) color of the marker (visually marks row by clicking on it) in browse mode
-$GLOBALS['cfg']['BrowseMarkerColor']        = '#000';
+if(!isset($GLOBALS['cfg']['BrowseMarkerColor'])) $GLOBALS['cfg']['BrowseMarkerColor'] = '#000';
 
 // background of the marker (visually marks row by clicking on it) in browse mode
-$GLOBALS['cfg']['BrowseMarkerBackground']   = '#fc9';
+if(!isset($GLOBALS['cfg']['BrowseMarkerBackground'])) $GLOBALS['cfg']['BrowseMarkerBackground'] = '#fc9';
+
 /**
  * fonts
  */
@@ -82,11 +95,11 @@ $GLOBALS['cfg']['BrowseMarkerBackground']   = '#fc9';
  * if not set the browser default will be used
  * (depending on browser, DTD and system settings)
  */
-$GLOBALS['cfg']['FontFamily']           = 'sans-serif'; //was:Arial
+if(!isset($GLOBALS['cfg']['FontFamily'])) $GLOBALS['cfg']['FontFamily'] = 'sans-serif'; //was:Arial
 /**
  * fixed width font family, used in textarea
  */
-$GLOBALS['cfg']['FontFamilyFixed']      = 'monospace';
+if(!isset($GLOBALS['cfg']['FontFamilyFixed'])) $GLOBALS['cfg']['FontFamilyFixed'] = 'monospace';
 
 /**
  * font size as a valid css font size value,
@@ -95,40 +108,46 @@ $GLOBALS['cfg']['FontFamilyFixed']      = 'monospace';
  * pma >2.8 uses font size stored in cookie
  */
 
-// for pma 2.8 :
-$GLOBALS['cfg']['FontSize']             = '90%';
+// for pma <2.9 :
+if(!isset($GLOBALS['cfg']['FontSize'])) $GLOBALS['cfg']['FontSize'] = '90%';
 
 /**
  * tables
  */
-/*jw*/
+
 // border strenght ( e.g. .05em(min!)|1px|3pt| 0 but NOT 1)
-$GLOBALS['cfg']['Border'] = '1px';
+if(!isset($GLOBALS['cfg']['Border'])) $GLOBALS['cfg']['Border'] = '1px';
 
 //at least 1 bit difference from $GLOBALS['cfg']['MainBackground'] to show the grid!
-$GLOBALS['cfg']['MainGridColor'] = '#d0d0d1';
+if(!isset($GLOBALS['cfg']['MainGridColor'])) $GLOBALS['cfg']['MainGridColor'] = '#d0d0d1';
+
 // table header and footer color
-$GLOBALS['cfg']['ThBackground'] = $GLOBALS['cfg']['NaviBackground'];#dee
+if(!isset($GLOBALS['cfg']['ThBackground'])) $GLOBALS['cfg']['ThBackground'] = $GLOBALS['cfg']['NaviBackground'];#dee
+
 // table header and footer background
-$GLOBALS['cfg']['ThColor']              = '#000';
+if(!isset($GLOBALS['cfg']['ThColor'])) $GLOBALS['cfg']['ThColor'] = '#000';
+
 // table data row background
-$GLOBALS['cfg']['BgOne']                = '#f8f8fa';
+if(!isset($GLOBALS['cfg']['BgOne'])) $GLOBALS['cfg']['BgOne'] = '#f8f8fa';
+
 // table data row background, alternate
-$GLOBALS['cfg']['BgTwo']                = '#fff';
+if(!isset($GLOBALS['cfg']['BgTwo'])) $GLOBALS['cfg']['BgTwo'] = '#fff';
+
 // table outer border color
-//$GLOBALS['cfg']['TblBorderColor'] = 'blue';//60928 test
+//if(!isset($GLOBALS['cfg']['TblBorderColor'])) $GLOBALS['cfg']['TblBorderColor'] = 'blue';
 
 //needed for pma2.8 only (if E_NOTICE=1 , but no effect) :
-$GLOBALS['cfg']['BgcolorOne']='#f7f7f7';
-$GLOBALS['cfg']['BgcolorTwo']='#fff';
+if(!isset($GLOBALS['cfg']['BgcolorOne'])) $GLOBALS['cfg']['BgcolorOne'] = '#f7f7f7';
+if(!isset($GLOBALS['cfg']['BgcolorTwo'])) $GLOBALS['cfg']['BgcolorTwo'] = '#fff';
 
 /**
  * query window
  */
 // Width of Query window
-$GLOBALS['cfg']['QueryWindowWidth']     = 600;
+if(!isset($GLOBALS['cfg']['QueryWindowWidth'])) $GLOBALS['cfg']['QueryWindowWidth'] = 600;
+
 // Height of Query window
-$GLOBALS['cfg']['QueryWindowHeight']    = 300;
+if(!isset($GLOBALS['cfg']['QueryWindowHeight'])) $GLOBALS['cfg']['QueryWindowHeight'] = 300;
 
 /**
  * SQL Parser Settings