2.9d

2007-02-25 13:40:45 +00:00
parent 99afad04b1
commit f0186983cc
4 changed files with 491 additions and 1226 deletions
--- 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<EFBFBD>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*/ ?>}
--- a/grid/css/theme_right.css.php
+++ b/grid/css/theme_right.css.php
--- 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';
-?>
+?>
--- 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