3.0 upgrade, thanks to Tim Golen

This commit is contained in:
Marc Delisle
2008-10-25 15:00:37 +00:00
parent e79e05390e
commit ac6cb063eb
12 changed files with 1364 additions and 560 deletions

View File

@@ -1,11 +1,11 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* navigation css file from theme
* navigation css file
*
* @version $Id$
* @package phpMyAdmin-theme
* @subpackage Hillside
* @subpackage hillside
*/
// unplanned execution path
@@ -13,148 +13,214 @@ if (!defined('PMA_MINIMUM_COMMON')) {
exit();
}
?>
/******************************************************************************/
/* general tags */
html {
height:100%;
border-right:1px solid #AAA;
}
html,body{padding-top:0;margin:0;}
body, input, select {
font-family: Tahoma, Arial, Helvetica, Verdana, sans-serif;
font-size: 11px;
color: #333333;
font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
}
body#body_leftFrame {
color: #000000;
height:100%;
overflow:auto;
input, select, textarea {
font-size: 1em;
}
body {
background: <?php echo $GLOBALS['cfg']['LeftBgColor']; ?> url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>island_light.png) top left repeat-x;
background-color: #65a603;
background-attachment: fixed;
<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
<?php } ?>
background: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin: 0;
padding: 0.2em 0.2em 0.2em 0.2em;
}
select {
background-color: #ffffff;
color: #000000;
a img {
border: 0;
}
a:link,
a:visited,
a:active {
text-decoration: none;
color: #0000FF;
}
ul {
margin:0;
}
form {
margin: 0;
padding: 0;
display: inline;
}
select#select_server,
select#lightm_db {
width: 100%;
}
/* buttons in some browsers (eg. Konqueror) are block elements,
this breaks design */
button {
display: inline;
}
/******************************************************************************/
/* classes */
/* leave some space between icons and text */
.icon {
vertical-align: middle;
margin-right: 0.3em;
margin-left: 0.3em;
}
.navi_dbName {
font-weight: bold;
color: <?php echo $GLOBALS['cfg']['NaviDatabaseNameColor']; ?>;
}
/******************************************************************************/
/* specific elements */
#body_leftFrame {
background-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/hillside/img/island_light.png);
}
div#pmalogo {
<?php //better echo $GLOBALS['cfg']['logoBGC']; ?>
padding:.3em;
}
div#pmalogo,
div#leftframelinks,
div#databaseList {
text-align: center;
border-bottom: 0.05em solid #FFF;
margin-bottom: 0.5em;
padding-bottom: 0.5em;
color: #000000;
}
div#pmalogo{
background:#FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>logo_background.png) top left repeat-x;
padding:0;
margin:0;
border-bottom:0px;
}
div#leftframelinks img {
vertical-align: middle;
text-align: center;
margin-bottom: 0.5em;
padding-bottom: 0.5em;
}
div#leftframelinks a {
margin: 0.5em;
padding: 0.2em;
border: 0.05em solid #FFF;
color: #000000;
ul#databaseList {
margin-bottom: 0.5em;
padding-bottom: 0.5em;
padding-<?php echo $left; ?>: 1.5em;
}
ul#databaseList a {
display: block;
}
div#navidbpageselector a,
ul#databaseList a {
background-image:url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/hillside/img/transparent.png);
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
}
ul#databaseList a:hover {
background-image:url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/hillside/img/transparent60.png);
color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
}
ul#databaseList li.selected a {
background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
}
div#leftframelinks .icon {
padding: 0;
margin: 0;
}
div#leftframelinks a img.icon {
margin: 0;
padding: 0.2em;
border: 0.05em solid <?php echo $GLOBALS['cfg']['NaviBorderColor']; ?>;
}
div#leftframelinks a:hover {
background-color: transparent;
color:#FFF;
background-image:url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/hillside/img/transparent.png);
color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
}
div#databaseList form {
display: inline;
}
/* leftdatabaselist */
div#left_tableList {
/* serverlist */
#body_leftFrame #list_server {
list-style-image: url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/original/img/s_host.png);
list-style-position: inside;
list-style-type: none;
list-style-position: outside;
margin: 0;
padding: 0;
font-size: <?php echo $font_smaller; ?>;
color:#FFF;
}
div#left_tableList p a.item, form#left label{
font-weight:bold;
color:#000;
font-size:110%;
text-align:left;
#body_leftFrame #list_server li {
margin: 0;
padding: 0;
font-size: 80%;
}
div#left_tableList ul {
list-style-type: none;
list-style-position: outside;
margin: 0;
padding: 0;
font-size: 80%;
background-image:url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/hillside/img/transparent.png);
}
div#left_tableList ul ul {
font-size: 100%;
}
div#left_tableList a {
color: #FFF;
text-decoration: none;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
text-decoration: none;
}
div#left_tableList a:hover {
color: #FFF;
background-color: transparent;
text-decoration:none;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
text-decoration: underline;
}
div#left_tableList li {
margin: 0;
padding: 0;
white-space: nowrap;
line-height:1.5;
margin: 0;
padding: 0;
white-space: nowrap;
}
<?php if ( $GLOBALS['cfg']['LeftPointerEnable'] ) { ?>
div#left_tableList li:hover {
background:#FFF url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>transparent.png) top left repeat-x;
background-color: transparent;
color:#FFF;
<?php if ($GLOBALS['cfg']['BrowseMarkerColor']) { ?>
/* marked items */
div#left_tableList > ul li.marked > a,
div#left_tableList > ul li.marked {
background: <?php echo $GLOBALS['cfg']['BrowseMarkerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['BrowseMarkerColor']; ?>;
}
<?php } ?>
<?php if ($GLOBALS['cfg']['LeftPointerEnable']) { ?>
div#left_tableList > ul li:hover {
background-image:url(<?php echo $GLOBALS['cfg']['ThemePath']; ?>/hillside/img/transparent60.png);
color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
}
<?php } ?>
div#left_tableList img {
vertical-align: middle;
padding: 0;
vertical-align: middle;
}
div#left_tableList p {color:#333;padding:10px;}
div#left_tableList ul ul {
margin-left: 0em;
padding-left: 0.1em;
border-left: 0.1em solid #669999;
padding-bottom: 0.1em;
border-bottom: 0.1em solid #669999;
background-color:#FEFEFE;
margin-<?php echo $left; ?>: 0;
padding-<?php echo $left; ?>: 0.1em;
border-<?php echo $left; ?>: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
padding-bottom: 0.1em;
border-bottom: 0.1em solid <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
}
/** Thanks Vince ;) - vincekruger@gmail.com**/
ul#databaseList{
list-style:none;
/* for the servers list in navi panel */
#serverinfo .item {
white-space: nowrap;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
}
ul#databaseList li{
line-height:1.5em;
font-weight:bold;
}
ul#databaseList li a{
font-weight:normal;
text-decoration:none;
color:#333;
}
ul#databaseList li a:hover, ul#databaseList li a:active, ul#databaseList li a:focus{
font-weight:bold;
}
ul#databaseList li ul{
padding-left:10px;
margin-left:0px;
list-style:none;
padding-bottom:1em;
}
ul#databaseList li ul li a{
border-left:1px solid #333;
#serverinfo a:hover {
background: <?php echo $GLOBALS['cfg']['NaviPointerBackground']; ?>;
color: <?php echo $GLOBALS['cfg']['NaviPointerColor']; ?>;
}

