From 16e4ade007c8910121c5e676c1d693f960401fc6 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 12 May 2007 23:43:46 +0000
Subject: [PATCH] grid 2.10b

---
 grid/css/theme_left.css.php  | 43 +++++++++------------
 grid/css/theme_right.css.php | 74 ++++++++++++++++--------------------
 grid/info.inc.php            |  4 +-
 grid/layout.inc.php          | 33 +++++++---------
 4 files changed, 66 insertions(+), 88 deletions(-)

diff --git a/grid/css/theme_left.css.php b/grid/css/theme_left.css.php
index 0d22b134c..b1f43e9c3 100644
--- a/grid/css/theme_left.css.php
+++ b/grid/css/theme_left.css.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * navigation css file from theme
@@ -10,13 +10,9 @@
 
 if (!defined('PMA_MINIMUM_COMMON')) exit(); // illegal execution path
 
-$GridImgPath = version_compare(PMA_VERSION,'2.11','lt') ? '../' : ''; 
+$GridImgPath  = version_compare(PMA_VERSION, '2.11', 'lt') ? '../' : '';
 $GridImgPath .= $_SESSION['PMA_Theme']->getImgPath();
 
-if(version_compare(PMA_VERSION,'2.9','lt')) {
-	echo 'html,table{font-size:', $GLOBALS['cfg']['FontSize'], '}';
-}
-
 // Whether to activate the Navi marker (bug pma < 2.11)
 if (empty($GLOBALS['cfg']['LeftMarkerEnable'])) {
 	$GLOBALS['cfg']['LeftMarkerEnable'] = $GLOBALS['cfg']['LeftPointerEnable'];
@@ -27,14 +23,16 @@ if (!$GLOBALS['cfg']['LeftMarkerEnable'] ) { // init in config.default
 }
 
 /** (left) navigation.php **/
-echo '
+echo '/* grid-2.10b for pma 2.8 ... 2.11 */ 
 *{margin:0;padding:0}'; //general reset and defined later if needed (f.e. hr)
-
-//           top left
+if(version_compare(PMA_VERSION,'2.9','lt')) {
+	echo '
+html,table{font-size:', $GLOBALS['cfg']['FontSize'], '}';
+}
 echo '
 body{margin:.2em .3em;background:', $GLOBALS['cfg']['NaviBackground'],
+//           ^top ^left
 	';color:', $GLOBALS['cfg']['NaviColor'];
-//	';padding:.2em';
 
 if (!empty($GLOBALS['cfg']['FontFamily'])) {
 	echo ';font-family:', $GLOBALS['cfg']['FontFamily'];
@@ -47,40 +45,35 @@ form{display:inline}
 select{width:100%}
 button{display:inline}'; // buttons in some browsers (eg. Konqueror) are block elements,this breaks design
 
-/* * * * classes * * * * * * * * * * * * * */
-// specific elements div#pmalogo{background:', $GLOBALS['cfg']['NaviLinkBackground'], '} div#pmalogo,
-
-/* leave some space between icons and text:
- * ??? div#databaseList a{text-decoration:underline}
-*/
+// * * * * classes * * * * 
+// specific elements 
+// leave some space between icons and text:
 echo '
 .icon{vertical-align:middle;margin:0 .1em 0 .1em}
 div#leftframelinks{text-align:center}
 div#leftframelinks a img.icon{padding:.2em;border:0}
 div#leftframelinks,
 div#databaseList{margin-bottom:.3em;padding-bottom:.3em;border-bottom:1px solid ', $GLOBALS['cfg']['NaviColor'], '}
-div#pmalogo{text-align:center;';//padding:.7em;
-echo ($iPmaVersion > 20900) ? 'background:' . $GLOBALS['cfg']['NaviBackground'] :
+div#pmalogo{text-align:center;';
+echo (version_compare(PMA_VERSION, '2.9', 'gt')) ? 'background:' . $GLOBALS['cfg']['NaviBackground'] :
 	'border-bottom:1px solid ' . $GLOBALS['cfg']['NaviColor'];
-echo '}
-';
+echo '}';
 
 if( $GLOBALS['cfg']['LeftDisplayServers'] && $GLOBALS['cfg']['LeftFrameLight'] ){
-	echo 'div#databaseList{text-align:left}
-'; // looks nicer if LeftDisplayServers==true - 2do: r2l char sets
+	echo 'div#databaseList{text-align:left}'; // looks nicer if LeftDisplayServers==true - 2do: r2l char sets
 };
 
-/***** serverlist *****/
+//* * * * serverlist * * * *
 echo '
 #body_leftFrame #list_server{list-style-image:url("', $GridImgPath,'s_host.png");',
-	'list-style-position: inside;list-style-type:none}
+	'list-style-position:inside;list-style-type:none}
 #body_leftFrame #list_server li{font-size:', $GLOBALS['cfg']['NaviFontPercentage'], '}
 div#left_tableList ul{list-style-type:none;line-height:110%;list-style-position:outside;font-size:',
 	$GLOBALS['cfg']['NaviFontPercentage'], ';background:', $GLOBALS['cfg']['NaviBackground'], '}
 div#left_tableList ul ul{font-size:100%}
 div#left_tableList a{text-decoration:none;color:', $GLOBALS['cfg']['NaviLinkColor'], '}
 a,
-div#left_tableList a{padding:.2em}
+div#left_tableList a{padding:1px 2px 1px 2px}
 ';
 
 echo ( $GLOBALS['cfg']['LeftPointerEnable'] )
diff --git a/grid/css/theme_right.css.php b/grid/css/theme_right.css.php
index f2214e2a8..0b03bb106 100644
--- a/grid/css/theme_right.css.php
+++ b/grid/css/theme_right.css.php
@@ -2,7 +2,7 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
  * main css file from theme
- *theme_right.css.php 2006-12-29 IE6 sql window fix 2do:pma28 hover th?
+ * theme_right.css.php 2007-05-11
  *
  * @version $Id$
  * @package phpMyAdmin-theme
@@ -12,7 +12,7 @@
 // unplanned execution path
 if(!defined('PMA_MINIMUM_COMMON')) exit();
 
-$GridImgPath = version_compare(PMA_VERSION,'2.11','lt') ? '../' : ''; 
+$GridImgPath  = version_compare(PMA_VERSION,'2.11','lt') ? '../' : '';
 $GridImgPath .= $_SESSION['PMA_Theme']->getImgPath();
 
 if(version_compare(PMA_VERSION,'2.9','lt')) {
@@ -25,8 +25,8 @@ td,
 th{color:', $GLOBALS['cfg']['MainColor'], '}';
 }
 
-$listImgUrl = 'list-style-image:url("'. $GridImgPath; //.....xxx.png")
-echo'
+$listImgUrl = 'list-style-image:url("' . $GridImgPath; //.....xxx.png")
+echo'/*grid-2.10b*/
 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)
@@ -40,11 +40,11 @@ pre,
 code{font-family:', $GLOBALS['cfg']['FontFamilyFixed'], '}
 ';
 ?>
-input{padding:0 .2em;font-size:100%}
+input{padding:0 .2em 0 .2em;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:1px}
+a{padding:1px 2px 1px 2px}
 a:link,
 a:visited,
 a:active{text-decoration:none;color:<?php echo $GLOBALS['cfg']['MainLinkColor']; ?>}
@@ -52,7 +52,6 @@ a:hover{text-decoration:underline;color:<?php echo $GLOBALS['cfg']['MainLinkColo
  echo $GLOBALS['cfg']['MainLinkBackground']; ?>}
 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}
@@ -80,7 +79,7 @@ img,
 input,
 select,
 button{vertical-align:middle}
-<?php /* * classes * * * * * * * * * * * * * * * * * * * * * * * */ ?>
+<?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 */ ?>
@@ -92,8 +91,7 @@ table tr.odd th,
 <?php /* even items 2,4,6,8,... */ ?>
 table tr.even th,
 .even{background:<?php echo $GLOBALS['cfg']['BgTwo']; ?>}
-<?php /* odd table rows 1,3,5,7,... */ ?>
-table tr.odd th,
+<?php /* odd table rows 1,3,5,7,... */ ?>table tr.odd th,
 table tr.odd,
 table tr.even th,
 table tr.even{
@@ -164,8 +162,7 @@ td .icon{margin:0}
 .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 $GridImgPath; ?>s_notice.png");
-background-repeat:no-repeat;
+background-image:url("<?php echo $GridImgPath; ?>s_notice.png");background-repeat:no-repeat;
 <?php if ( $GLOBALS['text_dir'] === 'ltr' ){ ?>background-position:1em 50%;padding:1em 1em 1em 3.6em;<?php
 } else { ?>background-position:99% 50%;padding:1em 5% 1em 1em;<?php
 } ?>
@@ -186,7 +183,6 @@ 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'] ){ ?>
@@ -290,16 +286,13 @@ 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 */ ?>
-
 #tableuserrights td,
 #tablespecificuserrights td,
 #tabledatabases td{vertical-align:middle}
-
 <?php /* Heading */ ?>
 #serverinfo{font-weight:bold;margin-bottom:.5em}
 #serverinfo .item{white-space:nowrap}
@@ -327,8 +320,7 @@ font-size:110%}
 #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_user_global_rights fieldset{float:<?php echo $left;
 /* END user privileges */
 
 /* serverstatus */
@@ -378,30 +370,29 @@ div#queryboxcontainer div#bookmarkoptions{margin-top:.5em}
 #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")}
+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{',	$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_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{
@@ -412,7 +403,6 @@ li#li_user_info{
 }//END iconic view for ul items
 
 /*  - 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:50em;margin:auto;text-align:center}
diff --git a/grid/info.inc.php b/grid/info.inc.php
index a48d30ef1..20b78c005 100644
--- a/grid/info.inc.php
+++ b/grid/info.inc.php
@@ -1,9 +1,9 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
-/* info.inc.php 2007/04/26 windkiel */
+/* info.inc.php 2007/05/11 windkiel */
 
 /**
- * 2007-05 "Grid 2.9e working with version 2.8 .. 2.1x.y ...
+ * 2007-05 "Grid 2.10 working with version 2.8 .. 2.1x.y ...
  * the previous version had some refresh issues after switching from original
  * (all browser windows had to be closed to force a new session)
  * main differences to theme "original" in:
diff --git a/grid/layout.inc.php b/grid/layout.inc.php
index e6e41593e..85db06f9b 100644
--- a/grid/layout.inc.php
+++ b/grid/layout.inc.php
@@ -1,8 +1,7 @@
 <?php
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
- * by windkiel (started 2006-08-19) derived from theme "original"
- * 2007-04-26: grid2.9.e  layout choosable in config.inc.php see bottom
+ * 2007-05-11: grid-2.10  layout choosable in config.inc.php see bottom
  * you can switch to an alternate Color/Font set simply by putting the line
  * $cfg['customGrid'] = 'tan';
  * into your pma/config.inc.php or if you like the settings of the original theme:
@@ -10,14 +9,12 @@
  * you can add any number of different settings in the themes/grid/layout.inc.php,
  * take the 'test' section as an example.
  * some bugfixes like textarea height (thx Mario Rohkrämer) ...
- * the previous version had some refresh issues after switching from original
- * (all browser windows had to be closed to force a new session)
-
+ *
+ * by windkiel (started 2006-08-19) derived from theme "original"
  * 2007-02-11: grid2.9.d error.ico cursor for non Opera browsers,
  * vertical line IE only, for pma 2.8 td{color:black} is necessary!
-
  * 2007-02-08 bug 1653769 fixed: BrowsePointerEnable, BrowseMarkerEnable
-
+ *
  * for detailed layout configuration please refer to the css files
  * comments, suggestions, bugreports are welcome:
  * https://sourceforge.net/tracker/index.php?func=detail&aid=1656956&group_id=23067&atid=689412
@@ -38,11 +35,6 @@
 // navi/left frame width for index.php :
 $GLOBALS['cfg']['NaviWidth'] = 200;
 
-// 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';
 
@@ -109,7 +101,8 @@ $GLOBALS['cfg']['BrowseMarkerBackground'] = '#ffb'; #fc9';
  * if not set the browser default will be used
  * (depending on browser, DTD and system settings)
  */
-$GLOBALS['cfg']['FontFamily'] = 'sans-serif'; //was:Arial
+$GLOBALS['cfg']['FontFamily'] = 'sans-serif'; 
+
 /**
  * fixed width font family, used in textarea
  */
@@ -121,9 +114,11 @@ $GLOBALS['cfg']['FontFamilyFixed'] = 'monospace';
  * (depending on browser, DTD and system settings)
  * pma >2.8 uses font size stored in cookie
  */
-
-// for pma <2.9 :
-$GLOBALS['cfg']['FontSize'] = '90%';
+// backward compatibility :
+if(version_compare(PMA_VERSION, '2.9', 'lt')) {
+    $GLOBALS['cfg']['LeftWidth'] = $GLOBALS['cfg']['NaviWidth'];
+    $GLOBALS['cfg']['FontSize']  = '90%';
+}
 
 /**
  * tables
@@ -224,11 +219,11 @@ if (isset($GLOBALS['cfg']['customGrid']))
   elseif('tan' == $GLOBALS['cfg']['customGrid'])
   {
     $GLOBALS['cfg']['FontFamily']          = 'verdana,sans-serif';
-    $GLOBALS['cfg']['NaviBackground']      = '#dfc7a0';//white looks ugly,'#e7e7e7';// like IE6 scrollbar Am.:gray Br.:grey
+    $GLOBALS['cfg']['NaviBackground']      = '#dfc7a0';//white looks ugly, '#e7e7e7'like IE6 scrollbar Am.:gray Br.:grey
     $GLOBALS['cfg']['NaviLinkColor']       = '#00a';
     $GLOBALS['cfg']['NaviLinkBackground']  = '#fff';
     $GLOBALS['cfg']['NaviPointerColor']      = '#00f';
-    $GLOBALS['cfg']['NaviPointerBackground'] = '#fff'; //'#d9f5ff'; //~cyan/tuerkis
+    $GLOBALS['cfg']['NaviPointerBackground'] = '#fff'; //'#d9f5ff'; ~cyan/tuerkis
     $GLOBALS['cfg']['NaviMarkedColor']     = '#000';
     $GLOBALS['cfg']['NaviMarkedBackground']= '#ff9';
     $GLOBALS['cfg']['NaviFontPercentage']  = '90%';
@@ -248,4 +243,4 @@ if (isset($GLOBALS['cfg']['customGrid']))
     $GLOBALS['cfg']['BgTwo']           = '#fff';
   }
 }
-?>
+?>
\ No newline at end of file