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

fix user preferences in phpmyadmin.css.php

Browse Source 
fix css for LightTabs
fix values in <select> lists
This commit is contained in:
Crack
2010-07-27 23:15:23 +02:00
parent ac3e9e323b
commit 5a3ec082d8
6 changed files with 58 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libraries/Config.class.php
View File

@@ -436,7 +436,7 @@ class PMA_Config
// will have everything avaiable in session cache
$server = isset($GLOBALS['server'])
? $GLOBALS['server']
: $GLOBALS['cfg']['ServerDefault'];
: (!empty($GLOBALS['cfg']['ServerDefault']) ? $GLOBALS['cfg']['ServerDefault'] : 0);
$cache_key = 'server_' . $server;
if ($server > 0 && !defined('PMA_MINIMUM_COMMON')) {
$config_mtime = max($this->default_source_mtime, $this->source_mtime);
@@ -464,7 +464,6 @@ class PMA_Config
// load config array
$this->settings = PMA_array_merge_recursive($this->settings, $config_data);
$GLOBALS['cfg'] = PMA_array_merge_recursive($GLOBALS['cfg'], $config_data);
if (defined('PMA_MINIMUM_COMMON')) {
return;
}

2
libraries/config/Form.class.php
View File

@@ -91,7 +91,7 @@ class Form
return array();
}
// convert array('#', 'a', 'b') to array('a', 'b')
if (isset($value[0]) && $value[0] == '#') {
if (isset($value[0]) && $value[0] === '#') {
// remove first element ('#')
array_shift($value);
} else {

6
libraries/config/user_preferences.forms.php
View File

@@ -66,10 +66,6 @@ $forms['Left_frame']['Left_frame'] = array(
'LeftLogoLink',
'LeftLogoLinkWindow',
'LeftPointerEnable');
// pmadb is unavailable when these settings are used
/*$forms['Left_frame']['Left_servers'] = array(
'LeftDisplayServers',
'DisplayServersList');*/
$forms['Left_frame']['Left_databases'] = array(
'DisplayDatabasesList',
'LeftFrameDBTree',
@@ -106,7 +102,7 @@ $forms['Main_frame']['Edit'] = array(
'ShowFunctionFields',
'ShowFieldTypesInDataEditView',
'InsertRows',
'ForeignKeyDropdownOrder',// [s, ? custom text value]
'ForeignKeyDropdownOrder',
'ForeignKeyMaxLimit',
'CtrlArrowsMoving',
'DefaultPropDisplay');

2
libraries/header_meta_style.inc.php
View File

@@ -53,7 +53,7 @@ if ($GLOBALS['text_dir'] == 'ltr') {
<?php
}
?>
<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php?<?php echo PMA_generate_common_url(); ?>&amp;js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>phpmyadmin.css.php<?php echo PMA_generate_common_url(array('server' => $GLOBALS['server'])); ?>&amp;js_frame=<?php echo isset($print_view) ? 'print' : 'right'; ?>&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" />
<link rel="stylesheet" type="text/css" href="<?php echo defined('PMA_PATH_TO_BASEDIR') ? PMA_PATH_TO_BASEDIR : ''; ?>print.css" media="print" />
<link rel="stylesheet" type="text/css" href="<?php echo $GLOBALS['pmaThemePath']; ?>/jquery/jquery-ui-1.8.custom.css" />
<meta name="robots" content="noindex,nofollow" />

49
themes/darkblue_orange/css/theme_right.css.php
View File

@@ -613,6 +613,12 @@ ul#topmenu, ul#topmenu2, ul.tabs {
padding: 0;
}
ul#topmenu2 {
margin: 0.25em 0.5em 0;
height: 2em;
clear: both;
}
ul#topmenu li, ul#topmenu2 li {
float: <?php echo $left; ?>;
margin: 0;
@@ -634,33 +640,30 @@ ul#topmenu a, ul#topmenu span {
}
ul#topmenu ul a {
margin: 0;
padding-bottom: 0.2em;
margin: 0;
padding-bottom: 0.2em;
}
ul#topmenu .submenu {
position: relative;
position: relative;
}
ul#topmenu ul {
padding: 0;
margin: 0;
position: absolute;
right: 0;
list-style-type: none;
display: none;
-moz-box-shadow: 2px 2px 3px #666;
-webkit-box-shadow: 2px 2px 3px #666;
box-shadow: 2px 2px 3px #666;
border: 1px #666 solid;
padding: 0;
margin: 0;
position: absolute;
right: 0;
list-style-type: none;
display: none;
border: 1px #666 solid;
}
ul#topmenu li:hover ul, ul#topmenu .submenuhover ul {
display: block;
display: block;
}
ul#topmenu ul li {
width: 100%;
width: 100%;
}
ul#topmenu2 a {
@@ -694,16 +697,20 @@ ul#topmenu a.tabcaution:hover {
ul#topmenu a.tabactive, ul#topmenu2 a.tabactive {
color: black;
}
ul#topmenu ul {
background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
}
<?php } else { ?>
#topmenu {
margin-top: 0.5em;
padding: 0.1em 0.3em 0.1em 0.3em;
}
ul#topmenu2 {
margin: 0.25em 0.5em 0;
height: 2em;
clear: both;
ul#topmenu ul {
-moz-box-shadow: 2px 2px 3px #666;
-webkit-box-shadow: 2px 2px 3px #666;
box-shadow: 2px 2px 3px #666;
}
ul#topmenu > li {
@@ -712,8 +719,8 @@ ul#topmenu > li {
/* default tab styles */
ul#topmenu a, ul#topmenu span {
background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
border: 0 solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
background-color: <?php echo $GLOBALS['cfg']['BgOne']; ?>;
border: 0 solid <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
border-width: 1pt 1pt 0 1pt;
-moz-border-radius: 0.4em 0.4em 0 0;
border-radius: 0.4em 0.4em 0 0;

