From e20011e436d785aa1c1f7725573b73eea5f05f89 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 17 Oct 2007 12:02:43 +0000 Subject: [PATCH] 2.11b --- grid/css/theme_left.css.php | 73 ++++---- grid/css/theme_right.css.php | 342 ++++++++++++++++++++++------------- grid/info.inc.php | 10 +- grid/layout.inc.php | 4 +- 4 files changed, 260 insertions(+), 169 deletions(-) diff --git a/grid/css/theme_left.css.php b/grid/css/theme_left.css.php index 6cb85f4f6..70c9186cd 100644 --- a/grid/css/theme_left.css.php +++ b/grid/css/theme_left.css.php @@ -8,10 +8,11 @@ * @subpackage Grid */ -define('_NaviGridVersion', 'navi Grid-2.11 070902'); +define('_NaviGridVersion', 'navi Grid-2.11 2007-12'); +// css for navigation.php (former left.php) if (!defined('PMA_MINIMUM_COMMON')) { - die( '/* ' . _NaviGridVersion . ' illegal execution path */'); + die('/* ' . _NaviGridVersion . ' illegal execution path */'); } if (!isset($GLOBALS['cfg']['LeftMarkerEnable'])) { @@ -28,7 +29,7 @@ if (!$GLOBALS['cfg']['LeftMarkerEnable']) { $GLOBALS['cfg']['NaviMarkedBGC'] = $GLOBALS['cfg']['NaviBackground']; } -if ('IE' == PMA_USR_BROWSER_AGENT) { +if ('IE' == PMA_USR_BROWSER_AGENT && !empty($GLOBALS['cfg']['NiceCss'])) { define('_NL', chr(13) . chr(10)); } else { define('_NL', chr(10)); @@ -47,13 +48,10 @@ if (empty($GLOBALS['cfg']['NiceCss'])) { define('_E', ';' . _NL . '}' . _NL . _NL ); define('_K', ',' . _NL ); define('_T', "\t"); - define('_D', "\t\t"); //double tab needed? + define('_D', "\t\t"); } - -// css for navigation.php (former left.php) - -if (version_compare(PMA_VERSION,'2.9','lt') && ! empty($GLOBALS['cfg']['FontSize'])) { +if (version_compare(PMA_VERSION,'2.9','lt') && !empty($GLOBALS['cfg']['FontSize'])) { echo 'html', _S, 'font-size:', _T, $GLOBALS['cfg']['FontSize'], @@ -65,18 +63,18 @@ echo '/* ', _NaviGridVersion, ' for pma 2.8 ... 2.11+ */', _NL, //general tags '*', _S, 'margin:', _T, 0, -//no good (select): 'padding:', _T, 0, +_M, 'line-height:', _T, 1.33, // "line-spacing" _E, 'body', _S; -if (! empty($GLOBALS['cfg']['FontFamily'])) { +if (!empty($GLOBALS['cfg']['FontFamily'])) { echo 'font-family:', _T, $GLOBALS['cfg']['FontFamily'], _M; } echo - 'background:', _T, $GLOBALS['cfg']['NaviBGC'], -_M, 'color:', _D, $GLOBALS['cfg']['NaviColor'], -_M, 'padding:', _T, 0, + 'background:', _T, $GLOBALS['cfg']['NaviBGC'], +_M, 'color:', _D, $GLOBALS['cfg']['NaviColor'], +_M, 'padding:', _T, 0, _E, 'hr', @@ -90,19 +88,21 @@ _E, // Links: 'a', -_S, 'padding:', _T, '0 2px 1px 2px', //top l? bot r? +_S, 'text-decoration:', _T, 'none', +_M, 'padding:', _T, '0 2px 1px 2px', //top l? bot r? _M, 'color:', _D, $GLOBALS['cfg']['NaviLinkColor'], -_E; +_E, +'a:hover', + _S, 'text-decoration:', _T, 'underline'; if ($GLOBALS['cfg']['LeftPointerEnable']) { echo - 'a:hover', - _S, 'background:', _T, $GLOBALS['cfg']['NaviPointerBGC'], - _M, 'color:', _D, $GLOBALS['cfg']['NaviPointerColor'], //doesn'work on dbname - _E; + _M, 'background:', _T, $GLOBALS['cfg']['NaviPointerBGC'], + _M, 'color:', _D, $GLOBALS['cfg']['NaviPointerColor']; //doesn'work on dbname } - echo +_E, + 'a:active', _S, 'background:', _T, $GLOBALS['cfg']['NaviActiveBGC'], _E, @@ -111,13 +111,11 @@ _E, _S, 'text-decoration:', _T, 'none', _E, - 'a img', -_S, 'border:', _D, 0,//avoid thick link border +_S, 'border:', _D, 0, //avoid thick link border _E, // end Links - 'form', _S, 'display:', _T, 'inline', _E, @@ -126,11 +124,11 @@ _E, _S, 'margin-top:', _T, '.2em', _E; -echo version_compare(PMA_VERSION, '2.11', 'lt') // here only concat! +echo version_compare(PMA_VERSION, '2.11', 'lt') ? 'select' : -'#navidbpageselector' . +'#navidbpageselector' . // here only concat! _S . "padding-$left:" . _T . '.2em' . _M . 'text-align:' . _T . 'center' . _E . @@ -143,7 +141,7 @@ _S, 'width:', _D, '100%', _E, -// buttons in some browsers (eg. Konqueror) are block elements, this breaks design: +// buttons in some browsers (e.g., Konqueror) are block elements, this breaks design: 'button', _S, 'display:', _T, 'inline', _E, @@ -153,17 +151,10 @@ _E, 'ul#databaseList', _K, '#databaseList ul', -_S, 'list-style-type:', _T, 'none', // needed for Gecko -//_M, "padding-$left:", _T, '.1em', +_S, 'list-style-type:', _T, 'none', // Gecko _M, 'padding:', _T, 0, _E; -/** -'ul#databaseList a', -_S, 'display:', _T, 'block', //with a line break before and after the element -_E; -**/ - if (!$GLOBALS['cfg']['LeftMarkerEnable']) { echo 'ul#databaseList li.selected a', @@ -188,9 +179,13 @@ if (!empty($GLOBALS['cfg']['NaviDbNameBGC'])) { echo _M, 'background:', _T, $GLOBALS['cfg']['NaviDbNameBGC']; } echo -_M, 'text-decoration:', _T, 'underline', _E, +'.navi_dbName:hover', +_S, 'text-decoration:', _T, 'underline', +_E, + + // specific elements '#pmalogo', _K, @@ -241,14 +236,14 @@ _E, // left_tableList '#left_tableList', -_S, 'margin:', _T, '0 .2em', -_M, 'padding:', _T, '.2em', -_M, 'background:', _T, $GLOBALS['cfg']['Navi2ndBGC'], +_S, 'margin:', _T, '0 .2em', +_M, 'padding:', _T, '0 .2em', +_M, 'background:', _T, $GLOBALS['cfg']['Navi2ndBGC'], _E, '#left_tableList li', _S, 'white-space:', _T, 'nowrap', -_M, 'padding-bottom:', _T, '.1em'; //4 __ spacing +_M, 'padding-bottom:', _T, '.1em'; //for "__" spacing if ('IE' == PMA_USR_BROWSER_AGENT) { echo _M, 'margin:', _T, 0, //'1px 0 0 0', diff --git a/grid/css/theme_right.css.php b/grid/css/theme_right.css.php index 1bee35dbe..7267fde08 100644 --- a/grid/css/theme_right.css.php +++ b/grid/css/theme_right.css.php @@ -9,13 +9,13 @@ * @subpackage Grid */ -define('_MainGridVersion', 'main Grid-2.11 070826'); +define('_MainGridVersion', 'main Grid-3 2007-10'); if (!defined('PMA_MINIMUM_COMMON')) { die('/* ' . _MainGridVersion . ' unplanned execution path */'); } -if ('IE' == PMA_USR_BROWSER_AGENT) { +if ('IE' == PMA_USR_BROWSER_AGENT && !empty($GLOBALS['cfg']['NiceCss'])) { define('_NL', chr(13) . chr(10)); } else { define('_NL', chr(10)); @@ -109,14 +109,6 @@ _E, _S, 'font-size:', _T, '120%', _E, -/** -'h1', _K, -'h2', _K, -'h3' -_S, 'font-weight:', _T, 'bold', // should be browser default anyway -_E, -**/ - 'a', // top/bot left/right _S, 'padding:', _T, '0 .2em', _E, @@ -214,27 +206,32 @@ _S, 'display:', _T, 'inline', _E, 'table', -_S, 'margin:', _D, '1px', +_S, 'margin:', _D, '3px 1px 1px 1px', _M, 'border-collapse:', _T, 'collapse', _E, 'table caption', _K, -'table th', _K, -'table td', -_S, 'padding:', _T, '0 .2em 0 .2em', +'th', _K, +'td', +_S, 'padding:', _T, '0 .2em 0 .2em'; //margin default -_M, 'vertical-align:', _T, 'top'; if ($GLOBALS['cfg']['Border']) { echo _M, 'border:', _D, $GLOBALS['cfg']['Border'], ' solid ', $GLOBALS['cfg']['MainGridColor']; } - echo _E, +'td', +_S, 'vertical-align:', _T, 'top', +_E, + +'th', +_S, 'vertical-align:', _T, 'bottom', +_E, + 'input', _K, 'select', _K, -'button', _K, -// ^ ??? +'button', _K, //?? 'img', _S, 'vertical-align:', _T, 'middle', _E, @@ -262,10 +259,19 @@ _S, 'white-space:', _T, 'normal', _E, 'button.mult_submit', -_S, 'border:', _D, 'none', +_S, 'border:', _D, 0, +//_M, 'border-bottom:', _D, '1px solid blue', +_M, 'margin:', _D, '0 2px', +_M, 'padding:', _T, 0, _M, 'background:', _T, 'transparent', _E, +'button.mult_submit:hover', +_S, 'background:', _T, $GLOBALS['cfg']['MainLinkHoverBGC'], //not IE6 +_M, 'cursor:',_T, 'pointer', +//IE4 _M, 'cursor:',_T, 'hand', +_E, + // odd items 1,3,5,7,... 'table tr.odd th', _K, '.odd', @@ -278,13 +284,6 @@ _E, _S, 'background:', _T, $GLOBALS['cfg']['BgTwo'], _E, -/**test -'.value', -_S, 'white-space:', _T, 'nowrap', -_E, -KiB no effect -**/ - // odd table rows 1,3,5,7,... 'table tr.odd th', _K, 'table tr.odd', _K, @@ -436,117 +435,215 @@ _E, // message boxes: warning, error, confirmation -'.notice', -_S, 'color:', _D, '#000', -_M, 'background:', _T, '#FFFFDD', -_E, - -'h1.notice', _K, -'div.notice', -_S, 'margin:', _D, '.5em 0 .5em 0', -_M, 'border:', _D, '1px solid #FFD700'; -if ($GLOBALS['cfg']['ErrorIconic']) { - echo - _M, 'background-image:', _T, 'url("', _imgPath, 's_notice.png")', - _M, 'background-repeat: no-repeat'; - if ($GLOBALS['text_dir'] === 'ltr') { - echo - _M, 'background-position:', _T, '1em 50%', - _M, 'padding:', _T, '1em 1em 1em 3.6em'; - } else { - echo - _M, 'background-position:', _T, '99% 50%', - _M, 'padding:', _T, '1em 5% 1em 1em'; - } -} else { - echo - 'padding:', _T, '.5em'; -} - -echo -_E, - -'.notice h1', -_S, 'border-bottom:', _T, '1px solid #FFD700', -_M, 'font-weight:', _T, 'bold', -_M, 'text-align:', _T, $left, -_M, 'margin:', _D, '0 0 .2em 0', -_E, - '.warning', -_S, 'color:', _D, '#c00', +_S, 'color:', _D, '#c00', _M, 'background:', _T, '#ffc', _E, -'p.warning', _K, -'h1.warning', _K, -'div.warning', -_S, 'margin:', _D, '.5em 0 .5em 0', -_M, 'border:', _D, '1px solid #c00'; -if ($GLOBALS['cfg']['ErrorIconic']) { - echo - _M, 'background-image:', _T, 'url("', _imgPath, 's_warn.png")', - _M, ' background-repeat:', _T, 'no-repeat'; - if ($GLOBALS['text_dir'] === 'ltr') { - echo - _M, 'background-position:', _T, '1em 50%', - _M, 'padding:', _T, '1em 1em 1em 3.6em'; - } else { - echo - _M, 'background-position:', _T, '99% 50%', - _M, 'padding:', _T, '1em 5% 1em 1em'; - } -} else { - echo _M, 'padding:', _T, '.5em'; -} - -echo -_E, - -'.warning h1', -_S, 'border-bottom:', _T, '1px solid #c00', -_M, 'font-weight:', _T, 'bold', -_M, 'text-align:', _T, $left, -_M, 'margin:', _T, '0 0 .2em 0', -_E, - '.error', _S, 'background:', _T, '#ffc', -_M, 'color:', _D, '#f00', -_E, +_M, 'color:', _D, '#f00', +_E; -'h1.error,div.error', -_S, 'margin:', _D, '.5em 0 .5em 0', -_M, 'border:', _D, '1px solid #f00'; +echo version_compare(PMA_VERSION,'3', 'lt') //r10741 +? +'.notice' . +_S . 'color:' . _D . '#000' . +_M . 'background:' . _T . '#ffd' . +_E . +'h1.notice' . _K . +'div.notice' . +_S . 'margin:' . _D . '5px 0' . +_M . 'border:' . _D . '1px solid #FFD700' +: +'.notice h1' . _K . +'.success h1' . _K . +'.warning h1' . _K . +'div.error h1' . +_S . 'border-bottom:' . _T . '2px solid' . //?? +_M . 'font-weight:' . _T . 'bold' . +_M . 'text-align:' . _T . $left . +_M . 'margin:' . _D . '0 0 2px 0' . +_E . + +'div.success' . _K . +'div.notice' . _K . +'div.warning' . _K . +'div.error' . +_S . 'margin:' . _D . '2px 0 0 0' . +_M . 'border:' . _D . '1px solid'; if ($GLOBALS['cfg']['ErrorIconic']) { - echo - _M, 'background-image:', _T, 'url("', _imgPath, 's_error.png")', - _M, 'background-repeat:', _T, 'no-repeat'; + if (version_compare(PMA_VERSION,'3', 'lt')) { + echo _M, 'background-image:', _T, 'url("', _imgPath, 's_notice.png")'; + } + echo _M, 'background-repeat:', _T, 'no-repeat'; if ($GLOBALS['text_dir'] === 'ltr') { - echo + echo _M, 'background-position:', _T, '1em 50%', - _M, 'padding:', _T, '1em 1em 1em 3.6em'; + _M, 'padding:', _T, '4px 1em 4px 3.6em'; } else { echo _M, 'background-position:', _T, '99% 50%', - _M, 'padding:', _T, '1em 5% 1em 1em'; - } + _M, 'padding:', _T, '4px 5% 4px 1em'; + } } else { echo - _M, 'padding:', _T, '.5em'; + 'padding:', _T, '5px'; } echo -_E, +_E; -'div.error h1', -_S, 'border-bottom:', _T, '1px solid #f00', -_M, 'font-weight:', _T, 'bold', -_M, 'text-align:', _T, $left, -_M, 'margin:', _D, '0 0 .2em 0', -_E, +if (version_compare(PMA_VERSION,'3', 'lt')) { //r10741 + echo + '.notice h1', + _S, 'border-bottom:', _T, '1px solid #FFD700', + _M, 'font-weight:', _T, 'bold', + _M, 'text-align:', _T, $left, + _M, 'margin:', _D, '0 0 .2em 0', + _E, + 'p.warning', _K, + 'h1.warning', _K, + 'div.warning', + + _S, 'margin:', _T, '3px 0 0 0', + _M, 'border:', _T, '1px solid #c00'; + + if ($GLOBALS['cfg']['ErrorIconic']) { + echo + _M, 'background-image:', _T, 'url("', _imgPath, 's_warn.png")', + _M, 'background-repeat:', _T, 'no-repeat'; + if ($GLOBALS['text_dir'] === 'ltr') { + echo + _M, 'background-position:', _T, '1em 50%', + _M, 'padding:', _T, '4px 1em 4px 3.6em'; + } else { + echo + _M, 'background-position:', _T, '99% 50%', + _M, 'padding:', _T, '4px 5% 4px 1em'; + } + } else { + echo _M, 'padding:', _T, '4px'; + } + + echo + _E, + + '.warning h1', + _S, 'border-bottom:', _T, '1px solid #c00', + _M, 'font-weight:', _T, 'bold', + _M, 'text-align:', _T, $left, + _M, 'margin:', _T, '0 0 2px 0', + _E, + + '.error', + _S, 'background:', _T, '#ffc', + _M, 'color:', _D, '#f00', + _E, + + 'h1.error', _K, + 'div.error', + _S, 'margin:', _D, '5px 0', + _M, 'border:', _D, '1px solid #f00'; + + if ($GLOBALS['cfg']['ErrorIconic']) { + echo + _M, 'background-image:', _T, 'url("', _imgPath, 's_error.png")', + _M, 'background-repeat:', _T, 'no-repeat'; + if ($GLOBALS['text_dir'] === 'ltr') { + echo + _M, 'background-position:', _T, '1em 50%', + _M, 'padding:', _T, '5px 1em 5px 3.6em'; + } else { + echo + _M, 'background-position:', _T, '99% 50%', + _M, 'padding:', _T, '5px 5% 5px 1em'; + } + } else { + echo + _M, 'padding:', _T, '.5em'; + } + + echo + _E, + + 'div.error h1', + _S, 'border-bottom:', _T, '1px solid #f00', + _M, 'font-weight:', _T, 'bold', + _M, 'text-align:', _T, $left, + _M, 'margin:', _D, '0 0 2px 0', + _E; + +} else { + + echo + '.success', + _S, 'color:', _D, '#000', + _M, 'background:', _T, '#f0fff0', + _E, + + 'h1.success', _K, + 'div.success', + _S, 'border-color:', _T, '#0f0'; + if ($GLOBALS['cfg']['ErrorIconic']) { + echo _M, 'background-image:', _T, 'url("', _imgPath, 's_success.png")'; + } + echo + _E, + + '.success h1', + _S, 'border-color:', _T, '#0d0', + _E, + + '.notice', + _S, 'color:', _D, '#000', + _M, 'background:', _T, '#ffd', + _E, + + 'h1.notice', _K, + 'div.notice', + _S, 'border-color:', _T, '#FFD700'; + if ($GLOBALS['cfg']['ErrorIconic']) { + echo _M, 'background-image:', _T, 'url("', _imgPath, 's_notice.png")'; + } + echo + _E, + + '.notice h1', + _S, 'border-color:', _T, '#FFD700', + _E, + + 'p.warning', _K, + 'h1.warning', _K, + 'div.warning', + _S, 'border-color:', _T, '#ffd700'; + if ($GLOBALS['cfg']['ErrorIconic']) { + echo _M, 'background-image:', _T, 'url("', _imgPath, 's_warn.png")'; + } + echo + _E, + + '.warning h1', + _S, 'border-color:', _T, '#c00', + _E, + + 'h1.error', _K, + 'div.error', + _S, 'border-color:', _T, '#f00'; + if ($GLOBALS['cfg']['ErrorIconic']) { + echo _M, 'background-image:', _T, 'url("', _imgPath, 's_error.png")'; + } + echo + _E, + + 'div.error h1', + _S, 'border-color:', _T, '#f00', + _E; +}//r10741 + +echo '.confirmation', _S, 'background:', _T, '#ffc', _E, @@ -1052,7 +1149,8 @@ if ($GLOBALS['cfg']['MainPageIconic']) { _S, _listImgUrl,'s_theme.png")', _E, - 'li#li_server_info', + 'li#li_server_info',_K, + 'li#li_server_version', _S, _listImgUrl,'s_host.png")', _E, @@ -1100,7 +1198,8 @@ if ($GLOBALS['cfg']['MainPageIconic']) { _S, _listImgUrl,'s_loggoff.png")', _E, - 'li#li_pma_docs', + 'li#li_pma_docs', _K, + 'li#li_pma_wiki', _S, _listImgUrl,'b_docs.png")', _E, @@ -1155,13 +1254,8 @@ _E, '#selflink', _S, 'clear:', _T, 'both', //No floating elements allowed on either side -//_M, 'display:', _T, 'block', //with a line break before and after the element _M, 'margin:', _T, '.2em', _M, 'padding:', _T, '.2em', -//_M, "padding-$right:", _T, '1em', -//_M, 'width:', _D, '100%', //responsible for horizontal scrollbar in IE 6 -//_M, 'border:', _T, '1px solid ', _silver, //test -//_M, 'border-top:', _T, '1px solid ', $GLOBALS['cfg']['MainColor'], // _silver, _M, 'background:', _T, $GLOBALS['cfg']['FieldsetFooterBGC'], _M, 'text-align:', _T, $right, _E, @@ -1208,4 +1302,4 @@ _E, 'label.desc', _S, 'width:', _D, '30em', _E; -?> \ No newline at end of file +?> diff --git a/grid/info.inc.php b/grid/info.inc.php index 8af21eaa4..ce6a97c7c 100644 --- a/grid/info.inc.php +++ b/grid/info.inc.php @@ -1,9 +1,13 @@ +?> \ No newline at end of file diff --git a/grid/layout.inc.php b/grid/layout.inc.php index a6b4ada86..c0dcf0c13 100644 --- a/grid/layout.inc.php +++ b/grid/layout.inc.php @@ -1,8 +1,6 @@