Adjust themes to make them work with current head.

This commit is contained in:
Michal Čihař
2010-02-22 15:46:06 +00:00
parent abf790ce2e
commit 6791cf874d
20 changed files with 25 additions and 25 deletions

View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html { html {
font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>; font-size: <?php echo $GLOBALS['PMA_Config']->get('fontsize'); ?>;
} }
input, select, textarea { input, select, textarea {

View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html { html {
font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>; font-size: <?php echo $GLOBALS['PMA_Config']->get('fontsize'); ?>;
} }
input, select, textarea { input, select, textarea {

View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html { html {
font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>; font-size: <?php echo $GLOBALS['PMA_Config']->get('fontsize'); ?>;
} }
input, select, textarea { input, select, textarea {

View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html { html {
font-size: <?php echo $_SESSION['PMA_Config']->get('fontsize'); ?>; font-size: <?php echo $GLOBALS['PMA_Config']->get('fontsize'); ?>;
} }
input, select, textarea { input, select, textarea {

View File

@@ -23,7 +23,7 @@
// 2007-08-24 (mkkeck) // 2007-08-24 (mkkeck)
// Get font-sizes // Get font-sizes
$pma_fsize = $_SESSION['PMA_Config']->get('fontsize'); $pma_fsize = $GLOBALS['PMA_Config']->get('fontsize');
$pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize); $pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize);
if (!empty($pma_fsize)) { if (!empty($pma_fsize)) {
$pma_fsize = ($pma_fsize * 0.01); $pma_fsize = ($pma_fsize * 0.01);

View File

@@ -8,7 +8,7 @@
* @subpackage Arctic_Ocean * @subpackage Arctic_Ocean
*/ */
$pma_fsize = $_SESSION['PMA_Config']->get('fontsize'); $pma_fsize = $GLOBALS['PMA_Config']->get('fontsize');
$pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize); $pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize);
$pma_fsize = @($pma_fsize / 100); $pma_fsize = @($pma_fsize / 100);
if ( isset($GLOBALS['cfg']['FontSize']) && !empty($GLOBALS['cfg']['FontSize']) ) { if ( isset($GLOBALS['cfg']['FontSize']) && !empty($GLOBALS['cfg']['FontSize']) ) {
@@ -16,7 +16,7 @@
$fsize = ceil($usr_fsize * $pma_fsize) $fsize = ceil($usr_fsize * $pma_fsize)
. ( (isset($GLOBALS['cfg']['FontSizePrefix']) && !empty($GLOBALS['cfg']['FontSizePrefix'])) ? $GLOBALS['cfg']['FontSizePrefix'] : 'pt' ); . ( (isset($GLOBALS['cfg']['FontSizePrefix']) && !empty($GLOBALS['cfg']['FontSizePrefix'])) ? $GLOBALS['cfg']['FontSizePrefix'] : 'pt' );
} else } else
$fsize = $_SESSION['PMA_Config']->get('fontsize'); $fsize = $GLOBALS['PMA_Config']->get('fontsize');
?> ?>
html { html {
font-size: <?php echo $fsize; ?>; font-size: <?php echo $fsize; ?>;

View File

@@ -26,7 +26,7 @@
// 2007-08-24 (mkkeck) // 2007-08-24 (mkkeck)
// Get font-sizes // Get font-sizes
$pma_fsize = $_SESSION['PMA_Config']->get('fontsize'); $pma_fsize = $GLOBALS['PMA_Config']->get('fontsize');
$pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize); $pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize);
if (!empty($pma_fsize)) { if (!empty($pma_fsize)) {
$pma_fsize = ($pma_fsize * 0.01); $pma_fsize = ($pma_fsize * 0.01);

View File

@@ -14,7 +14,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
} }
?> ?>
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']);?>;} 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 !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;}
input, input,
select, select,
textarea{font-size:1em;} textarea{font-size:1em;}

View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general elements /* general elements
********************************************************************** */ ********************************************************************** */
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 !== $GLOBALS['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['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%} 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}

View File

@@ -15,7 +15,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html { html {
font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>; font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
} }
input, select, textarea { input, select, textarea {

View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html { html {
font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : ( font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : (
isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : '84%'));?>; isset($_COOKIE['pma_fontsize']) ? $_COOKIE['pma_fontsize'] : '84%'));?>;
} }

View File

@@ -66,8 +66,8 @@ if (version_compare(PMA_VERSION, '3.0', 'ge')) {
echo echo
'html', 'html',
_S, 'font-size:',_2; _S, 'font-size:',_2;
if (null !== $_SESSION['PMA_Config']->get('fontsize')) { if (null !== $GLOBALS['PMA_Config']->get('fontsize')) {
echo $_SESSION['PMA_Config']->get('fontsize'); echo $GLOBALS['PMA_Config']->get('fontsize');
} elseif (!empty($_COOKIE['pma_fontsize'])) { } elseif (!empty($_COOKIE['pma_fontsize'])) {
echo $_COOKIE['pma_fontsize']; echo $_COOKIE['pma_fontsize'];
} else echo '82%'; } else echo '82%';

View File

@@ -72,8 +72,8 @@ if (version_compare(PMA_VERSION,'3.0','ge')) {
echo echo
'html', 'html',
_S, 'font-size:', _2; _S, 'font-size:', _2;
if (null !== $_SESSION['PMA_Config']->get('fontsize')) { if (null !== $GLOBALS['PMA_Config']->get('fontsize')) {
echo $_SESSION['PMA_Config']->get('fontsize'); echo $GLOBALS['PMA_Config']->get('fontsize');
} elseif (!empty($_COOKIE['pma_fontsize'])) { } elseif (!empty($_COOKIE['pma_fontsize'])) {
echo $_COOKIE['pma_fontsize']; echo $_COOKIE['pma_fontsize'];
} else echo '82%'; } else echo '82%';

View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html { html {
font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>; font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
} }
input, select, textarea { input, select, textarea {

View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html { html {
font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>; font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;
} }
input, select, textarea { input, select, textarea {

View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html { html {
font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>; font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']); ?>;
} }
input, select, textarea { input, select, textarea {

View File

@@ -16,7 +16,7 @@ if (!defined('PMA_MINIMUM_COMMON')) {
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */
html { html {
font-size: <?php echo (null !== $_SESSION['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>; font-size: <?php echo (null !== $GLOBALS['PMA_Config']->get('fontsize') ? $_SESSION['PMA_Config']->get('fontsize') : $_COOKIE['pma_fontsize']);?>;
} }
input, select, textarea { input, select, textarea {

View File

@@ -19,7 +19,7 @@
$ipath = $_SESSION['PMA_Theme']->getImgPath(); $ipath = $_SESSION['PMA_Theme']->getImgPath();
$pma_fsize = $_SESSION['PMA_Config']->get('fontsize'); $pma_fsize = $GLOBALS['PMA_Config']->get('fontsize');
$pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize); $pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize);
$pma_fsize = @($pma_fsize / 100); $pma_fsize = @($pma_fsize / 100);
if ( isset($GLOBALS['cfg']['FontSize']) && !empty($GLOBALS['cfg']['FontSize']) ) { if ( isset($GLOBALS['cfg']['FontSize']) && !empty($GLOBALS['cfg']['FontSize']) ) {
@@ -27,7 +27,7 @@
$fsize = ceil($usr_fsize * $pma_fsize) $fsize = ceil($usr_fsize * $pma_fsize)
. ( (isset($GLOBALS['cfg']['FontSizePrefix']) && !empty($GLOBALS['cfg']['FontSizePrefix'])) ? $GLOBALS['cfg']['FontSizePrefix'] : 'pt' ); . ( (isset($GLOBALS['cfg']['FontSizePrefix']) && !empty($GLOBALS['cfg']['FontSizePrefix'])) ? $GLOBALS['cfg']['FontSizePrefix'] : 'pt' );
} else } else
$fsize = $_SESSION['PMA_Config']->get('fontsize'); $fsize = $GLOBALS['PMA_Config']->get('fontsize');
?> ?>
/******************************************************************************/ /******************************************************************************/
/* general tags */ /* general tags */

View File

@@ -8,7 +8,7 @@
* @subpackage Arctic_Ocean * @subpackage Arctic_Ocean
*/ */
$pma_fsize = $_SESSION['PMA_Config']->get('fontsize'); $pma_fsize = $GLOBALS['PMA_Config']->get('fontsize');
$pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize); $pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize);
$pma_fsize = @($pma_fsize / 100); $pma_fsize = @($pma_fsize / 100);
if ( isset($GLOBALS['cfg']['FontSize']) && !empty($GLOBALS['cfg']['FontSize']) ) { if ( isset($GLOBALS['cfg']['FontSize']) && !empty($GLOBALS['cfg']['FontSize']) ) {
@@ -16,7 +16,7 @@
$fsize = ceil($usr_fsize * $pma_fsize) $fsize = ceil($usr_fsize * $pma_fsize)
. ( (isset($GLOBALS['cfg']['FontSizePrefix']) && !empty($GLOBALS['cfg']['FontSizePrefix'])) ? $GLOBALS['cfg']['FontSizePrefix'] : 'pt' ); . ( (isset($GLOBALS['cfg']['FontSizePrefix']) && !empty($GLOBALS['cfg']['FontSizePrefix'])) ? $GLOBALS['cfg']['FontSizePrefix'] : 'pt' );
} else } else
$fsize = $_SESSION['PMA_Config']->get('fontsize'); $fsize = $GLOBALS['PMA_Config']->get('fontsize');
?> ?>
html { html {
font-size: <?php echo $fsize; ?>; font-size: <?php echo $fsize; ?>;

View File

@@ -26,7 +26,7 @@
// 2007-08-24 (mkkeck) // 2007-08-24 (mkkeck)
// Get font-sizes // Get font-sizes
$pma_fsize = $_SESSION['PMA_Config']->get('fontsize'); $pma_fsize = $GLOBALS['PMA_Config']->get('fontsize');
$pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize); $pma_fsize = preg_replace("/[^0-9]/", "", $pma_fsize);
if (!empty($pma_fsize)) { if (!empty($pma_fsize)) {
$pma_fsize = ($pma_fsize * 0.01); $pma_fsize = ($pma_fsize * 0.01);