grid 2.11c

This commit is contained in:
Marc Delisle
2007-12-05 10:50:47 +00:00
parent afdee412d7
commit 0d2687014e
4 changed files with 42 additions and 34 deletions

View File

@@ -8,7 +8,7 @@
* @subpackage Grid
*/
define('_NaviGridVersion', 'navi Grid-2.11 2007-12');
define('_NaviGridVersion', 'navi Grid-2.11 2007-11-22');
// css for navigation.php (former left.php)
if (!defined('PMA_MINIMUM_COMMON')) {
@@ -247,7 +247,7 @@ _M, 'padding-bottom:', _T, '.1em'; //for "__" spacing
if ('IE' == PMA_USR_BROWSER_AGENT) {
echo
_M, 'margin:', _T, 0, //'1px 0 0 0',
_M, 'border:', _T, '1px solid ', $GLOBALS['cfg']['Navi2ndBGC'], //test
// _M, 'border:', _T, '1px solid ', $GLOBALS['cfg']['Navi2ndBGC'], //test
_M, 'padding:', _T, 0;
} else {
echo
@@ -260,7 +260,7 @@ if ($GLOBALS['cfg']['LeftMarkerEnable']) { // orig:NaviMarkedColor???
// marked items
if (!$GLOBALS['cfg']['LeftFrameLight']) {
echo
'#left_tableList > ul li.marked > a,', _K; //4 overiding Link(Color)
'#left_tableList > ul li.marked > a', _K; //4 overiding Link(Color)
}
echo
'#left_tableList > ul li.marked',

View File

@@ -9,14 +9,14 @@
* @subpackage Grid
*/
define('_MainGridVersion', 'main Grid-3 2007-10');
define('_MainGridVersion', 'main Grid-3 2007-11-22');
if (!defined('PMA_MINIMUM_COMMON')) {
die('/* ' . _MainGridVersion . ' unplanned execution path */');
}
if ('IE' == PMA_USR_BROWSER_AGENT && !empty($GLOBALS['cfg']['NiceCss'])) {
define('_NL', chr(13) . chr(10));
define('_NL', chr(13) . chr(10)); //win clients
} else {
define('_NL', chr(10));
}
@@ -25,8 +25,8 @@ if (empty($GLOBALS['cfg']['NiceCss'])) {
define('_S', '{'); //start
define('_M', ';'); //mid
define('_E', '}' . _NL); //end
define('_K', ','); //komma
define('_T', ''); //tab #8
define('_K', ','); //komma
define('_T', ''); //tab #8
define('_D', '');
} else {
define('_S', ' {' . _NL . "\t");
@@ -386,7 +386,8 @@ _E,
// MySQL Parser:
'.syntax',
_S, 'font-size:', _T, '90%',
_S, 'font-size:', _T, '80%',
_M, 'line-height:', _T, 1.3, // "line-spacing"
_E,
'.syntax_comment',
@@ -1260,10 +1261,10 @@ _M, 'background:', _T, $GLOBALS['cfg']['FieldsetFooterBGC'],
_M, 'text-align:', _T, $right,
_E,
'#div_table_options',
_S, 'clear:', _T, 'both',
_E,
'#div_referential_integrity', _K,
'#div_table_maintenance', _K,
'#div_partition_maintenance', _K,
'#div_table_options', _K,
'#div_table_order', _K,
'#div_table_rename', _K,
@@ -1271,6 +1272,9 @@ _E,
_S, 'min-width:', _T, '48%',
_E,
'#div_referential_integrity', _K,
'#div_table_maintenance', _K,
'#div_partition_maintenance', _K,
'#div_table_options', _K,
'#div_table_order', _K,
'#div_table_rename', _K,
@@ -1291,7 +1295,7 @@ _E,
'#pmamaininformation', _K,
'#fieldset_select_fields', _K,
'#div_table_options', _K,
'#table_innodb_bufferpool_usage', _K, //table_innodb_bufferpool_activity', _K,
'#table_innodb_bufferpool_usage', _K,
'#div_mysql_charset_collations table', _K,
'#qbe_div_table_list', _K,
'#qbe_div_sql_query', _K,
@@ -1299,6 +1303,10 @@ _E,
_S, 'float:', _D, $left,
_E,
'#div_table_options',
_S, 'clear:', _T, 'both',
_E,
'label.desc',
_S, 'width:', _D, '30em',
_E;

View File

@@ -1,8 +1,9 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/* info.inc.php 2007-10-09 windkiel */
/* info.inc.php 2007-11-22 windkiel */
/**
* 2007-11-22: #div_referential_integrity new in pma 3.0
* 2007-10-12: minor changes th{}, a:hover{'underline'}, 'none' else
* 2007-10-10: pma 3.0 main frame: new success.png
* bugfixes, non Gecko tab appearance, mult_submit hover=pointer and BGC=white

View File

@@ -85,51 +85,50 @@ $GLOBALS['cfg']['NaviTblBGC'] = '#eee'; //#dfdfdc'; // '#9df';
$GLOBALS['cfg']['NaviDbNameBGC'] = $GLOBALS['cfg']['NaviLightMarkedBGC'];
//$GLOBALS['cfg']['NaviFocusBGC'] = '#fd9';
//$GLOBALS['cfg']['NaviDatabaseNameColor'] = '' ; // not used
// ~~~~~~~~~~~~~~~~~ MAIN frame ~~~~~~~~~~~~~~~~~~~~~~~~
// foreground (text) color for the main frame
$GLOBALS['cfg']['MainColor'] = '#000';
// BackgroundColor for the main frame, different solution than in <20>original<61>!
$GLOBALS['cfg']['MainBGC'] = '#d6d6d6'; //e7e7e7 same as scrollbar color;
$GLOBALS['cfg']['MainBGC'] = '#d6d6d6'; //e7e7e7 same as scrollbar color;
//at least 1 bit difference from $GLOBALS['cfg']['MainBGC'] to show the grid!(?)
$GLOBALS['cfg']['MainGridColor'] = '#d6d6d5';
$GLOBALS['cfg']['MainGridColor'] = '#d6d6d5';
// link color
$GLOBALS['cfg']['MainLinkColor'] = '#00d';
$GLOBALS['cfg']['MainLinkColor'] = '#00d';
$GLOBALS['cfg']['MainLinkHoverColor'] = '#000';
// link BGcolor
// $GLOBALS['cfg']['MainLinkBGC'] = $GLOBALS['cfg']['MainBGC'];
$GLOBALS['cfg']['MainLinkHoverBGC'] = '#fff';
$GLOBALS['cfg']['MainActiveBGC'] = '#cfc';
$GLOBALS['cfg']['MainLinkHoverBGC'] = '#fff';
$GLOBALS['cfg']['MainActiveBGC'] = '#cfc';
// foreground (text) color of the pointer in browse mode
$GLOBALS['cfg']['BrowsePointerColor'] = '#000';
// background of the pointer in browse mode
$GLOBALS['cfg']['BrowsePointerBGC'] = '#dfd';#f3f3f3'; // '#cfc';
$GLOBALS['cfg']['BrowsePointerBGC'] = '#dfd';#f3f3f3'; // '#cfc';
// foreground (text) color of the marker (visually marks row by clicking on it) in browse mode
$GLOBALS['cfg']['BrowseMarkerColor'] = '#000';
$GLOBALS['cfg']['BrowseMarkerColor'] = '#000';
// background of the marker (visually marks row by clicking on it) in browse mode
$GLOBALS['cfg']['BrowseMarkerBGC'] = '#ffb'; // '#fc9';
$GLOBALS['cfg']['BrowseMarkerBGC'] = '#ffb'; // '#fc9';
// tab decorations
$GLOBALS['cfg']['TabBGC'] = '#f3f3f3';//??
$GLOBALS['cfg']['TabBGC'] = '#f3f3f3';//??
$GLOBALS['cfg']['TabHoverColor'] = '#55f';
$GLOBALS['cfg']['TabHoverBGC'] = '#fff'; //dfd
$GLOBALS['cfg']['TabHoverColor'] = '#55f';
$GLOBALS['cfg']['TabHoverBGC'] = '#fff'; //dfd
$GLOBALS['cfg']['TabActiveColor'] = '#000';
$GLOBALS['cfg']['TabActiveBGC'] = '#ffb'; //afa
$GLOBALS['cfg']['TabActiveColor'] = '#000';
$GLOBALS['cfg']['TabActiveBGC'] = '#ffb'; //afa
$GLOBALS['cfg']['TabBorderColor'] = '#bbb';
$GLOBALS['cfg']['TabUnderlineColor'] = '#888';
$GLOBALS['cfg']['TabBorderColor'] = '#bbb';
$GLOBALS['cfg']['TabUnderlineColor'] = '#888';
// top (former legend)
@@ -339,7 +338,7 @@ if (!empty($GLOBALS['cfg']['customGrid']))
$GLOBALS['cfg']['NaviPointerColor'] = '#000';
$GLOBALS['cfg']['NaviPointerBGC'] = '#fff';
$GLOBALS['cfg']['NaviDbLinkBGC'] = '#77a';
$GLOBALS['cfg']['NaviActiveBGC'] = '#00f'; // 0
$GLOBALS['cfg']['NaviActiveBGC'] = '#ff5'; // 0
$GLOBALS['cfg']['NaviTblBGC'] = '#77a';
$GLOBALS['cfg']['NaviDbNameColor'] = '#000'; #66f';
$GLOBALS['cfg']['NaviDbNameBGC'] = 0 ; // '#fff'; // effect?