View File

@@ -1,51 +1,39 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* print css file from theme
* print css file from theme Original
*
* @version $Id$
* @package phpMyAdmin-theme
* @subpackage Hillside
* @subpackage Original
*/
?>
/* For printview */
body{
font-family: Tahoma, Verdana, Arial, Hevetica, sans-serif;
font-size: 10px;
color: #FFFFFF;
body, table, th, td {
color: #000000;
background-color: #ffffff;
}
h1{
font-family: Tahoma, Verdana, Arial, Hevetica, sans-serif;
font-size: 16px;
font-weight: bold;
color: #FFFFFF;
img {
border: 0;
}
table{
border-width: 1px;
border-color: #FFFFFF;
table, th, td {
border-width: 0.1em;
border-color: #000000;
border-style: solid;
}
table {
border-collapse: collapse;
border-spacing: 0;
}
th{
font-family: Tahoma, Verdana, Arial, Hevetica, sans-serif;
font-size: 10px;
th, td {
padding: 0.2em;
}
th {
font-weight: bold;
color: #FFFFFF;
background-color: #e5e5e5;
border-width: 1px;
border-color: #FFFFFF;
border-style: solid;
padding: 2px;
}
td{
font-family: Tahoma, Verdana, Arial, Hevetica, sans-serif;
font-size: 10px;
color: #FFFFFF;
background-color: #ffffff;
border-width: 1px;
border-color: #FFFFFF;
border-style: solid;
padding: 2px;
}

File diff suppressed because it is too large Load Diff

BIN
hillside/img/bd_drop.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 337 B

BIN
hillside/img/bd_insrow.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 347 B

BIN
hillside/img/error.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 318 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.3 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
hillside/img/s_success.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 612 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 121 B

After

Width:  |  Height:  |  Size: 121 B

View File

@@ -3,19 +3,14 @@
/**
* Theme information
*
*
* @version $Id$
* @package phpMyAdmin-theme
* @subpackage Hillside
* @subpackage hillside
*/
/**
* This theme is based on Pixeline, but it uses the famous Silk-icons.
* Made by Douwe Ikkuh (http://www.douweikkuh.nl)
* Fixed (remade) for PMA 2.11 by Lukáš Chmela (http://82.114.202.3/)
*
*/
$theme_name = 'Hillside';
$theme_version = 1;
$theme_generation = 1;
$theme_full_version = '1.0';
?>

View File

@@ -6,33 +6,92 @@
*
* @version $Id$
* @package phpMyAdmin-theme
* @subpackage Hillside
* @subpackage Original
*/
/**
* navi frame
*/
// navi frame width
$GLOBALS['cfg']['NaviWidth'] = 200;
// foreground (text) color for the navi frame
$GLOBALS['cfg']['NaviColor'] = '#000000';
$GLOBALS['cfg']['NaviBorderColor'] = '#94b3f2';
// background for the navi frame
$GLOBALS['cfg']['NaviBackground'] = '#D0DCE0';
// foreground (text) color of the pointer in navi frame
$GLOBALS['cfg']['NaviPointerColor'] = '#000000';
// background of the pointer in navi frame
$GLOBALS['cfg']['NaviPointerBackground'] = '#9999CC';
// text color of the selected database name (when showing the table list)
$GLOBALS['cfg']['NaviDatabaseNameColor'] = '#ffa113';
/**
* main frame
*/
// foreground (text) color for the main frame
$GLOBALS['cfg']['MainColor'] = '#000000';
// background for the main frame
//$GLOBALS['cfg']['MainBackground'] = '#F5F5F5';
$GLOBALS['cfg']['MainBackground'] = '#65a603 url(' . $_SESSION['PMA_Theme']->getImgPath() . 'island_light.png) top left repeat-x';
// foreground (text) color of the pointer in browse mode
$GLOBALS['cfg']['BrowsePointerColor'] = '#000000';
// background of the pointer in browse mode
$GLOBALS['cfg']['BrowsePointerBackground'] = '#CCFFCC';
// foreground (text) color of the marker (visually marks row by clicking on it) in browse mode
$GLOBALS['cfg']['BrowseMarkerColor'] = '#000000';
// background of the marker (visually marks row by clicking on it) in browse mode
$GLOBALS['cfg']['BrowseMarkerBackground'] = '#FFCC99';
/**
* fonts
*/
/**
* the font family as a valid css font family value,
* if not set the browser default will be used
* (depending on browser, DTD and system settings)
*/
$GLOBALS['cfg']['FontFamily'] = '"Tahoma", "Lucida Grande", Verdana, sans-serif';
/**
* fixed width font family, used in textarea
*/
$GLOBALS['cfg']['FontFamilyFixed'] = 'monospace';
/**
* tables
*/
// border
$GLOBALS['cfg']['Border'] = 0;
// table header and footer color
$GLOBALS['cfg']['ThBackground'] = '#D3DCE3';
// table header and footer background
$GLOBALS['cfg']['ThColor'] = '#000000';
// table data row background
$GLOBALS['cfg']['BgOne'] = '#E5E5E5';
// table data row background, alternate
$GLOBALS['cfg']['BgTwo'] = '#D5D5D5';
/**
* query window
*/
// Width of Query window
$GLOBALS['cfg']['QueryWindowWidth'] = 600;
// Height of Query window
$GLOBALS['cfg']['QueryWindowHeight'] = 400;
$cfg['LeftWidth'] = 250; // left frame width
/* colors */
$cfg['LeftBgColor'] = ''; // background color for the left frame
$cfg['RightBgColor'] = '#65a603'; // background color for the right frame
$cfg['RightBgImage'] = ''; // path to a background image for the right frame
// (leave blank for no background image)
$cfg['LeftPointerColor'] = '#525252'; // color of the pointer in left frame
$cfg['Border'] = 0; // border width on tables
$cfg['ThBgcolor'] = '#DEDEDE'; // table header row colour
$cfg['BgcolorOne'] = '#F3F3F3'; // table data row colour
$cfg['BgcolorTwo'] = '#FFFFFF'; // table data row colour, alternate
$cfg['BrowsePointerColor'] = '#ffffd7'; // color of the pointer in browse mode
$cfg['BrowseMarkerColor'] = '#ffffd7'; // color of the marker (visually marks row
// by clicking on it) in browse mode
$right_font_family = 'Tahoma, Arial, Helvetica, Verdana, sans-serif';
$font_size = '11px';
/**
* SQL Parser Settings
* Syntax colouring data
*/
$cfg['SQP']['fmtColor'] = array( // Syntax colouring data
$GLOBALS['cfg']['SQP']['fmtColor'] = array(
'comment' => '#808000',
'comment_mysql' => '',
'comment_ansi' => '',