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

in SESSION, userconf renamed to tmp_user_values to avoid confusion with the future db-based user preferences

Browse Source
This commit is contained in:
Marc Delisle
2009-06-20 16:36:58 +00:00
parent 4851ad905f
commit abf790ce2e
8 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clearview3/css/theme_left.css.php
View File

@@ -14,7 +14,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
} }
?> ?>
body#body_leftFrame{padding:10px;margin:0;background:<?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?> url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>frame_fone.png) repeat-y right;color:<?php echo $GLOBALS['cfg']['NaviColor'] ?>;font-family:<?php echo $GLOBALS['cfg']['FontFamily'] ?>;font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;} body#body_leftFrame{padding:10px;margin:0;background:<?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?> url(<?php echo $_SESSION['PMA_Theme']->getImgPath(); ?>frame_fone.png) repeat-y right;color:<?php echo $GLOBALS['cfg']['NaviColor'] ?>;font-family:<?php echo $GLOBALS['cfg']['FontFamily'] ?>;font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;}
input, input,
select, select,
textarea{font-size:1em;} textarea{font-size:1em;}

2
clearview3/css/theme_right.css.php
View File

@@ -18,7 +18,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
********************************************************************** */ ********************************************************************** */
html{font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>} html{font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>}
body, body,
body#bodyquerywindow{padding:10px;margin:0;background:<?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;color:<?php echo $GLOBALS['cfg']['MainColor'] ?>;font-family:<?php echo $GLOBALS['cfg']['FontFamily'] ?>;font-size:95%;line-height:130%} body#bodyquerywindow{padding:10px;margin:0;background:<?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;color:<?php echo $GLOBALS['cfg']['MainColor'] ?>;font-family:<?php echo $GLOBALS['cfg']['FontFamily'] ?>;font-size:95%;line-height:130%}
a img{border:none} a img{border:none}
a:link, a:link,
a:visited{text-decoration:none;color:#483D8B} a:visited{text-decoration:none;color:#483D8B}

6
crimson_gray/css/theme_left.css.php
View File

@@ -26,7 +26,7 @@ body {
<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?> <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>; font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
<?php } ?> <?php } ?>
background: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>; color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin: 0; margin: 0;
padding: 0.2em 0.2em 0.2em 0.2em; padding: 0.2em 0.2em 0.2em 0.2em;
@@ -87,7 +87,7 @@ button {
div#pmalogo { div#pmalogo {
<?php //better echo $GLOBALS['cfg']['logoBGC']; ?> <?php //better echo $GLOBALS['cfg']['logoBGC']; ?>
background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; background-color: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
padding:.3em; padding:.3em;
} }
div#pmalogo, div#pmalogo,
@@ -161,7 +161,7 @@ div#left_tableList ul {
margin: 0; margin: 0;
padding: 0; padding: 0;
font-size: 80%; font-size: 80%;
background: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
} }
div#left_tableList ul ul { div#left_tableList ul ul {

2
crimson_gray/css/theme_right.css.php
View File

@@ -31,7 +31,7 @@ body {
padding: 0; padding: 0;
margin: 0.5em; margin: 0.5em;
color: <?php echo $GLOBALS['cfg']['MainColor']; ?>; color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
background: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>; background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
} }
<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?> <?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>

2
hillside/css/theme_left.css.php
View File

@@ -27,7 +27,7 @@ body {
<?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?> <?php if (! empty($GLOBALS['cfg']['FontFamily'])) { ?>
font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>; font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
<?php } ?> <?php } ?>
background: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>; color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin: 0; margin: 0;
padding: 0.2em 0.2em 0.2em 0.2em; padding: 0.2em 0.2em 0.2em 0.2em;

2
hillside/css/theme_right.css.php
View File

@@ -30,7 +30,7 @@ body {
padding: 0; padding: 0;
margin: 0.5em; margin: 0.5em;
color: <?php echo $GLOBALS['cfg']['MainColor']; ?>; color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
background: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>; background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
} }
<?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?> <?php if (! empty($GLOBALS['cfg']['FontFamilyFixed'])) { ?>

4
paradice/css/theme_left.css.php
View File

@@ -28,7 +28,7 @@ body {
font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>; font-family: <?php echo $GLOBALS['cfg']['FontFamily']; ?>;
<?php } ?> <?php } ?>
font-size: 0.8em; font-size: 0.8em;
background: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>; color: <?php echo $GLOBALS['cfg']['NaviColor']; ?>;
margin: 0; margin: 0;
padding: 0.2em 0.2em 0.2em 0.2em; padding: 0.2em 0.2em 0.2em 0.2em;
@@ -108,7 +108,7 @@ button {
div#pmalogo { div#pmalogo {
<?php //better echo $GLOBALS['cfg']['logoBGC']; ?> <?php //better echo $GLOBALS['cfg']['logoBGC']; ?>
background-color: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>; background-color: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['NaviBackground']); ?>;
padding:.3em; padding:.3em;
} }
div#pmalogo, div#pmalogo,

2
paradice/css/theme_right.css.php
View File

@@ -30,7 +30,7 @@ body {
padding: 0; padding: 0;
margin: 0.5em; margin: 0.5em;
color: <?php echo $GLOBALS['cfg']['MainColor']; ?>; color: <?php echo $GLOBALS['cfg']['MainColor']; ?>;
background: <?php echo (isset($_SESSION['userconf']['custom_color']) ? $_SESSION['userconf']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>; background: <?php echo (isset($_SESSION['tmp_user_values']['custom_color']) ? $_SESSION['tmp_user_values']['custom_color'] : $GLOBALS['cfg']['MainBackground']); ?>;
font-size: 1em; font-size: 1em;
} }