diff --git a/grid/css/theme_left.css.php b/grid/css/theme_left.css.php index e888f3835..aac5dde85 100644 --- a/grid/css/theme_left.css.php +++ b/grid/css/theme_left.css.php @@ -8,9 +8,9 @@ * @subpackage Grid */ -define('_NaviGridVersion', 'navi Grid-2.11 2007-11-22'); -// css for navigation.php (former left.php) +define('_NaviGridVersion', 'Grid 08080815 NAVI (pma 2.8+)'); +// css for navigation.php (former left.php) if (!defined('PMA_MINIMUM_COMMON')) { die('/* ' . _NaviGridVersion . ' illegal execution path */'); } @@ -40,88 +40,113 @@ if (empty($GLOBALS['cfg']['NiceCss'])) { define('_M', ';'); //mid define('_E', '}' . _NL); //end define('_K', ','); - define('_T', ''); - define('_D', ''); + define('_1', ''); + define('_2', ''); + define('_3', ''); } else { define('_S', ' {' . _NL . "\t"); define('_M', ';' . _NL . "\t"); define('_E', ';' . _NL . '}' . _NL . _NL ); define('_K', ',' . _NL ); - define('_T', "\t"); - define('_D', "\t\t"); + define('_1', "\t"); + define('_2', "\t\t"); + define('_3', "\t\t\t"); } -if (version_compare(PMA_VERSION,'2.9','lt') && !empty($GLOBALS['cfg']['FontSize'])) { +echo '/* ', _NaviGridVersion, ' */', _NL, +// general tags +'*', +_S, 'color:', _3, '#000', //FF option +_M, 'margin:', _3, 0, +_M, 'padding:', _2, 0, +_M, 'line-height:', _2, 1.25, // "line-spacing" +_E; + +if (version_compare(PMA_VERSION, '3.0', 'ge')) { echo 'html', - _S, 'font-size:', _T, $GLOBALS['cfg']['FontSize'], + _S, 'font-size:',_2; + if (null !== $_SESSION['PMA_Config']->get('fontsize')) { + echo $_SESSION['PMA_Config']->get('fontsize'); + } elseif (!empty($_COOKIE['pma_fontsize'])) { + echo $_COOKIE['pma_fontsize']; + } else echo '82%'; + echo + _E, + + 'input', _K, + 'select', _K, + 'textarea', + _S, 'font-size:', _2, '1em', _E; + } -echo '/* ', _NaviGridVersion, ' for pma 2.8 ... 2.11+ */', _NL, +if (version_compare(PMA_VERSION, '2.9', 'lt') && !empty($GLOBALS['cfg']['FontSize'])) { + echo + 'html', + _S, 'font-size:', _2, $GLOBALS['cfg']['FontSize'], + _E; -//general tags -'*', -_S, 'margin:', _T, 0, -_M, 'line-height:', _T, 1.33, // "line-spacing" -_E, +} +echo 'body', _S; if (!empty($GLOBALS['cfg']['FontFamily'])) { - echo 'font-family:', _T, $GLOBALS['cfg']['FontFamily'], + echo 'font-family:', _2, $GLOBALS['cfg']['FontFamily'], _M; } + echo - 'background:', _T, $GLOBALS['cfg']['NaviBGC'], -_M, 'color:', _D, $GLOBALS['cfg']['NaviColor'], -_M, 'padding:', _T, 0, + 'background:', _2, $GLOBALS['cfg']['NaviBGC'], +_M, 'color:', _3, $GLOBALS['cfg']['NaviColor'], _E, 'hr', -_S, 'border:', _D, 0, -_M, 'color:', _D, $GLOBALS['cfg']['NaviColor'], -_M, 'background:', _T, $GLOBALS['cfg']['NaviColor'], -_M, 'height:', _D, '1px', //mimic border 1px solid -_M, 'margin-top:', _T, '.5em', +_S, 'border:', _3, 0, +_M, 'color:', _3, $GLOBALS['cfg']['NaviColor'], +_M, 'background:', _2, $GLOBALS['cfg']['NaviColor'], +_M, 'height:', _3, '1px', //mimic border 1px solid +_M, 'margin-top:', _2, '.5em', _E, // Links: 'a', -_S, 'text-decoration:', _T, 'none', -_M, 'padding:', _T, '0 2px 1px 2px', //top l? bot r? -_M, 'color:', _D, $GLOBALS['cfg']['NaviLinkColor'], +_S, 'text-decoration:', _1, 'none', +_M, 'padding:', _2, '0 2px 1px 2px', //top l? bot r? +_M, 'color:', _3, $GLOBALS['cfg']['NaviLinkColor'], _E, 'a:hover', - _S, 'text-decoration:', _T, 'underline'; + _S, 'text-decoration:', _1, 'underline'; if ($GLOBALS['cfg']['LeftPointerEnable']) { echo - _M, 'background:', _T, $GLOBALS['cfg']['NaviPointerBGC'], - _M, 'color:', _D, $GLOBALS['cfg']['NaviPointerColor']; //doesn'work on dbname + _M, 'background:', _2, $GLOBALS['cfg']['NaviPointerBGC'], + _M, 'color:', _3, $GLOBALS['cfg']['NaviPointerColor']; //doesn'work on dbname } echo _E, 'a:active', -_S, 'background:', _T, $GLOBALS['cfg']['NaviActiveBGC'], +_S, 'background:', _2, $GLOBALS['cfg']['NaviActiveBGC'], _E, 'a:focus', -_S, 'text-decoration:', _T, 'none', +_S, 'text-decoration:', _1, 'none', _E, 'a img', -_S, 'border:', _D, 0, //avoid thick link border +_S, 'border:', _3, 0, //avoid thick link border _E, // end Links 'form', -_S, 'display:', _T, 'inline', +_S, 'display:', _2, 'inline', _E, 'select', -_S, 'margin-top:', _T, '.2em', +_S, 'margin-top:', _2, '2px', _E; echo version_compare(PMA_VERSION, '2.11', 'lt') @@ -129,21 +154,24 @@ echo version_compare(PMA_VERSION, '2.11', 'lt') 'select' : '#navidbpageselector' . // here only concat! -_S . "padding-$left:" . _T . '.2em' . -_M . 'text-align:' . _T . 'center' . +_S . 'padding-', $left, ':' . _2 . '2px' . +_M . 'text-align:' . _2 . 'center' . _E . 'select#select_server' . _K . 'select#lightm_db'; echo -_S, 'width:', _D, '100%', +_S, 'width:', _3, '100%', _E, +'option', // for db paging +_S, 'padding-', $left, ':', _2, '5px', +_E, // buttons in some browsers (e.g., Konqueror) are block elements, this breaks design: 'button', -_S, 'display:', _T, 'inline', +_S, 'display:', _2, 'inline', _E, @@ -151,63 +179,57 @@ _E, 'ul#databaseList', _K, '#databaseList ul', -_S, 'list-style-type:', _T, 'none', // Gecko -_M, 'padding:', _T, 0, +_S, 'list-style-type:', _1, 'none', // Gecko _E; if (!$GLOBALS['cfg']['LeftMarkerEnable']) { echo 'ul#databaseList li.selected a', - _S, 'background:', _T, $GLOBALS['cfg']['NaviMarkedBGC'], - _M, 'color:', _D, $GLOBALS['cfg']['NaviMarkedColor'], - _E; + _S, 'background:', _2, $GLOBALS['cfg']['NaviMarkedBGC'], + _M, 'color:', _3, $GLOBALS['cfg']['NaviMarkedColor'], + _E; } echo '#databaseList li', -_S, "padding-$left:", _T, '.4em', -_M, 'background:', _T, $GLOBALS['cfg']['NaviDblBGC'], +_S, 'padding-', $left, ':', _2, '4px', +_M, 'background:', _2, $GLOBALS['cfg']['NaviDblBGC'], _E, // 2.11+ : '.navi_dbName', -_S, 'font-weight:', _T, 'bold'; +_S, 'font-weight:', _2, 'bold'; if (!empty($GLOBALS['cfg']['NaviDbNameColor'])) { - echo _M, 'color:', _D, $GLOBALS['cfg']['NaviDbNameColor']; + echo _M, 'color:', _3, $GLOBALS['cfg']['NaviDbNameColor']; } if (!empty($GLOBALS['cfg']['NaviDbNameBGC'])) { - echo _M, 'background:', _T, $GLOBALS['cfg']['NaviDbNameBGC']; + echo _M, 'background:', _2, $GLOBALS['cfg']['NaviDbNameBGC']; } echo _E, '.navi_dbName:hover', -_S, 'text-decoration:', _T, 'underline', +_S, 'text-decoration:', _1, 'underline', _E, - // specific elements '#pmalogo', _K, '#leftframelinks', -_S, 'text-align:', _T, 'center', +_S, 'text-align:', _2, 'center', _E, '#pmalogo', -_S, 'background-color:', _T, $GLOBALS['cfg']['NaviLogoBGC'], -//_S, 'background:', _T, 'transparent', //??? -_M, 'padding:', _T, 0, +_S, 'background-color:', _1, $GLOBALS['cfg']['NaviLogoBGC'], _E, '#leftframelinks', _K, '#navidbpageselector', -_S, 'padding:', _T, 0, -_M, 'padding-bottom:', _T, '.3em', -//_M, 'background:', _T, $GLOBALS['cfg']['Navi2ndBGC'], +_S, 'padding-bottom:', _2, '3px', _E, '#leftframelinks', -_S, 'padding-top:', _T, '.3em', +_S, 'padding-top:', _2, '3px', _E; @@ -216,14 +238,14 @@ _E; if ($GLOBALS['cfg']['LeftDisplayServers']) { echo '#serverinfo', - _S, 'margin:', _D, '.2em', + _S, 'margin:', _3, '2px', _E; if ($GLOBALS['cfg']['DisplayServersList']) { echo '#list_server', - _S, 'list-style-type:', _T, 'decimal', - _M, "padding-$left:", _T, '1.8em', // .2 if "inside" + _S, 'list-style-type:', _1, 'decimal', + _M, 'padding-', $left, ':', _2, '1.8em', // .2 if "inside" _E; } } @@ -231,27 +253,23 @@ if ($GLOBALS['cfg']['LeftDisplayServers']) { echo '.icon a', _K, 'div#databaseList', -_S, 'padding:', _T, '3px', +_S, 'padding:', _2, '3px', _E, // left_tableList '#left_tableList', -_S, 'margin:', _T, '0 .2em', -_M, 'padding:', _T, '0 .2em', -_M, 'background:', _T, $GLOBALS['cfg']['Navi2ndBGC'], +_S, 'margin:', _3, '0 2px', +_M, 'padding:', _2, '0 2px', +_M, 'background:', _2, $GLOBALS['cfg']['Navi2ndBGC'], _E, '#left_tableList li', -_S, 'white-space:', _T, 'nowrap', -_M, 'padding-bottom:', _T, '.1em'; //for "__" spacing -if ('IE' == PMA_USR_BROWSER_AGENT) { +_S, 'padding-bottom:', _2, '1px', //for "__" spacing +_M, 'white-space:', _2, 'nowrap'; + +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, 'padding:', _T, 0; -} else { - echo - _M, 'margin:', _T, '1px 0 0 0'; + _M, 'margin:', _3, '1px 0 0 0'; } echo _E; @@ -264,8 +282,8 @@ if ($GLOBALS['cfg']['LeftMarkerEnable']) { // orig:NaviMarkedColor??? } echo '#left_tableList > ul li.marked', - _S, 'background:', _T, $GLOBALS['cfg']['NaviMarkedBGC'], - _M, 'color:', _D, $GLOBALS['cfg']['NaviMarkedColor'], + _S, 'background:', _2, $GLOBALS['cfg']['NaviMarkedBGC'], + _M, 'color:', _3, $GLOBALS['cfg']['NaviMarkedColor'], _E; } @@ -273,20 +291,18 @@ echo '#imgpmalogo', _K, '.icon', _K, '#left_tableList img', -_S, 'vertical-align:', _D, 'middle', //make a:hover covering the whole img +_S, 'vertical-align:', _2, 'middle', //make a:hover covering the whole img _E, '#left_tableList ul', -_S, 'list-style-type:', _T, 'none', -_M, 'padding:', _T, 0 , -_M, 'background:', _T, $GLOBALS['cfg']['Navi2ndBGC'], //for marking selected db&table only +_S, 'list-style-type:', _1, 'none', +_M, 'background:', _2, $GLOBALS['cfg']['Navi2ndBGC'], //for marking selected db&table only _E, '#left_tableList ul ul', -_S, 'padding:', _T, 0, -_M, "padding-$left:", _T, '.2em', -_M, "border-$left:", _T, '1px solid ', $GLOBALS['cfg']['NaviColor'], -_M, 'border-bottom:', _T, '1px solid ', $GLOBALS['cfg']['NaviColor'], -_M, 'background:', _T, $GLOBALS['cfg']['NaviTblBGC'], +_S, 'padding-', $left, ':', _2, '2px', +_M, 'border-', $left, ':', _2, '1px solid ', $GLOBALS['cfg']['NaviColor'], +_M, 'border-bottom:', _2, '1px solid ', $GLOBALS['cfg']['NaviColor'], +_M, 'background:', _2, $GLOBALS['cfg']['NaviTblBGC'], _E; -?> \ No newline at end of file + diff --git a/grid/css/theme_right.css.php b/grid/css/theme_right.css.php index 479e768db..04efce283 100644 --- a/grid/css/theme_right.css.php +++ b/grid/css/theme_right.css.php @@ -8,8 +8,7 @@ * @package phpMyAdmin-theme * @subpackage Grid */ - -define('_MainGridVersion', 'main Grid-3 2007-11-22'); +define('_MainGridVersion', 'Grid 080808 MAIN (pma2.8+)' ); if (!defined('PMA_MINIMUM_COMMON')) { die('/* ' . _MainGridVersion . ' unplanned execution path */'); @@ -22,35 +21,37 @@ if ('IE' == PMA_USR_BROWSER_AGENT && !empty($GLOBALS['cfg']['NiceCss'])) { } if (empty($GLOBALS['cfg']['NiceCss'])) { - define('_S', '{'); //start - define('_M', ';'); //mid - define('_E', '}' . _NL); //end - define('_K', ','); //komma - define('_T', ''); //tab #8 - define('_D', ''); + define('_K', ','); //komma + define('_S', '{'); //start + define('_M', ';'); //mid + define('_1', '' ); //tab #8 + define('_2', '' ); + define('_3', '' ); + define('_E', ';}' . _NL); //end (older safari need ; !) } else { + define('_K', ',' . _NL ); define('_S', ' {' . _NL . "\t"); define('_M', ';' . _NL . "\t"); define('_E', ';' . _NL . '}' . _NL . _NL ); - define('_K', ',' . _NL ); - define('_T', "\t"); - define('_D', "\t\t"); //double tab needed? + define('_1', "\t"); + define('_2', "\t\t"); + define('_3', "\t\t\t"); } -if (version_compare(PMA_VERSION,'2.9', 'lt')) { +if (version_compare(PMA_VERSION, '2.9', 'lt')) { //needed for pma2.8 only (if E_KOTICE=1 , but no effect) : $GLOBALS['cfg']['BgcolorOne'] = '#f7f7f7'; $GLOBALS['cfg']['BgcolorTwo'] = '#fff'; echo 'html', _K, 'table', - _S, 'font-size:', _T, $GLOBALS['cfg']['FontSize'], + _S, 'font-size:', _2, $GLOBALS['cfg']['FontSize'], _E, 'td', _K, 'th', - _S, 'color:', _D, $GLOBALS['cfg']['MainColor'], + _S, 'color:', _3, $GLOBALS['cfg']['MainColor'], _E; } @@ -59,18 +60,55 @@ version_compare(PMA_VERSION,'2.11','lt') ? '../' . $_SESSION['PMA_Theme']->getImgPath() : $_SESSION['PMA_Theme']->getImgPath() ); -define('_listImgUrl', 'list-style-image:' . _T . 'url("' . _imgPath ); //.....xxx.png") +define('_listImgUrl', 'list-style-image:' . _1 . 'url("' . _imgPath ); //.....xxx.png") // colors of several borders: define('_red', '#e00'); define('_silver', '#eee'); -echo _NL, '/* ', _MainGridVersion, ' */', _NL, +echo _NL, '/* ', _MainGridVersion, ' */', _NL; + +if (version_compare(PMA_VERSION,'3.0','ge')) { + echo + 'html', + _S, 'font-size:', _2; + if (null !== $_SESSION['PMA_Config']->get('fontsize')) { + echo $_SESSION['PMA_Config']->get('fontsize'); + } elseif (!empty($_COOKIE['pma_fontsize'])) { + echo $_COOKIE['pma_fontsize']; + } else echo '82%'; + echo + _E, + + 'input', _K, + 'select', _K, + 'textarea', + _S, 'font-size:', _2, '1em', + _E; + +} else { +/* @deprecated */ + echo ' +.nowrap { + white-space: nowrap; +}'; +} + +/* +div.nowrap +{ +*/ + +echo +'*', +_S, 'margin:', _3, 0, +_M, 'padding:', _2, 0, +_E, + 'body', -_S, 'padding:', _T, 0, -_M, 'margin:', _D, '.4em', -_M, 'color:', _D, $GLOBALS['cfg']['MainColor'], -_M, 'background:', _T, $GLOBALS['cfg']['MainBGC']; +_S, 'margin:', _3, '4px', +_M, 'color:', _3, $GLOBALS['cfg']['MainColor'], +_M, 'background:', _2, $GLOBALS['cfg']['MainBGC']; if ('MOZILLA' != PMA_USR_BROWSER_AGENT ) { // oldstyle: echo ' url("', _imgPath, 'vertical_line.png") repeat-y'; @@ -80,7 +118,7 @@ if ('MOZILLA' != PMA_USR_BROWSER_AGENT ) { if (!empty($GLOBALS['cfg']['FontFamily'])) { echo - _M, 'font-family:', _T, $GLOBALS['cfg']['FontFamily']; + _M, 'font-family:', _2, $GLOBALS['cfg']['FontFamily']; } echo _E; //end body @@ -89,199 +127,203 @@ if (!empty($GLOBALS['cfg']['FontFamilyFixed'])) { 'textarea', _K, 'tt', _K, 'pre', - _S, 'font-family:', _T, $GLOBALS['cfg']['FontFamilyFixed'], + _S, 'font-family:', _2, $GLOBALS['cfg']['FontFamilyFixed'], _E; } echo 'input', -_S, 'padding:', _T, '0 .2em', -//_M, 'font-size:', _T, '100%', -_M, 'margin-bottom:', _T, '.1em', //if sql window is narrow +_S, 'padding:', _2, '0 2px', +_M, 'margin-bottom:', _2, '1px', //if sql window is narrow _E, 'h1', -_S, 'font-size:', _T, '140%', // on main only -_M, 'margin:', _D, '0 .8em 0 .8em', +_S, 'font-size:', _2, '140%', // on main only +_M, 'padding:', _2, '0 22px', +//_M, 'border:', _3, '1px solid red', _E, 'h2', -_S, 'font-size:', _T, '120%', +_S, 'font-size:', _2, '120%', _E, -'a', // top/bot left/right -_S, 'padding:', _T, '0 .2em', +'a', // top/bot left/right +_S, 'padding:', _2, '0 2px', _E, // Links: 'a', -_S, 'text-decoration:', _T, 'none', -_M, 'color:', _D, $GLOBALS['cfg']['MainLinkColor'], -_M, 'padding:', _T, '0 2px 1px 2px', //top l? bot r? +_S, 'text-decoration:', _1, 'none', +_M, 'color:', _3, $GLOBALS['cfg']['MainLinkColor'], +_M, 'padding:', _2, '0 2px 1px 2px', //top l? bot r? _E, 'a:hover', -_S, 'text-decoration:', _T, 'underline', -_M, 'color:', _D, $GLOBALS['cfg']['MainLinkHoverColor'], -_M, 'background:', _T, $GLOBALS['cfg']['MainLinkHoverBGC'], +_S, 'text-decoration:', _1, 'underline', +_M, 'color:', _3, $GLOBALS['cfg']['MainLinkHoverColor'], +_M, 'background:', _2, $GLOBALS['cfg']['MainLinkHoverBGC'], _E, 'a:active', -_S, 'background:', _T, $GLOBALS['cfg']['MainActiveBGC'], +_S, 'background:', _2, $GLOBALS['cfg']['MainActiveBGC'], _E, 'a:focus', -_S, 'background:', _T, $GLOBALS['cfg']['BrowsePointerBGC'], +_S, 'background:', _2, $GLOBALS['cfg']['BrowsePointerBGC'], _E, 'dfn', -_S, 'font-style:', _T, 'normal', +_S, 'font-style:', _2, 'normal', _E, 'dfn:hover', -_S, 'font-style:', _T, 'normal', -_M, 'cursor:', _T, 'help', +_S, 'font-style:', _2, 'normal', +_M, 'cursor:', _3, 'help', _E, 'th', -_S, 'font-weight:', _T, 'bold', -_M, 'color:', _D, $GLOBALS['cfg']['ThColor'], -_M, 'background:', _T, $GLOBALS['cfg']['ThBGC'], +_S, 'font-weight:', _2, 'bold', +_M, 'color:', _3, $GLOBALS['cfg']['ThColor'], +_M, 'background:', _2, $GLOBALS['cfg']['ThBGC'], _E, 'a img', -_S, 'border:', _D, 0, +_S, 'border:', _3, 0, _E, 'hr', -_S, 'color:', _D, $GLOBALS['cfg']['MainColor'], -_M, 'background:', _T, $GLOBALS['cfg']['MainColor'], //sic! -_M, 'border:', _D, 0, -_M, 'height:', _T, '1px', +_S, 'color:', _3, $GLOBALS['cfg']['MainColor'], +_M, 'background:', _2, $GLOBALS['cfg']['MainColor'], //sic! +_M, 'border:', _3, 0, +_M, 'height:', _3, '1px', _E, 'form', -_S, 'padding:', _T, 0, -_M, 'margin:', _D, '1px', -_M, 'display:', _T, 'inline', +_S, 'margin:', _3, '1px', +_M, 'display:', _2, 'inline', _E, 'textarea', -_S, 'overflow:', _T, 'visible', -_M, 'height:', _T, ceil($GLOBALS['cfg']['TextareaRows']*1.2), 'em', +_S, 'overflow:', _2, 'visible', +_M, 'height:', _3, ceil($GLOBALS['cfg']['TextareaRows']*1.2), 'em', //thx Mario Rohkrämer (ligh1l) Gag_H _E, 'fieldset', -_S, 'margin-top:', _T, '.7em', //for sql window -_M, 'padding:', _T, '.5em', -_M, 'background:', _T, $GLOBALS['cfg']['FieldsetBGC'], -_M, 'border:', _D, '1px solid ', $GLOBALS['cfg']['BorderColor'], +_S, 'margin-top:', _2, '.7em', //for sql window +_M, 'padding:', _2, '5px', +_M, 'background:', _2, $GLOBALS['cfg']['FieldsetBGC'], +_M, 'border:', _3, '1px solid ', $GLOBALS['cfg']['BorderColor'], _E, 'fieldset fieldset', -_S, 'margin:', _D, '.8em', +_S, 'margin:', _3, '.8em', _E, 'fieldset legend', -_S, 'padding:', _T, '.1em .3em'; +_S, 'padding:', _2, '1px 3px'; //.1 .3 if ($GLOBALS['cfg']['LegendBorder']) { echo - _M, 'border:', _D, '1px solid ', $GLOBALS['cfg']['BorderColor'], - _M, 'border-bottom:', _T, 0; + _M, 'border:', _3, '1px solid ', $GLOBALS['cfg']['BorderColor'], + _M, 'border-bottom:', _2, 0; } echo -_M, 'background:', _T, $GLOBALS['cfg']['LegendBGC'], -_M, 'color:', _D, $GLOBALS['cfg']['LegendColor'], -_M, 'margin-top:', _T, '.3em', -_M, 'font-weight:', _T, 'bold', +_M, 'background:', _2, $GLOBALS['cfg']['LegendBGC'], +_M, 'color:', _3, $GLOBALS['cfg']['LegendColor'], +_M, 'margin-top:', _2, '3px', +_M, 'font-weight:', _2, 'bold', _E, // buttons in some browsers (eg. Konqueror) are block elements, this breaks design:' 'button', -_S, 'display:', _T, 'inline', +_S, 'display:', _2, 'inline', _E, 'table', -_S, 'margin:', _D, '3px 1px 1px 1px', -_M, 'border-collapse:', _T, 'collapse', +_S, 'margin:', _3, '3px 1px 1px 1px', +_M, 'border-collapse:', _1, 'collapse', _E, 'table caption', _K, 'th', _K, 'td', -_S, 'padding:', _T, '0 .2em 0 .2em'; +_S, 'padding:', _2, '0 2px'; //margin default if ($GLOBALS['cfg']['Border']) { - echo _M, 'border:', _D, $GLOBALS['cfg']['Border'], ' solid ', $GLOBALS['cfg']['MainGridColor']; + echo _M, 'border:', _3, $GLOBALS['cfg']['Border'], ' solid ', $GLOBALS['cfg']['MainGridColor']; } echo _E, 'td', -_S, 'vertical-align:', _T, 'top', +_S, 'vertical-align:', _2, 'top', _E, 'th', -_S, 'vertical-align:', _T, 'bottom', +_S, 'vertical-align:', _2, 'bottom', _E, -'input', _K, +'input', _K, 'select', _K, 'button', _K, //?? 'img', -_S, 'vertical-align:', _T, 'middle', +_S, 'vertical-align:', _2, 'middle', _E, // classes +'div.tools', +_S, 'border:', _3, '1px solid ', $GLOBALS['cfg']['BorderColor'], +_M, 'padding:', _2, '2px', +_E, + +'div.tools', _K, 'fieldset.tblFooters', -_S, 'border-top:', _T, 0, -_M, 'margin-top:', _T, 0, -_M, 'margin-bottom:', _T, '.5em', -_M, 'text-align:', _T, $right, -_M, 'background:', _T, $GLOBALS['cfg']['FieldsetFooterBGC'], -_M, 'float:', _D, 'none', -_M, 'clear:', _T, 'both', +_S, 'border-top:', _2, 0, +_M, 'margin-top:', _2, 0, +_M, 'margin-bottom:', _2, '5px', +_M, 'text-align:', _2, $right, +_M, 'background:', _2, $GLOBALS['cfg']['FieldsetFooterBGC'], +_M, 'float:', _3, 'none', +_M, 'clear:', _3, 'both', _E, 'fieldset .formelement', -_S, "margin-$right:", _T, '.5em', -_M, 'white-space:', _T, 'nowrap', //IE +_S, 'margin-', $right, ':', _2, '5px', +_M, 'white-space:', _2, 'nowrap', //IE _E, // revert for Gecko 'fieldset div[class=formelement]', -_S, 'white-space:', _T, 'normal', +_S, 'white-space:', _2, 'normal', _E, 'button.mult_submit', -_S, 'border:', _D, 0, -//_M, 'border-bottom:', _D, '1px solid blue', -_M, 'margin:', _D, '0 2px', -_M, 'padding:', _T, 0, -_M, 'background:', _T, 'transparent', +_S, 'border:', _3, 0, +//_M, 'border-bottom:', _3, '1px solid blue', +_M, 'margin:', _3, '0 2px', +_M, 'background:', _2, 'transparent', _E, 'button.mult_submit:hover', -_S, 'background:', _T, $GLOBALS['cfg']['MainLinkHoverBGC'], //not IE6 -_M, 'cursor:',_T, 'pointer', -//IE4 _M, 'cursor:',_T, 'hand', +_S, 'background:', _2, $GLOBALS['cfg']['MainLinkHoverBGC'], //not IE6 +_M, 'cursor:', _3, 'pointer', +//IE4 _M, 'cursor:',_3, 'hand', _E, // odd items 1,3,5,7,... 'table tr.odd th', _K, '.odd', -_S, 'background:', _T, $GLOBALS['cfg']['BgOne'], +_S, 'background:', _2, $GLOBALS['cfg']['BgOne'], _E, // even items 2,4,6,8,... 'table tr.even th', _K, '.even', -_S, 'background:', _T, $GLOBALS['cfg']['BgTwo'], +_S, 'background:', _2, $GLOBALS['cfg']['BgTwo'], _E, // odd table rows 1,3,5,7,... @@ -289,7 +331,7 @@ _E, 'table tr.odd', _K, 'table tr.even th', _K, 'table tr.even', -_S, 'text-align:', _T, $left, +_S, 'text-align:', _2, $left, _E; if ($GLOBALS['cfg']['BrowseMarkerEnable']) { @@ -297,8 +339,8 @@ if ($GLOBALS['cfg']['BrowseMarkerEnable']) { echo 'table tr.marked th', _K, 'table tr.marked', - _S, 'background:', _T, $GLOBALS['cfg']['BrowseMarkerBGC'], - _M, 'color:', _D, $GLOBALS['cfg']['BrowseMarkerColor'], + _S, 'background:', _2, $GLOBALS['cfg']['BrowseMarkerBGC'], + _M, 'color:', _3, $GLOBALS['cfg']['BrowseMarkerColor'], _E; } @@ -308,16 +350,16 @@ if ($GLOBALS['cfg']['BrowsePointerEnable']) { '.odd:hover', _K, '.even:hover', _K, '.hover', - _S, 'background:', _T, $GLOBALS['cfg']['BrowsePointerBGC'], - _M, 'color:', _D, $GLOBALS['cfg']['BrowsePointerColor'], + _S, 'background:', _2, $GLOBALS['cfg']['BrowsePointerBGC'], + _M, 'color:', _3, $GLOBALS['cfg']['BrowsePointerColor'], _E, // hovered table rows - 'table tr.odd:hover th', _K, + 'table tr.odd:hover th', _K, 'table tr.even:hover th', _K, 'table tr.hover th', - _S, 'background:', _T, $GLOBALS['cfg']['BrowsePointerBGC'], - _M, 'color:', _D, $GLOBALS['cfg']['BrowsePointerColor'], + _S, 'background:', _2, $GLOBALS['cfg']['BrowsePointerBGC'], + _M, 'color:', _3, $GLOBALS['cfg']['BrowsePointerColor'], _E; } // endif BrowsePointerEnabled @@ -325,172 +367,160 @@ echo // marks table rows/cells if the db field is in a where condition 'tr.condition th', _K, 'tr.condition td', _K, -'td.condition', _K, +'td.condition', _K, 'th.condition', -_S, 'border:', _D, '1px solid ', _T, $GLOBALS['cfg']['BrowseMarkerBGC'], +_S, 'border:', _3, '1px solid ', $GLOBALS['cfg']['BrowseMarkerBGC'], _E, 'table .value', -_S, 'text-align:', _T, $right, -_M, 'white-space:', _T, 'normal', +_S, 'text-align:', _2, $right, +_M, 'white-space:', _2, 'normal', _E, // IE(?) doesn't handle 'pre' right: 'table [class=value]', -_S, 'white-space:', _T, 'normal', +_S, 'white-space:', _2, 'normal', _E; if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { echo '.value', - _S, 'font-family:', _T, $GLOBALS['cfg']['FontFamilyFixed'], + _S, 'font-family:', _2, $GLOBALS['cfg']['FontFamilyFixed'], _E; } echo '.value .attention', -_S, 'color:', _D, _red, -_M, 'font-weight:', _T, 'bold', +_S, 'color:', _3, _red, +_M, 'font-weight:', _2, 'bold', _E, '.value .allfine', -_S, 'color:', _D, 'green', +_S, 'color:', _3, 'green', _E, 'img.lightbulb', -_S, 'cursor:', _T, 'pointer', +_S, 'cursor:', _3, 'pointer', _E, '.pdflayout', -_S, 'overflow:', _T, 'hidden', -_M, 'clip:', _T, 'inherit', -_M, 'background:', _T, '#fff', -_M, 'display:', _T, 'none', -_M, 'border:', _D, '1px solid #000', -_M, 'position:', _T, 'relative', +_S, 'overflow:', _2, 'hidden', +_M, 'clip:', _3, 'inherit', +_M, 'background:', _2, '#fff', +_M, 'display:', _2, 'none', +_M, 'border:', _3, '1px solid #000', +_M, 'position:', _2, 'relative', _E, '.pdflayout_table', -_S, 'background:', _T, '#D3DCE3', -_M, 'color:', _D, '#000', -_M, 'overflow:', _T, 'hidden', -_M, 'clip:', _T, 'inherit', -_M, 'z-index:', _T, '2', -_M, 'display:', _T, 'inline', -_M, 'visibility:', _T, 'inherit', -_M, 'cursor:', _T, 'move', -_M, 'position:', _T, 'absolute', -_M, 'font-size:', _T, '80%', -_M, 'border:', _D, '1px dashed #000', +_S, 'background:', _2, '#D3DCE3', +_M, 'color:', _3, '#000', +_M, 'overflow:', _2, 'hidden', +_M, 'clip:', _3, 'inherit', +_M, 'z-index:', _2, '2', +_M, 'display:', _2, 'inline', +_M, 'visibility:', _2, 'inherit', +_M, 'cursor:', _3, 'move', +_M, 'position:', _2, 'absolute', +_M, 'font-size:', _2, '80%', +_M, 'border:', _3, '1px dashed #000', _E, // MySQL Parser: '.syntax', -_S, 'font-size:', _T, '80%', -_M, 'line-height:', _T, 1.3, // "line-spacing" +_S, 'font-size:', _2, '80%', +_M, 'line-height:', _2, 1.3, // "line-spacing" _E, '.syntax_comment', -_S, 'padding-left:', _T, '4pt', -_M, 'padding-right:', _T, '4pt', +_S, 'padding-left:', _2, '4pt', +_M, 'padding-right:', _2, '4pt', _E, -'.syntax_alpha_columnType', _K, +'.syntax_alpha_columnType', _K, '.syntax_alpha_columnAttrib', _K, '.syntax_alpha_functionName', _K, '.syntax_alpha_reservedWord', -_S, 'text-transform:', _T, 'uppercase', +_S, 'text-transform:', _2, 'uppercase', _E, '.syntax_alpha_reservedWord', -_S, 'font-weight:', _T, 'bold', +_S, 'font-weight:', _2, 'bold', _E, '.syntax_quote', -_S, 'white-space:', _T, 'pre', +_S, 'white-space:', _2, 'pre', _E, -/** -'.syntax_quote_backtick', -_S, 'background:', _T, $GLOBALS['cfg']['BacktickBGC'], -_M, 'padding-left:', _T, '2px', -_M, 'padding-right:', _T, '2px', -_E, -**/ //leave some space between icons and text '.icon', -_S, 'vertical-align:', _T, 'middle', -_M, 'margin-right:', _T, '.3em', -_M, 'margin-left:', _T, '.3em', -_E, - -'td .icon', -_S, 'margin:', _D, 0, +_S, 'vertical-align:', _2, 'middle', +_M, 'margin:', _3, '0 3px', _E, '.selectallarrow', -_S, "margin-$right:", _T, '.3em', -_M, "margin-$left:", _T, '.6em', +_S, 'margin-', $right, ':', _2, '3px', +_M, 'margin-', $left, ':', _2, '.6em', _E, // message boxes: warning, error, confirmation '.warning', -_S, 'color:', _D, '#c00', -_M, 'background:', _T, '#ffc', +_S, 'color:', _3, '#c00', +_M, 'background:', _2, '#ffc', _E, '.error', -_S, 'background:', _T, '#ffc', -_M, 'color:', _D, '#f00', +_S, 'background:', _2, '#ffc', +_M, 'color:', _3, '#f00', _E; -echo version_compare(PMA_VERSION,'3', 'lt') //r10741 +echo version_compare(PMA_VERSION, '3', 'lt') //r10741 ? '.notice' . -_S . 'color:' . _D . '#000' . -_M . 'background:' . _T . '#ffd' . +_S . 'color:' . _3 . '#000' . +_M . 'background:' . _2 . '#ffd' . _E . 'h1.notice' . _K . 'div.notice' . -_S . 'margin:' . _D . '5px 0' . -_M . 'border:' . _D . '1px solid #FFD700' +_S . 'margin:' . _3 . '5px 0' . +_M . 'border:' . _3 . '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' . +_S . 'border-bottom:' . _2 . '2px solid' . //?? +_M . 'font-weight:' . _2 . 'bold' . +_M . 'text-align:' . _2 . $left . +_M . 'margin:' . _3 . '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'; +_S . 'margin:' . _3 . '2px 0 0 0' . +_M . 'border:' . _3 . '1px solid'; if ($GLOBALS['cfg']['ErrorIconic']) { - if (version_compare(PMA_VERSION,'3', 'lt')) { - echo _M, 'background-image:', _T, 'url("', _imgPath, 's_notice.png")'; + if (version_compare(PMA_VERSION, '3', 'lt')) { + echo _M, 'background-image:', _1, 'url("', _imgPath, 's_notice.png")'; } - echo _M, 'background-repeat:', _T, 'no-repeat'; + echo _M, 'background-repeat:', _1, 'no-repeat'; if ($GLOBALS['text_dir'] === 'ltr') { echo - _M, 'background-position:', _T, '1em 50%', - _M, 'padding:', _T, '4px 1em 4px 3.6em'; + _M, 'background-position:', _1, '1em 50%', + _M, 'padding:', _2, '4px 1em 4px 36px'; } else { echo - _M, 'background-position:', _T, '99% 50%', - _M, 'padding:', _T, '4px 5% 4px 1em'; + _M, 'background-position:', _1, '99% 50%', + _M, 'padding:', _2, '4px 5% 4px 1em'; } } else { echo - 'padding:', _T, '5px'; + 'padding:', _2, '5px'; } echo @@ -499,176 +529,176 @@ _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', + _S, 'border-bottom:', _2, '1px solid #FFD700', + _M, 'font-weight:', _2, 'bold', + _M, 'text-align:', _2, $left, + _M, 'margin:', _3, '0 0 2px 0', _E, 'p.warning', _K, 'h1.warning', _K, 'div.warning', - _S, 'margin:', _T, '3px 0 0 0', - _M, 'border:', _T, '1px solid #c00'; + _S, 'margin:', _2, '3px 0 0 0', + _M, 'border:', _2, '1px solid #c00'; if ($GLOBALS['cfg']['ErrorIconic']) { echo - _M, 'background-image:', _T, 'url("', _imgPath, 's_warn.png")', - _M, 'background-repeat:', _T, 'no-repeat'; + _M, 'background-image:', _1, 'url("', _imgPath, 's_warn.png")', + _M, 'background-repeat:', _1, 'no-repeat'; if ($GLOBALS['text_dir'] === 'ltr') { echo - _M, 'background-position:', _T, '1em 50%', - _M, 'padding:', _T, '4px 1em 4px 3.6em'; + _M, 'background-position:', _1, '1em 50%', + _M, 'padding:', _2, '4px 1em 4px 36px'; } else { echo - _M, 'background-position:', _T, '99% 50%', - _M, 'padding:', _T, '4px 5% 4px 1em'; + _M, 'background-position:', _1, '99% 50%', + _M, 'padding:', _2, '4px 5% 4px 1em'; } } else { - echo _M, 'padding:', _T, '4px'; + echo _M, 'padding:', _2, '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', + _S, 'border-bottom:', _2, '1px solid #c00', + _M, 'font-weight:', _2, 'bold', + _M, 'text-align:', _2, $left, + _M, 'margin:', _2, '0 0 2px 0', _E, '.error', - _S, 'background:', _T, '#ffc', - _M, 'color:', _D, '#f00', + _S, 'background:', _2, '#ffc', + _M, 'color:', _3, '#f00', _E, 'h1.error', _K, 'div.error', - _S, 'margin:', _D, '5px 0', - _M, 'border:', _D, '1px solid #f00'; + _S, 'margin:', _3, '5px 0', + _M, 'border:', _3, '1px solid #f00'; if ($GLOBALS['cfg']['ErrorIconic']) { echo - _M, 'background-image:', _T, 'url("', _imgPath, 's_error.png")', - _M, 'background-repeat:', _T, 'no-repeat'; + _M, 'background-image:', _1, 'url("', _imgPath, 's_error.png")', + _M, 'background-repeat:', _1, 'no-repeat'; if ($GLOBALS['text_dir'] === 'ltr') { echo - _M, 'background-position:', _T, '1em 50%', - _M, 'padding:', _T, '5px 1em 5px 3.6em'; + _M, 'background-position:', _1, '1em 50%', + _M, 'padding:', _2, '5px 1em 5px 36px'; } else { echo - _M, 'background-position:', _T, '99% 50%', - _M, 'padding:', _T, '5px 5% 5px 1em'; + _M, 'background-position:', _1, '99% 50%', + _M, 'padding:', _2, '5px 5% 5px 1em'; } } else { echo - _M, 'padding:', _T, '.5em'; + _M, 'padding:', _2, '5px'; } 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', + _S, 'border-bottom:', _2, '1px solid #f00', + _M, 'font-weight:', _2, 'bold', + _M, 'text-align:', _2, $left, + _M, 'margin:', _3, '0 0 2px 0', _E; } else { echo '.success', - _S, 'color:', _D, '#000', - _M, 'background:', _T, '#f0fff0', + _S, 'color:', _3, '#000', + _M, 'background:', _2, '#f0fff0', _E, 'h1.success', _K, 'div.success', - _S, 'border-color:', _T, '#0f0'; + _S, 'border-color:', _2, $GLOBALS['cfg']['SuccessBorderColor']; if ($GLOBALS['cfg']['ErrorIconic']) { - echo _M, 'background-image:', _T, 'url("', _imgPath, 's_success.png")'; + echo _M, 'background-image:', _1, 'url("', _imgPath, 's_success.png")'; } echo _E, '.success h1', - _S, 'border-color:', _T, '#0d0', + _S, 'border-color:', _2, '#0d0', _E, '.notice', - _S, 'color:', _D, '#000', - _M, 'background:', _T, '#ffd', + _S, 'color:', _3, '#000', + _M, 'background:', _2, '#ffd', _E, 'h1.notice', _K, 'div.notice', - _S, 'border-color:', _T, '#FFD700'; + _S, 'border-color:', _2, '#FFD700'; if ($GLOBALS['cfg']['ErrorIconic']) { - echo _M, 'background-image:', _T, 'url("', _imgPath, 's_notice.png")'; + echo _M, 'background-image:', _1, 'url("', _imgPath, 's_notice.png")'; } echo _E, '.notice h1', - _S, 'border-color:', _T, '#FFD700', + _S, 'border-color:', _2, '#FFD700', _E, 'p.warning', _K, 'h1.warning', _K, 'div.warning', - _S, 'border-color:', _T, '#ffd700'; + _S, 'border-color:', _2, '#ffd700'; if ($GLOBALS['cfg']['ErrorIconic']) { - echo _M, 'background-image:', _T, 'url("', _imgPath, 's_warn.png")'; + echo _M, 'background-image:', _1, 'url("', _imgPath, 's_warn.png")'; } echo _E, '.warning h1', - _S, 'border-color:', _T, '#c00', + _S, 'border-color:', _2, '#c00', _E, 'h1.error', _K, 'div.error', - _S, 'border-color:', _T, '#f00'; + _S, 'border-color:', _2, '#f00'; if ($GLOBALS['cfg']['ErrorIconic']) { - echo _M, 'background-image:', _T, 'url("', _imgPath, 's_error.png")'; + echo _M, 'background-image:', _1, 'url("', _imgPath, 's_error.png")'; } echo _E, 'div.error h1', - _S, 'border-color:', _T, '#f00', + _S, 'border-color:', _2, '#f00', _E; }//r10741 echo '.confirmation', -_S, 'background:', _T, '#ffc', +_S, 'background:', _2, '#ffc', _E, 'fieldset.confirmation', -_S, 'border:', _D, '1px solid #f00', +_S, 'border:', _3, '1px solid #f00', _E, 'fieldset.confirmation legend', -_S, 'border-left:', _T, '1px solid #f00', -_M, 'border-right:', _T, '1px solid #f00', -_M, 'font-weight:', _T, 'bold'; +_S, 'border-left:', _2, '1px solid #f00', +_M, 'border-right:', _2, '1px solid #f00', +_M, 'font-weight:', _2, 'bold'; if ($GLOBALS['cfg']['ErrorIconic']) { echo - _M, 'background-image:', _T, 'url("', _imgPath, 's_really.png")', - _M, 'background-repeat:', _T, 'no-repeat'; + _M, 'background-image:', _1, 'url("', _imgPath, 's_really.png")', + _M, 'background-repeat:', _1, 'no-repeat'; if ($GLOBALS['text_dir'] === 'ltr') { echo - _M, 'background-position:', _T, '.5em 50%', - _M, 'padding:', _T, '.2em .2em .2em 2.5em'; + _M, 'background-position:', _1, '5px 50%', + _M, 'padding:', _2, '2px 2px 2px 25px'; } else { echo - _M, 'background-position:', _T, '97% 50%', - _M, 'padding:', _T, '.2em 2.5em .2em .2em'; + _M, 'background-position:', _1, '97% 50%', + _M, 'padding:', _2, '2px 25px 2px 2px'; } } @@ -676,162 +706,171 @@ echo _E, // end messageboxes '.tblcomment', -_S, 'font-size:', _T, '90%', -_M, 'font-weight:', _T, 'normal', -_M, 'color:', _D, '#009', +_S, 'font-size:', _2, '90%', +_M, 'font-weight:', _2, 'normal', +_M, 'color:', _3, '#009', _E, '.tblHeaders', -_S, 'font-weight:', _T, 'bold', -_M, 'color:', _D, $GLOBALS['cfg']['ThColor'], -_M, 'background:', _T, $GLOBALS['cfg']['ThBGC'], +_S, 'font-weight:', _2, 'bold', +_M, 'color:', _3, $GLOBALS['cfg']['ThColor'], +_M, 'background:', _2, $GLOBALS['cfg']['ThBGC'], _E, +'div.tools', _K, '.tblFooters', -_S, 'font-weight:', _T, 'normal', -_M, 'color:', _D, $GLOBALS['cfg']['ThColor'], -_M, 'background:', _T, $GLOBALS['cfg']['ThBGC'], +_S, 'font-weight:', _2, 'normal', +_M, 'color:', _3, $GLOBALS['cfg']['ThColor'], +_M, 'background:', _2, $GLOBALS['cfg']['ThBGC'], _E, +'div.tools a:link', _K, +'div.tools a:active', _K, +'div.tools a:visited', _K, '.tblHeaders a:link', _K, '.tblHeaders a:active', _K, '.tblHeaders a:visited', _K, '.tblFooters a:link', _K, '.tblFooters a:active', _K, '.tblFooters a:visited', -_S, 'color:', _D, '#00f', +_S, 'color:', _3, '#00f', _E, +'div.tools a:hover', _K, '.tblHeaders a:hover', _K, '.tblFooters a:hover', -_S, 'color:', _D, '#f00', +_S, 'color:', _3, '#f00', _E, '.noPrivileges', -_S, 'color:', _D, '#f00', -_M, 'font-weight:', _T, 'bold', +_S, 'color:', _3, '#f00', +_M, 'font-weight:', _2, 'bold', _E, '.disabled', _K, '.disabled a:link', _K, '.disabled a:active', _K, '.disabled a:visited', -_S, 'color:', _D, '#666', +_S, 'color:', _3, '#666', _E, '.disabled a:hover', -_S, 'color:', _D, '#666', -_M, 'text-decoration:', _T, 'none', +_S, 'color:', _3, '#666', +_M, 'text-decoration:', _1, 'none', _E, 'tr.disabled td', _K, 'td.disabled', -_S, 'background:', _T, '#ccc', +_S, 'background:', _2, '#ccc', _E, 'body.loginform h1', _K, 'body.loginform a.logo', -_S, 'display:', _T, 'block', -_M, 'text-align:', _T, 'center', +_S, 'display:', _2, 'block', +_M, 'text-align:', _2, 'center', _E, 'body.loginform', -_S, 'text-align:', _T, 'center', +_S, 'text-align:', _2, 'center', _E, 'body.loginform div.container', -_S, 'text-align:', _T, $left, -_M, 'width:', _D, '30em', -_M, 'margin:', _D, '0 auto', +_S, 'text-align:', _2, $left, +_M, 'width:', _3, '30em', +_M, 'margin:', _3, '0 auto', _E, 'form.login label', -_S, 'width:', _D, '10em', -_M, 'font-weight:', _T, 'bolder', +_S, 'width:', _3, '10em', +_M, 'font-weight:', _2, 'bolder', _E, // specific elements 'ul#topmenu', -_S, 'font-weight:', _T, 'bold', -_M, 'list-style-type:', _T, 'none', -_M, 'margin:', _D, 0, -_M, 'padding:', _T, 0, +_S, 'font-weight:', _2, 'bold', +_M, 'list-style-type:', _2, 'none', _E, 'ul#topmenu li', -_S, 'list-style-type:', _T, 'none', -_M, 'margin:', _D, 0, -_M, 'padding:', _T, 0, -_M, 'vertical-align:', _T, 'middle', +_S, 'list-style-type:', _2, 'none', +_M, 'vertical-align:', _2, 'middle', _E, 'ul#topmenu li.active', -_S, 'border-bottom:', _T, '2px solid ', $GLOBALS['cfg']['MainBGC'], +_S, 'border-bottom:', _2, '2px solid ', $GLOBALS['cfg']['MainBGC'], _E, '#topmenu img', -_S, 'vertical-align:', _T, 'middle', -_M, "margin-$right:", _T, '1px', +_S, 'vertical-align:', _2, 'middle', +_M, 'margin-', $right, ':', _2, '1px', _E, '.tab', _K, '.tabcaution', _K, '.tabactive', -_S, 'display:', _T, 'block', -_M, 'margin:', _T, '.2em .2em 0 .2em', -_M, 'padding:', _T, '.2em .2em 0 .2em', -_M, 'white-space:', _T, 'nowrap', +_S, 'display:', _2, 'block', +_M, 'margin:', _3, '2px 2px 0 2px', +_M, 'padding:', _2, '2px 2px 0 2px', +_M, 'white-space:', _2, 'nowrap', _E, 'span.tab', -_S, 'color:', _D, '#666', +_S, 'color:', _3, '#666', _E, 'span.tabcaution', -_S, 'color:', _D, '#f66', +_S, 'color:', _3, '#f66', _E, 'a.tabcaution', -_S, 'color:', _D, '#f00', +_S, 'color:', _3, '#f00', _E, 'a.tabcaution:hover', -_S, 'color:', _D, '#fff', -_M, 'background:', _T, '#f00', +_S, 'color:', _3, '#fff', +_M, 'background:', _2, '#f00', _E; if ($GLOBALS['cfg']['LightTabs']) { echo 'a.tabactive', - _S, 'color:', _D, $GLOBALS['cfg']['MainColor']; + _S, 'color:', _3, $GLOBALS['cfg']['MainColor']; } else { echo '#topmenu', - _S, 'margin-top:', _T, '.5em', - _M, 'padding:', _T, '.1em .3em', + _S, 'margin-top:', _2, '5px', + _M, 'padding:', _2, '1px 3px', _E, 'ul#topmenu li', - _S, 'border-bottom:', _T, '2px solid ', $GLOBALS['cfg']['TabUnderlineColor'], + _S, 'border-bottom:', _2, '2px solid ', $GLOBALS['cfg']['TabUnderlineColor'], _E, '.tab', _K, '.tabcaution', _K, '.tabactive', - _S, 'background:', _T, $GLOBALS['cfg']['TabBGC']; - if ('MOZILLA' == PMA_USR_BROWSER_AGENT) { + _S, 'background:', _2, $GLOBALS['cfg']['TabBGC']; + if ('SAFARI' == PMA_USR_BROWSER_AGENT) { + echo + _M, '-webkit-border-radius-topleft:', _1, '5px', +/** +iPhone: + Mibbit (Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/4A93 Safari/419.3) +**/ + _M, '-webkit-border-radius-topright:', _1, '5px'; + } elseif ('MOZILLA' == PMA_USR_BROWSER_AGENT) { // FF,SeaMonkey.. echo - _M, '-moz-border-radius-topleft:', _T, '.5em', - _M, '-moz-border-radius-topright:', _T, '.5em'; + _M, '-moz-border-radius-topleft:', _1, '5px', + _M, '-moz-border-radius-topright:', _1, '5px'; } else { echo - _M, 'border-top:', _D, '1px solid ', _T, $GLOBALS['cfg']['TabBorderColor'], - _M, 'border-left:', _D, '1px solid ', _T, $GLOBALS['cfg']['TabBorderColor'], - _M, 'border-right:', _D, '1px solid ', _T, $GLOBALS['cfg']['TabBorderColor']; + _M, 'border-top:', _3, '1px solid ', _2, $GLOBALS['cfg']['TabBorderColor'], + _M, 'border-left:', _3, '1px solid ', _2, $GLOBALS['cfg']['TabBorderColor'], + _M, 'border-right:', _3, '1px solid ', _2, $GLOBALS['cfg']['TabBorderColor']; } - // MSIE 6: http:', _T, '//blogs.msdn.com/ie/archive/2005/06/23/431980.aspx + // MSIE 6: http://blogs.msdn.com/ie/archive/2005/06/23/431980.aspx echo _E, @@ -839,19 +878,19 @@ if ($GLOBALS['cfg']['LightTabs']) { 'a.tabcaution:hover', _K, '.tabactive', _K, '.tabactive:hover', - _S, 'margin:', _D, ('MOZILLA' == PMA_USR_BROWSER_AGENT) ? 0 : '0 1px' , - _M, 'padding:', _T, '.2em .4em', - _M, 'text-decoration:', _T, 'none', + _S, 'margin:', _3, ('MOZILLA' == PMA_USR_BROWSER_AGENT) ? 0 : '0 1px' , + _M, 'padding:', _2, '2px 4px', + _M, 'text-decoration:', _1, 'none', _E, 'a.tab:hover', - _S, 'background:', _T, $GLOBALS['cfg']['TabHoverBGC'], - _M, 'color:', _D, $GLOBALS['cfg']['TabHoverColor'], + _S, 'background:', _2, $GLOBALS['cfg']['TabHoverBGC'], + _M, 'color:', _3, $GLOBALS['cfg']['TabHoverColor'], _E, 'a.tabactive', - _S, 'background:', _T, $GLOBALS['cfg']['TabActiveBGC'], - _M, 'color:', _D, $GLOBALS['cfg']['TabActiveColor'], + _S, 'background:', _2, $GLOBALS['cfg']['TabActiveBGC'], + _M, 'color:', _3, $GLOBALS['cfg']['TabActiveColor'], _E; if ('OPERA' != PMA_USR_BROWSER_AGENT ) { @@ -859,158 +898,160 @@ if ($GLOBALS['cfg']['LightTabs']) { 'span.tab', _K, 'a.warning', _K, 'span.tabcaution', - _S, 'cursor:', _T, 'url("', _imgPath, 'error.ico"), auto', + _S, 'cursor:', _3, 'url("', _imgPath, 'error.ico"), auto', _E; } } // end topmenu echo 'table.calendar', -_S, 'width:', _D, '100%', +_S, 'width:', _3, '100%', _E, 'table.calendar td', -_S, 'text-align:', _T, 'center', +_S, 'text-align:', _2, 'center', _E, 'table.calendar td a', -_S, 'display:', _T, 'block', +_S, 'display:', _2, 'block', _E, 'table.calendar td a:hover', -_S, 'background:', _T, '#cfc', +_S, 'background:', _2, '#cfc', _E, 'table.calendar th', -_S, 'background:', _T, '#D3DCE3', +_S, 'background:', _2, '#D3DCE3', _E, 'table.calendar td.selected', -_S, 'background:', _T, '#fc9', +_S, 'background:', _2, '#fc9', _E, 'img.calendar', -_S, 'border:', _D, 'none', +_S, 'border:', _3, 'none', _E, 'form.clock', -_S, 'text-align:', _T, 'center', +_S, 'text-align:', _2, 'center', _E, 'div#tablestatistics', -_S, 'border-bottom:', _T, '1px solid #699', -_M, 'margin-bottom:', _T, '.5em', -_M, 'padding-bottom:', _T, '.5em', +_S, 'border-bottom:', _2, '1px solid #699', +_M, 'margin-bottom:', _2, '5px', +_M, 'padding-bottom:', _2, '5px', _E, 'div#tablestatistics table', -_S, 'margin-bottom:', _T, '.5em', -_M, "margin-$right:", _T, '.5em', +_S, 'margin-bottom:', _2, '5px', +_M, 'margin-', $right, ':', _2, '5px', _E, 'div#tablestatistics table caption', -_S, "margin-$right:", _T, '.5em', +_S, 'margin-', $right, ':', _2, '5px', _E, //END server privileges -'#tableuserrights td,#tablespecificuserrights td,#tabledatabases td', -_S, 'vertical-align:', _T, 'middle', +'#tableuserrights td', _K, +'#tablespecificuserrights td', _K, +'#tabledatabases td', +_S, 'vertical-align:', _2, 'middle', _E, // Heading '#serverinfo', -_S, 'font-weight:', _T, 'bold', -_M, 'margin-bottom:', _T, '.5em', +_S, 'font-weight:', _2, 'bold', +_M, 'margin-bottom:', _2, '5px', _E, '#serverinfo .item', -_S, 'white-space:', _T, 'nowrap', +_S, 'white-space:', _2, 'nowrap', _E, '#span_table_comment', -_S, 'font-weight:', _T, 'normal', -_M, 'font-style:', _T, 'italic', -_M, 'white-space:', _T, 'nowrap', +_S, 'font-weight:', _2, 'normal', +_M, 'font-style:', _2, 'italic', +_M, 'white-space:', _2, 'nowrap', _E, '#serverinfo img', -_S, 'margin:', _D, '0 1px 0 .2em', +_S, 'margin:', _3, '0 1px 0 2px', _E, '#textSQLDUMP', -_S, 'width:', _D, '95%', -_M, 'height:', _T, '95%', -_M, 'font-family:', _T, '"Courier New", Courier, mono', -_M, 'font-size:', _T, '110%', +_S, 'width:', _3, '95%', +_M, 'height:', _3, '95%', +_M, 'font-family:', _2, '"Courier New", Courier, mono', +_M, 'font-size:', _2, '110%', _E, '#TooltipContainer', -_S, 'position:', _T, 'absolute', -_M, 'z-index:', _T, '99', -_M, 'width:', _D, '20em', -_M, 'height:', _T, 'auto', -_M, 'overflow:', _T, 'visible', -_M, 'visibility:', _T, 'hidden', -_M, 'background:', _T, '#ffc', -_M, 'color:', _D, '#060', -_M, 'border:', _D, '1px solid #000', -_M, 'padding:', _T, '.5em', +_S, 'position:', _2, 'absolute', +_M, 'z-index:', _2, '99', +_M, 'width:', _3, '20em', +_M, 'height:', _3, 'auto', +_M, 'overflow:', _2, 'visible', +_M, 'visibility:', _2, 'hidden', +_M, 'background:', _2, '#ffc', +_M, 'color:', _3, '#060', +_M, 'border:', _3, '1px solid #000', +_M, 'padding:', _2, '5px', _E, // user privileges '#fieldset_add_user_login div.item', -_S, 'border-bottom:', _T, '1px solid ', _silver, -_M, 'padding-bottom:', _T, '.3em', -_M, 'margin-bottom:', _T, '.3em', +_S, 'border-bottom:', _2, '1px solid ', _silver, +_M, 'padding-bottom:', _2, '3px', +_M, 'margin-bottom:', _2, '3px', _E, '#fieldset_add_user_login label', -_S, 'display:', _T, 'block', -_M, 'width:', _D, '10em', -_M, 'max-width:', _T, '100%', -_M, 'text-align:', _T, $right, -_M, "padding-$right:", _T, '.5em', +_S, 'display:', _2, 'block', +_M, 'width:', _3, '10em', +_M, 'max-width:', _2, '100%', +_M, 'text-align:', _2, $right, +_M, 'padding-', $right, ':', _2, '5px', _E, '#fieldset_add_user_login span.options #select_pred_username', _K, '#fieldset_add_user_login span.options #select_pred_hostname', _K, '#fieldset_add_user_login span.options #select_pred_password', -_S, 'width:', _D, '100%', -_M, 'max-width:', _T, '100%', +_S, 'width:', _3, '100%', +_M, 'max-width:', _2, '100%', _E, '#fieldset_add_user_login span.options', -_S, 'display:', _T, 'block', -_M, 'width:', _D, '12em', -_M, 'max-width:', _T, '100%', -_M, "padding-$right:", _T, '.5em', +_S, 'display:', _2, 'block', +_M, 'width:', _3, '12em', +_M, 'max-width:', _2, '100%', +_M, 'padding-', $right, ':', _2, '5px', _E, '#fieldset_add_user_login input', -_S, 'width:', _D, '12em', -_M, 'clear:', _T, $right, -_M, 'max-width:', _T, '100%', +_S, 'width:', _3, '12em', +_M, 'clear:', _2, $right, +_M, 'max-width:', _2, '100%', _E, '#fieldset_add_user_login span.options input', -_S, 'width:', _D, 'auto', +_S, 'width:', _3, 'auto', _E, '#fieldset_user_priv div.item', -_S, 'width:', _D, '9em', -_M, 'max-width:', _T, '100%', +_S, 'width:', _3, '9em', +_M, 'max-width:', _2, '100%', _E, '#fieldset_user_priv div.item div.item', -_S, 'float:', _D, 'none', +_S, 'float:', _3, 'none', _E, '#fieldset_user_priv div.item label', -_S, 'white-space:', _T, 'nowrap', +_S, 'white-space:', _2, 'nowrap', _E, '#fieldset_user_priv div.item select', -_S, 'width:', _D, '100%', +_S, 'width:', _3, '100%', _E, // END user privileges @@ -1018,115 +1059,105 @@ _E, // serverstatus 'div#serverstatus table caption a.top', -_S, 'float:', _D, $right, +_S, 'float:', _3, $right, _E, '#serverstatussection', _K, '.clearfloat', -_S, 'clear:', _T, 'both', +_S, 'clear:', _3, 'both', _E, 'div#serverstatussection table', -_S, 'width:', _D, '100%', -_M, 'margin-bottom:', _T, '1em', +_S, 'width:', _3, '100%', +_M, 'margin-bottom:', _2, '1em', _E, 'div#serverstatussection table .name', -_S, 'width:', _D, '18em', +_S, 'width:', _3, '18em', _E, 'div#serverstatussection table .value', -_S, 'width:', _D, '6em', +_S, 'width:', _3, '6em', _E, 'div#serverstatus table tbody td.descr a', _K, 'div#serverstatus table .tblFooters a', -_S, 'white-space:', _T, 'nowrap', +_S, 'white-space:', _2, 'nowrap', _E, 'div#serverstatus div#statuslinks a:before', _K, 'div#serverstatus div#sectionlinks a:before', _K, 'div#serverstatus table tbody td.descr a:before', _K, 'div#serverstatus table .tblFooters a:before', -_S, 'content:', _T , "'['", +_S, 'content:', _2, "'['", _E, 'div#serverstatus div#statuslinks a:after', _K, 'div#serverstatus div#sectionlinks a:after', _K, 'div#serverstatus table tbody td.descr a:after', _K, 'div#serverstatus table .tblFooters a:after', -_S, 'content:', _T, "']'", +_S, 'content:', _2, "']'", _E, // end serverstatus -// querywindow -image:', _T, 'none', -//??-color:', _T - 'body#bodyquerywindow', -_S, 'margin:', _D, 0, -_M, 'padding:', _T, 0, -_M, 'background:', _T, $GLOBALS['cfg']['MainBGC'], +_S, 'background:', _2, $GLOBALS['cfg']['MainBGC'], _E, 'div#querywindowcontainer', -_S, 'margin:', _D, 0, -_M, 'padding:', _T, 0, -_M, 'width:', _D, '100%', +_S, 'width:', _3, '100%', _E, 'div#querywindowcontainer fieldset', -_S, 'margin-top:', _T, 0, +_S, 'margin-top:', _2, 0, _E, //END querywindow // querybox 'div#sqlquerycontainer', -_S, 'width:', _D, '69%', -// 'height:', _T, '15em',_M, +_S, 'width:', _3, '69%', _E, 'div#tablefieldscontainer', -_S, 'float:', _D, $right, -_M, 'width:', _D, '29%', +_S, 'float:', _3, $right, +_M, 'width:', _3, '29%', _E, 'div#tablefieldscontainer select', -_S, 'width:', _D, '100%', +_S, 'width:', _3, '100%', _E, -// height:', _T, '12em', 'textarea#sqlquery', -_S, 'width:', _D, '100%', +_S, 'width:', _3, '100%', _E, -// height:', _T, '100%', 'div#queryboxcontainer div#bookmarkoptions', -_S, 'margin-top:', _T, '.5em', +_S, 'margin-top:', _2, '2px', _E, // end querybox + // main page '#maincontainer', -_S, 'background-image:', _T, 'url("', _imgPath, 'logo_right.png")', -_M, 'background-position:', _T, $right, ' bottom', -_M, 'background-repeat:', _T, 'no-repeat', -//_M, 'border-bottom:', _T, '1px solid ', _silver, +_S, 'background-image:', _1, 'url("', _imgPath, 'logo_right.png")', +_M, 'background-position:', _1, $right, ' bottom', +_M, 'background-repeat:', _1, 'no-repeat', _E, '#mysqlmaininformation', _K, '#pmamaininformation', -_S, 'width:', _D, '49%', +_S, 'width:', _3, '49%', _E, '#maincontainer ul', -_S, 'list-style-image:', _T, 'url("', _imgPath, 'item_', $GLOBALS['text_dir'], '.png")', -_M, 'vertical-align:', _T, 'middle', +_S, 'list-style-image:', _1, 'url("', _imgPath, 'item_', $GLOBALS['text_dir'], '.png")', +_M, 'vertical-align:', _2, 'middle', _E, '#maincontainer li', -_S, 'margin-bottom:', _T, '.3em', -_M, 'padding:', _T, '0 .3em 0 .3em', +_S, 'margin:', _2, '3px 22px', +_M, 'padding:', _2, '0 3px', _E; // END main page @@ -1231,49 +1262,48 @@ if ($GLOBALS['cfg']['MainPageIconic']) { echo '#body_browse_foreigners', -_S, 'background:', _T, $GLOBALS['cfg']['MainBGC'], //2do?? -_M, 'margin:', _D, '.5em .5em 0 .5em', +_S, 'background:', _2, $GLOBALS['cfg']['MainBGC'], //2do?? +_M, 'margin:', _3, '5px 5px 0 5px', _E, '#bodyquerywindow', -_S, 'background:', _T, $GLOBALS['cfg']['MainBGC'], //2do?? +_S, 'background:', _2, $GLOBALS['cfg']['MainBGC'], //2do?? _E, '#bodythemes', -_S, 'width:', _D, '50em', -_M, 'margin:', _D, 'auto', -_M, 'text-align:', _T, 'center', +_S, 'width:', _3, '50em', +_M, 'margin:', _3, 'auto', +_M, 'text-align:', _2, 'center', _E, '#bodythemes img', -_S, 'border:', _D, '1px solid #000', +_S, 'border:', _3, '1px solid #000', _E, '#bodythemes a:hover img', -_S, 'border:', _D, '1px solid ', _red, +_S, 'border:', _3, '1px solid ', _red, _E, '#selflink', -_S, 'clear:', _T, 'both', //No floating elements allowed on either side -_M, 'margin:', _T, '.2em', -_M, 'padding:', _T, '.2em', -_M, 'background:', _T, $GLOBALS['cfg']['FieldsetFooterBGC'], -_M, 'text-align:', _T, $right, +_S, 'clear:', _3, 'both', //No floating elements allowed on either side +_M, 'margin:', _3, '2px', +_M, 'padding:', _2, '2px', +_M, 'background:', _2, $GLOBALS['cfg']['FieldsetFooterBGC'], +_M, 'text-align:', _2, $right, _E, +'#div_table_options', +_S, 'clear:', _3, '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, '#div_table_copy', -_S, 'min-width:', _T, '48%', +_S, 'min-width:', _2, '48%', _E, -'#div_referential_integrity', _K, -'#div_table_maintenance', _K, '#div_partition_maintenance', _K, '#div_table_options', _K, '#div_table_order', _K, @@ -1292,22 +1322,74 @@ _E, 'div#serverstatus table#serverstatusconnections', _K, 'div#sqlquerycontainer', _K, '#mysqlmaininformation', _K, -'#pmamaininformation', _K, +'#pmamaininformation', _K, '#fieldset_select_fields', _K, '#div_table_options', _K, -'#table_innodb_bufferpool_usage', _K, +'#table_innodb_bufferpool_usage', _K, //table_innodb_bufferpool_activity', _K, '#div_mysql_charset_collations table', _K, '#qbe_div_table_list', _K, '#qbe_div_sql_query', _K, 'label.desc', -_S, 'float:', _D, $left, -_E, - -'#div_table_options', -_S, 'clear:', _T, 'both', +_S, 'float:', _3, $left, _E, 'label.desc', -_S, 'width:', _D, '30em', +_S, 'width:', _3, '30em', +_E, + +'#querywindowcontainer', +_S, 'background:', _2, $GLOBALS['cfg']['queryWindowContainerBGC'], _E; -?> \ No newline at end of file + +if (version_compare(PMA_VERSION, '3.0', 'ge')) { + echo 'code.sql', + _S, 'font-size:', _2, '110%', + _M, 'display:', _2, 'block', + _M, 'padding:', _2, '3px', + _M, 'border:', _3, '1px solid ', $GLOBALS['cfg']['BorderColor'], + _M, 'border-top:', _2, 0, + _M, 'border-bottom:', _2, 0, + _M, 'max-height:', _2, '10em', + _M, 'overflow:', _2, 'auto', + _M, 'background:', _2, $GLOBALS['cfg']['BgOne'], + _E, + + '#main_pane_left', + _S, 'width:', _3, '60%', + _M, 'float:', _3, 'left', + _M, 'padding-top:', _2, '6px', + _E, + + '#main_pane_right', + _S, 'margin-left:', _2, '60%', + _M, 'padding-top:', _2, '6px', + _M, 'padding-left:', _2, '6px', + _E, + + '.group', + _S, 'border:', _3, '1px solid ', $GLOBALS['cfg']['BorderColor'], //#999 + _M, 'margin-bottom:', _2, '6px', + _M, 'background:', _2, $GLOBALS['cfg']['MainGroup'], //'#f6f6f6', + _E, + + '.group h2', + _S, 'background:', _2, $GLOBALS['cfg']['MainGroupHeader'], //#ddd + _M, 'padding:', _2, '2px 4px', + _M, 'margin:', _3, '0', + _E, + + '.group ul', + _S, 'padding:', _2, '.5em', + _E; + +/** + if (! $GLOBALS['cfg']['LeftDisplayServers']) { + echo + '#li_select_server', + _S, 'padding-bottom:', _2, '6px', //no effect! + _M, 'border-bottom:', _2, '2px solid ', $GLOBALS['cfg']['MainGroupHeader'], //#ddd + _M, 'margin-bottom:', _2, '4px', + _E; + } +**/ +} // end pma3 diff --git a/grid/info.inc.php b/grid/info.inc.php index dc4544dbf..0a3c6ec57 100644 --- a/grid/info.inc.php +++ b/grid/info.inc.php @@ -1,9 +1,10 @@ SQL history +$GLOBALS['cfg']['queryWindowContainerBGC'] = '#e7e7e7'; + // NOTE: notice and warning colors are defined in theme_right.css.php /**