nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2.11d

Browse Source
This commit is contained in:
Marc Delisle
2008-08-14 16:35:30 +00:00
parent fc9ad41326
commit af06ad621d
4 changed files with 629 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

188
grid/css/theme_left.css.php
View File

@@ -8,9 +8,9 @@
* @subpackage Grid * @subpackage Grid
*/ */
define('_NaviGridVersion', 'navi Grid-2.11 2007-11-22'); define('_NaviGridVersion', 'Grid 08080815 NAVI (pma 2.8+)');
// css for navigation.php (former left.php)
// css for navigation.php (former left.php)
if (!defined('PMA_MINIMUM_COMMON')) { if (!defined('PMA_MINIMUM_COMMON')) {
die('/* ' . _NaviGridVersion . ' illegal execution path */'); die('/* ' . _NaviGridVersion . ' illegal execution path */');
} }
@@ -40,88 +40,113 @@ if (empty($GLOBALS['cfg']['NiceCss'])) {
define('_M', ';'); //mid define('_M', ';'); //mid
define('_E', '}' . _NL); //end define('_E', '}' . _NL); //end
define('_K', ','); define('_K', ',');
define('_T', ''); define('_1', '');
define('_D', ''); define('_2', '');
define('_3', '');
} else { } else {
define('_S', ' {' . _NL . "\t"); define('_S', ' {' . _NL . "\t");
define('_M', ';' . _NL . "\t"); define('_M', ';' . _NL . "\t");
define('_E', ';' . _NL . '}' . _NL . _NL ); define('_E', ';' . _NL . '}' . _NL . _NL );
define('_K', ',' . _NL ); define('_K', ',' . _NL );
define('_T', "\t"); define('_1', "\t");
define('_D', "\t\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 echo
'html', '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; _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; 'body', _S;
if (!empty($GLOBALS['cfg']['FontFamily'])) { if (!empty($GLOBALS['cfg']['FontFamily'])) {
echo 'font-family:', _T, $GLOBALS['cfg']['FontFamily'], echo 'font-family:', _2, $GLOBALS['cfg']['FontFamily'],
_M; _M;
} }
echo echo
'background:', _T, $GLOBALS['cfg']['NaviBGC'], 'background:', _2, $GLOBALS['cfg']['NaviBGC'],
_M, 'color:', _D, $GLOBALS['cfg']['NaviColor'], _M, 'color:', _3, $GLOBALS['cfg']['NaviColor'],
_M, 'padding:', _T, 0,
_E, _E,
'hr', 'hr',
_S, 'border:', _D, 0, _S, 'border:', _3, 0,
_M, 'color:', _D, $GLOBALS['cfg']['NaviColor'], _M, 'color:', _3, $GLOBALS['cfg']['NaviColor'],
_M, 'background:', _T, $GLOBALS['cfg']['NaviColor'], _M, 'background:', _2, $GLOBALS['cfg']['NaviColor'],
_M, 'height:', _D, '1px', //mimic border 1px solid _M, 'height:', _3, '1px', //mimic border 1px solid
_M, 'margin-top:', _T, '.5em', _M, 'margin-top:', _2, '.5em',
_E, _E,
// Links: // Links:
'a', 'a',
_S, 'text-decoration:', _T, 'none', _S, 'text-decoration:', _1, 'none',
_M, 'padding:', _T, '0 2px 1px 2px', //top l? bot r? _M, 'padding:', _2, '0 2px 1px 2px', //top l? bot r?
_M, 'color:', _D, $GLOBALS['cfg']['NaviLinkColor'], _M, 'color:', _3, $GLOBALS['cfg']['NaviLinkColor'],
_E, _E,
'a:hover', 'a:hover',
_S, 'text-decoration:', _T, 'underline'; _S, 'text-decoration:', _1, 'underline';
if ($GLOBALS['cfg']['LeftPointerEnable']) { if ($GLOBALS['cfg']['LeftPointerEnable']) {
echo echo
_M, 'background:', _T, $GLOBALS['cfg']['NaviPointerBGC'], _M, 'background:', _2, $GLOBALS['cfg']['NaviPointerBGC'],
_M, 'color:', _D, $GLOBALS['cfg']['NaviPointerColor']; //doesn'work on dbname _M, 'color:', _3, $GLOBALS['cfg']['NaviPointerColor']; //doesn'work on dbname
} }
echo echo
_E, _E,
'a:active', 'a:active',
_S, 'background:', _T, $GLOBALS['cfg']['NaviActiveBGC'], _S, 'background:', _2, $GLOBALS['cfg']['NaviActiveBGC'],
_E, _E,
'a:focus', 'a:focus',
_S, 'text-decoration:', _T, 'none', _S, 'text-decoration:', _1, 'none',
_E, _E,
'a img', 'a img',
_S, 'border:', _D, 0, //avoid thick link border _S, 'border:', _3, 0, //avoid thick link border
_E, _E,
// end Links // end Links
'form', 'form',
_S, 'display:', _T, 'inline', _S, 'display:', _2, 'inline',
_E, _E,
'select', 'select',
_S, 'margin-top:', _T, '.2em', _S, 'margin-top:', _2, '2px',
_E; _E;
echo version_compare(PMA_VERSION, '2.11', 'lt') echo version_compare(PMA_VERSION, '2.11', 'lt')
@@ -129,21 +154,24 @@ echo version_compare(PMA_VERSION, '2.11', 'lt')
'select' 'select'
: :
'#navidbpageselector' . // here only concat! '#navidbpageselector' . // here only concat!
_S . "padding-$left:" . _T . '.2em' . _S . 'padding-', $left, ':' . _2 . '2px' .
_M . 'text-align:' . _T . 'center' . _M . 'text-align:' . _2 . 'center' .
_E . _E .
'select#select_server' . _K . 'select#select_server' . _K .
'select#lightm_db'; 'select#lightm_db';
echo echo
_S, 'width:', _D, '100%', _S, 'width:', _3, '100%',
_E, _E,
'option', // for db paging
_S, 'padding-', $left, ':', _2, '5px',
_E,
// buttons in some browsers (e.g., Konqueror) are block elements, this breaks design: // buttons in some browsers (e.g., Konqueror) are block elements, this breaks design:
'button', 'button',
_S, 'display:', _T, 'inline', _S, 'display:', _2, 'inline',
_E, _E,
@@ -151,63 +179,57 @@ _E,
'ul#databaseList', _K, 'ul#databaseList', _K,
'#databaseList ul', '#databaseList ul',
_S, 'list-style-type:', _T, 'none', // Gecko _S, 'list-style-type:', _1, 'none', // Gecko
_M, 'padding:', _T, 0,
_E; _E;
if (!$GLOBALS['cfg']['LeftMarkerEnable']) { if (!$GLOBALS['cfg']['LeftMarkerEnable']) {
echo echo
'ul#databaseList li.selected a', 'ul#databaseList li.selected a',
_S, 'background:', _T, $GLOBALS['cfg']['NaviMarkedBGC'], _S, 'background:', _2, $GLOBALS['cfg']['NaviMarkedBGC'],
_M, 'color:', _D, $GLOBALS['cfg']['NaviMarkedColor'], _M, 'color:', _3, $GLOBALS['cfg']['NaviMarkedColor'],
_E; _E;
} }
echo echo
'#databaseList li', '#databaseList li',
_S, "padding-$left:", _T, '.4em', _S, 'padding-', $left, ':', _2, '4px',
_M, 'background:', _T, $GLOBALS['cfg']['NaviDblBGC'], _M, 'background:', _2, $GLOBALS['cfg']['NaviDblBGC'],
_E, _E,
// 2.11+ : <span class="navi_dbName"> // 2.11+ : <span class="navi_dbName">
'.navi_dbName', '.navi_dbName',
_S, 'font-weight:', _T, 'bold'; _S, 'font-weight:', _2, 'bold';
if (!empty($GLOBALS['cfg']['NaviDbNameColor'])) { if (!empty($GLOBALS['cfg']['NaviDbNameColor'])) {
echo _M, 'color:', _D, $GLOBALS['cfg']['NaviDbNameColor']; echo _M, 'color:', _3, $GLOBALS['cfg']['NaviDbNameColor'];
} }
if (!empty($GLOBALS['cfg']['NaviDbNameBGC'])) { if (!empty($GLOBALS['cfg']['NaviDbNameBGC'])) {
echo _M, 'background:', _T, $GLOBALS['cfg']['NaviDbNameBGC']; echo _M, 'background:', _2, $GLOBALS['cfg']['NaviDbNameBGC'];
} }
echo echo
_E, _E,
'.navi_dbName:hover', '.navi_dbName:hover',
_S, 'text-decoration:', _T, 'underline', _S, 'text-decoration:', _1, 'underline',
_E, _E,
// specific elements // specific elements
'#pmalogo', _K, '#pmalogo', _K,
'#leftframelinks', '#leftframelinks',
_S, 'text-align:', _T, 'center', _S, 'text-align:', _2, 'center',
_E, _E,
'#pmalogo', '#pmalogo',
_S, 'background-color:', _T, $GLOBALS['cfg']['NaviLogoBGC'], _S, 'background-color:', _1, $GLOBALS['cfg']['NaviLogoBGC'],
//_S, 'background:', _T, 'transparent', //???
_M, 'padding:', _T, 0,
_E, _E,
'#leftframelinks', _K, '#leftframelinks', _K,
'#navidbpageselector', '#navidbpageselector',
_S, 'padding:', _T, 0, _S, 'padding-bottom:', _2, '3px',
_M, 'padding-bottom:', _T, '.3em',
//_M, 'background:', _T, $GLOBALS['cfg']['Navi2ndBGC'],
_E, _E,
'#leftframelinks', '#leftframelinks',
_S, 'padding-top:', _T, '.3em', _S, 'padding-top:', _2, '3px',
_E; _E;
@@ -216,14 +238,14 @@ _E;
if ($GLOBALS['cfg']['LeftDisplayServers']) { if ($GLOBALS['cfg']['LeftDisplayServers']) {
echo echo
'#serverinfo', '#serverinfo',
_S, 'margin:', _D, '.2em', _S, 'margin:', _3, '2px',
_E; _E;
if ($GLOBALS['cfg']['DisplayServersList']) { if ($GLOBALS['cfg']['DisplayServersList']) {
echo echo
'#list_server', '#list_server',
_S, 'list-style-type:', _T, 'decimal', _S, 'list-style-type:', _1, 'decimal',
_M, "padding-$left:", _T, '1.8em', // .2 if "inside" _M, 'padding-', $left, ':', _2, '1.8em', // .2 if "inside"
_E; _E;
} }
} }
@@ -231,27 +253,23 @@ if ($GLOBALS['cfg']['LeftDisplayServers']) {
echo echo
'.icon a', _K, '.icon a', _K,
'div#databaseList', 'div#databaseList',
_S, 'padding:', _T, '3px', _S, 'padding:', _2, '3px',
_E, _E,
// left_tableList // left_tableList
'#left_tableList', '#left_tableList',
_S, 'margin:', _T, '0 .2em', _S, 'margin:', _3, '0 2px',
_M, 'padding:', _T, '0 .2em', _M, 'padding:', _2, '0 2px',
_M, 'background:', _T, $GLOBALS['cfg']['Navi2ndBGC'], _M, 'background:', _2, $GLOBALS['cfg']['Navi2ndBGC'],
_E, _E,
'#left_tableList li', '#left_tableList li',
_S, 'white-space:', _T, 'nowrap', _S, 'padding-bottom:', _2, '1px', //for "__" spacing
_M, 'padding-bottom:', _T, '.1em'; //for "__" spacing _M, 'white-space:', _2, 'nowrap';
if ('IE' == PMA_USR_BROWSER_AGENT) {
if ('IE' != PMA_USR_BROWSER_AGENT) {
echo echo
_M, 'margin:', _T, 0, //'1px 0 0 0', _M, 'margin:', _3, '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';
} }
echo echo
_E; _E;
@@ -264,8 +282,8 @@ if ($GLOBALS['cfg']['LeftMarkerEnable']) { // orig:NaviMarkedColor???
} }
echo echo
'#left_tableList > ul li.marked', '#left_tableList > ul li.marked',
_S, 'background:', _T, $GLOBALS['cfg']['NaviMarkedBGC'], _S, 'background:', _2, $GLOBALS['cfg']['NaviMarkedBGC'],
_M, 'color:', _D, $GLOBALS['cfg']['NaviMarkedColor'], _M, 'color:', _3, $GLOBALS['cfg']['NaviMarkedColor'],
_E; _E;
} }
@@ -273,20 +291,18 @@ echo
'#imgpmalogo', _K, '#imgpmalogo', _K,
'.icon', _K, '.icon', _K,
'#left_tableList img', '#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, _E,
'#left_tableList ul', '#left_tableList ul',
_S, 'list-style-type:', _T, 'none', _S, 'list-style-type:', _1, 'none',
_M, 'padding:', _T, 0 , _M, 'background:', _2, $GLOBALS['cfg']['Navi2ndBGC'], //for marking selected db&table only
_M, 'background:', _T, $GLOBALS['cfg']['Navi2ndBGC'], //for marking selected db&table only
_E, _E,
'#left_tableList ul ul', '#left_tableList ul ul',
_S, 'padding:', _T, 0, _S, 'padding-', $left, ':', _2, '2px',
_M, "padding-$left:", _T, '.2em', _M, 'border-', $left, ':', _2, '1px solid ', $GLOBALS['cfg']['NaviColor'],
_M, "border-$left:", _T, '1px solid ', $GLOBALS['cfg']['NaviColor'], _M, 'border-bottom:', _2, '1px solid ', $GLOBALS['cfg']['NaviColor'],
_M, 'border-bottom:', _T, '1px solid ', $GLOBALS['cfg']['NaviColor'], _M, 'background:', _2, $GLOBALS['cfg']['NaviTblBGC'],
_M, 'background:', _T, $GLOBALS['cfg']['NaviTblBGC'],
_E; _E;
?>

