2.11d
This commit is contained in:
Marc Delisle
@@ -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+ : <span class="navi_dbName">
|
||||
'.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;
|
||||
?>
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user