45
themes/original/css/theme_right.css.php
View File

@@ -588,6 +588,12 @@ ul#topmenu, ul#topmenu2, ul.tabs {
padding: 0;
}
ul#topmenu2 {
margin: 0.25em 0.5em 0;
height: 2em;
clear: both;
}
ul#topmenu li, ul#topmenu2 li {
float: <?php echo $left; ?>;
margin: 0;
@@ -609,33 +615,30 @@ ul#topmenu a, ul#topmenu span {
}
ul#topmenu ul a {
margin: 0;
padding-bottom: 0.2em;
margin: 0;
padding-bottom: 0.2em;
}
ul#topmenu .submenu {
position: relative;
position: relative;
}
ul#topmenu ul {
margin: 0;
padding: 0;
position: absolute;
right: 0;
list-style-type: none;
display: none;
-moz-box-shadow: 2px 2px 3px #666;
-webkit-box-shadow: 2px 2px 3px #666;
box-shadow: 2px 2px 3px #666;
border: 1px #666 solid;
margin: 0;
padding: 0;
position: absolute;
right: 0;
list-style-type: none;
display: none;
border: 1px #666 solid;
}
ul#topmenu li:hover ul, ul#topmenu .submenuhover ul {
display: block;
display: block;
}
ul#topmenu ul li {
width: 100%;
width: 100%;
}
ul#topmenu2 a {
@@ -669,16 +672,20 @@ ul#topmenu a.tabcaution:hover {
ul#topmenu a.tabactive, ul#topmenu2 a.tabactive {
color: black;
}
ul#topmenu ul {
background: <?php echo $GLOBALS['cfg']['MainBackground']; ?>;
}
<?php } else { ?>
#topmenu {
margin-top: 0.5em;
padding: 0.1em 0.3em 0.1em 0.3em;
}
ul#topmenu2 {
margin: 0.25em 0.5em 0;
height: 2em;
clear: both;
ul#topmenu ul {
-moz-box-shadow: 2px 2px 3px #666;
-webkit-box-shadow: 2px 2px 3px #666;
box-shadow: 2px 2px 3px #666;
}
ul#topmenu > li {