932
grid/css/theme_right.css.php
View File

File diff suppressed because it is too large Load Diff

5
grid/info.inc.php
View File

@@ -1,9 +1,10 @@
<?php <?php
/* vim: set expandtab sw=4 ts=4 sts=4: */ /* vim: set expandtab sw=4 ts=4 sts=4: */
/* info.inc.php 2007-11-22 windkiel */ /* info.inc.php 08080815 windkiel */
/** /**
* 2007-11-22: #div_referential_integrity new in pma 3.0 * 2008-08-08: (pma3.0.0alpha) main page changed
* 2008-01-17: (pma3) html font-size moved from phpmyadmin.css.php
* 2007-10-12: minor changes th{}, a:hover{'underline'}, 'none' else * 2007-10-12: minor changes th{}, a:hover{'underline'}, 'none' else
* 2007-10-10: pma 3.0 main frame: new success.png * 2007-10-10: pma 3.0 main frame: new success.png
* bugfixes, non Gecko tab appearance, mult_submit hover=pointer and BGC=white * bugfixes, non Gecko tab appearance, mult_submit hover=pointer and BGC=white

24
grid/layout.inc.php
View File

@@ -11,7 +11,7 @@
* take the 'originalColors' section as an example. * take the 'originalColors' section as an example.
* to use "Grid" on startup use this in your config.inc.php: * to use "Grid" on startup use this in your config.inc.php:
* if (is_dir($GLOBALS['cfg']['ThemePath'] . '/grid-x.yy')) { * if (is_dir($GLOBALS['cfg']['ThemePath'] . '/grid-x.yy')) {
* $GLOBALS['cfg']['ThemeDefault'] = 'grid'; * $GLOBALS['cfg']['ThemeDefault'] = 'grid';
* } * }
* some bugfixes like textarea height (thx Mario Rohkr<6B>mer) ... * some bugfixes like textarea height (thx Mario Rohkr<6B>mer) ...
* *
@@ -33,6 +33,9 @@
* @subpackage Grid * @subpackage Grid
*/ */
if(!defined('PMA_VERSION')) {
die('unplanned execution path');
}
// ~~~~~~~~~~~~~ NAVIGATION frame (called "Left frame" in older versions) ~~~~~~~~~~ // ~~~~~~~~~~~~~ NAVIGATION frame (called "Left frame" in older versions) ~~~~~~~~~~
@@ -88,14 +91,17 @@ $GLOBALS['cfg']['NaviDbNameBGC'] = $GLOBALS['cfg']['NaviLightMarkedBGC'];
//$GLOBALS['cfg']['NaviDatabaseNameColor'] = '' ; // not used //$GLOBALS['cfg']['NaviDatabaseNameColor'] = '' ; // not used
// ~~~~~~~~~~~~~~~~~ MAIN frame ~~~~~~~~~~~~~~~~~~~~~~~~ // ~~~~~~~~~~~~~~~~~ MAIN frame ~~~~~~~~~~~~~~~~~~~~~~~~
$GLOBALS['cfg']['MainGroup'] = '#f6f6f6'; // new for pma 3
$GLOBALS['cfg']['MainGroupHeader'] = '#e6e6e6';
// foreground (text) color for the main frame // foreground (text) color for the main frame
$GLOBALS['cfg']['MainColor'] = '#000'; $GLOBALS['cfg']['MainColor'] = '#000';
// BackgroundColor for the main frame, different solution than in <20>original<61>! // BackgroundColor for the main frame, different solution than in <20>original<61>!
$GLOBALS['cfg']['MainBGC'] = '#d6d6d6'; //e7e7e7 same as scrollbar color; $GLOBALS['cfg']['MainBGC'] = '#dadada'; //e7e7e7 same as scrollbar color;
//at least 1 bit difference from $GLOBALS['cfg']['MainBGC'] to show the grid!(?) //at least 1 bit difference from $GLOBALS['cfg']['MainBGC'] to show the grid!(?)
$GLOBALS['cfg']['MainGridColor'] = '#d6d6d5'; $GLOBALS['cfg']['MainGridColor'] = '#dadadb';
// link color // link color
$GLOBALS['cfg']['MainLinkColor'] = '#00d'; $GLOBALS['cfg']['MainLinkColor'] = '#00d';
@@ -119,7 +125,7 @@ $GLOBALS['cfg']['BrowseMarkerColor'] = '#000';
$GLOBALS['cfg']['BrowseMarkerBGC'] = '#ffb'; // '#fc9'; $GLOBALS['cfg']['BrowseMarkerBGC'] = '#ffb'; // '#fc9';
// tab decorations // tab decorations
$GLOBALS['cfg']['TabBGC'] = '#f3f3f3';//?? $GLOBALS['cfg']['TabBGC'] = '#f0f0ff';//??
$GLOBALS['cfg']['TabHoverColor'] = '#55f'; $GLOBALS['cfg']['TabHoverColor'] = '#55f';
$GLOBALS['cfg']['TabHoverBGC'] = '#fff'; //dfd $GLOBALS['cfg']['TabHoverBGC'] = '#fff'; //dfd
@@ -130,19 +136,20 @@ $GLOBALS['cfg']['TabActiveBGC'] = '#ffb'; //afa
$GLOBALS['cfg']['TabBorderColor'] = '#bbb'; $GLOBALS['cfg']['TabBorderColor'] = '#bbb';
$GLOBALS['cfg']['TabUnderlineColor'] = '#888'; $GLOBALS['cfg']['TabUnderlineColor'] = '#888';
$GLOBALS['cfg']['SuccessBorderColor'] = '#0d0';
// top (former legend) // top (former legend)
// both IE 6&7 expand the BGC too high // both IE 6&7 expand the BGC too high
if ('IE' == PMA_USR_BROWSER_AGENT) { if ('IE' == PMA_USR_BROWSER_AGENT) {
$GLOBALS['cfg']['BorderColor'] = '#000'; $GLOBALS['cfg']['BorderColor'] = '#000';
$GLOBALS['cfg']['FieldsetBGC'] = $GLOBALS['cfg']['MainBGC']; $GLOBALS['cfg']['FieldsetBGC'] = $GLOBALS['cfg']['MainBGC'];
$GLOBALS['cfg']['LegendBorder'] = false; $GLOBALS['cfg']['LegendBorder'] = false;
$GLOBALS['cfg']['LegendColor'] = '#000'; $GLOBALS['cfg']['LegendColor'] = '#000';
$GLOBALS['cfg']['LegendBGC'] = '#f3f3f3'; $GLOBALS['cfg']['LegendBGC'] = '#f3f3f3';
} else { } else {
$GLOBALS['cfg']['BorderColor'] = '#bbb'; $GLOBALS['cfg']['BorderColor'] = '#bbb';
$GLOBALS['cfg']['FieldsetBGC'] = '#f3f3f3'; $GLOBALS['cfg']['FieldsetBGC'] = '#f3f3f3';
$GLOBALS['cfg']['LegendBorder'] = true; $GLOBALS['cfg']['LegendBorder'] = true;
$GLOBALS['cfg']['LegendColor'] = '#000'; $GLOBALS['cfg']['LegendColor'] = '#000';
$GLOBALS['cfg']['LegendBGC'] = '#f6f6f6'; $GLOBALS['cfg']['LegendBGC'] = '#f6f6f6';
} }
@@ -150,6 +157,9 @@ $GLOBALS['cfg']['FieldsetFooterBGC'] = '#e7e7e7';
$GLOBALS['cfg']['BacktickBGC'] = '#eea'; $GLOBALS['cfg']['BacktickBGC'] = '#eea';
// better readability in popup -> SQL history
$GLOBALS['cfg']['queryWindowContainerBGC'] = '#e7e7e7';
// NOTE: notice and warning colors are defined in theme_right.css.php // NOTE: notice and warning colors are defined in theme_right.css.php
/** /**