From 246cf649e472779a8fb8df81710cbd9fb2e2bffc Mon Sep 17 00:00:00 2001 From: tyron Date: Thu, 5 May 2011 09:44:47 +0200 Subject: [PATCH] Correct indent (spaces instead of tabs) --- libraries/chart/pma_pchart_chart.php | 64 ++++++++++----------- libraries/chart/pma_pchart_multi_radar.php | 28 ++++----- libraries/chart/pma_pchart_pie.php | 30 +++++----- libraries/chart/pma_pchart_single_radar.php | 30 +++++----- themes/original/layout.inc.php | 34 +++++------ themes/pmahomme/layout.inc.php | 34 +++++------ 6 files changed, 110 insertions(+), 110 deletions(-) diff --git a/libraries/chart/pma_pchart_chart.php b/libraries/chart/pma_pchart_chart.php index 54936aab8..c4277d804 100644 --- a/libraries/chart/pma_pchart_chart.php +++ b/libraries/chart/pma_pchart_chart.php @@ -69,9 +69,9 @@ abstract class PMA_pChart_chart extends PMA_chart // as in CSS (top, right, bottom, left) $this->setAreaMargins(array(20, 20, 40, 60)); - - // Get color settings from theme - $this->settings = array_merge($this->settings,$GLOBALS['cfg']['chartColor']); + + // Get color settings from theme + $this->settings = array_merge($this->settings,$GLOBALS['cfg']['chartColor']); } protected function init() @@ -133,15 +133,15 @@ abstract class PMA_pChart_chart extends PMA_chart */ protected function drawCommon() { - $this->chart->drawGraphAreaGradient( - $this->getBgColor(RED), - $this->getBgColor(GREEN), - $this->getBgColor(BLUE), - // With a gradientIntensity of 0 the background does't draw, oddly - ($this->settings['gradientIntensity']==0)?1:$this->settings['gradientIntensity'],TARGET_BACKGROUND); - - if(is_string($this->settings['border'])) - $this->chart->addBorder(1,$this->getBorderColor(RED),$this->getBorderColor(GREEN),$this->getBorderColor(BLUE)); + $this->chart->drawGraphAreaGradient( + $this->getBgColor(RED), + $this->getBgColor(GREEN), + $this->getBgColor(BLUE), + // With a gradientIntensity of 0 the background does't draw, oddly + ($this->settings['gradientIntensity']==0)?1:$this->settings['gradientIntensity'],TARGET_BACKGROUND); + + if(is_string($this->settings['border'])) + $this->chart->addBorder(1,$this->getBorderColor(RED),$this->getBorderColor(GREEN),$this->getBorderColor(BLUE)); } /** @@ -201,21 +201,21 @@ abstract class PMA_pChart_chart extends PMA_chart $this->getScaleColor(BLUE), TRUE,0,2,TRUE ); - - if($this->settings['gradientIntensity']>0) - $this->chart->drawGraphAreaGradient( - $this->getGraphAreaGradientColor(RED), - $this->getGraphAreaGradientColor(GREEN), - $this->getGraphAreaGradientColor(BLUE), - $this->settings['gradientIntensity'] - ); - else - $this->chart->drawGraphArea( - $this->getGraphAreaGradientColor(RED), - $this->getGraphAreaGradientColor(GREEN), - $this->getGraphAreaGradientColor(BLUE) - ); - + + if($this->settings['gradientIntensity']>0) + $this->chart->drawGraphAreaGradient( + $this->getGraphAreaGradientColor(RED), + $this->getGraphAreaGradientColor(GREEN), + $this->getGraphAreaGradientColor(BLUE), + $this->settings['gradientIntensity'] + ); + else + $this->chart->drawGraphArea( + $this->getGraphAreaGradientColor(RED), + $this->getGraphAreaGradientColor(GREEN), + $this->getGraphAreaGradientColor(BLUE) + ); + $this->chart->drawGrid( 4, TRUE, @@ -392,11 +392,11 @@ abstract class PMA_pChart_chart extends PMA_chart { return $this->hexStrToDecComp($this->settings['titleBgColor'], $component); } - - protected function getBorderColor($component) - { - return $this->hexStrToDecComp($this->settings['border'], $component); - } + + protected function getBorderColor($component) + { + return $this->hexStrToDecComp($this->settings['border'], $component); + } } ?> diff --git a/libraries/chart/pma_pchart_multi_radar.php b/libraries/chart/pma_pchart_multi_radar.php index 8e6128375..c96fb3cc4 100644 --- a/libraries/chart/pma_pchart_multi_radar.php +++ b/libraries/chart/pma_pchart_multi_radar.php @@ -57,20 +57,20 @@ class PMA_pChart_multi_radar extends PMA_pChart_multi $this->getGraphAreaColor(BLUE), FALSE ); - - if($this->settings['gradientIntensity']>0) - $this->chart->drawGraphAreaGradient( - $this->getGraphAreaGradientColor(RED), - $this->getGraphAreaGradientColor(GREEN), - $this->getGraphAreaGradientColor(BLUE), - $this->settings['gradientIntensity'] - ); - else - $this->chart->drawGraphArea( - $this->getGraphAreaGradientColor(RED), - $this->getGraphAreaGradientColor(GREEN), - $this->getGraphAreaGradientColor(BLUE) - ); + + if($this->settings['gradientIntensity']>0) + $this->chart->drawGraphAreaGradient( + $this->getGraphAreaGradientColor(RED), + $this->getGraphAreaGradientColor(GREEN), + $this->getGraphAreaGradientColor(BLUE), + $this->settings['gradientIntensity'] + ); + else + $this->chart->drawGraphArea( + $this->getGraphAreaGradientColor(RED), + $this->getGraphAreaGradientColor(GREEN), + $this->getGraphAreaGradientColor(BLUE) + ); } /** diff --git a/libraries/chart/pma_pchart_pie.php b/libraries/chart/pma_pchart_pie.php index f6489181f..0366ba48b 100644 --- a/libraries/chart/pma_pchart_pie.php +++ b/libraries/chart/pma_pchart_pie.php @@ -47,21 +47,21 @@ class PMA_pChart_Pie extends PMA_pChart_multi $this->getGraphAreaColor(BLUE), FALSE ); - - if($this->settings['gradientIntensity']>0) - $this->chart->drawGraphAreaGradient( - $this->getGraphAreaGradientColor(RED), - $this->getGraphAreaGradientColor(GREEN), - $this->getGraphAreaGradientColor(BLUE), - $this->settings['gradientIntensity'] - ); - else - $this->chart->drawGraphArea( - $this->getGraphAreaGradientColor(RED), - $this->getGraphAreaGradientColor(GREEN), - $this->getGraphAreaGradientColor(BLUE) - ); - + + if($this->settings['gradientIntensity']>0) + $this->chart->drawGraphAreaGradient( + $this->getGraphAreaGradientColor(RED), + $this->getGraphAreaGradientColor(GREEN), + $this->getGraphAreaGradientColor(BLUE), + $this->settings['gradientIntensity'] + ); + else + $this->chart->drawGraphArea( + $this->getGraphAreaGradientColor(RED), + $this->getGraphAreaGradientColor(GREEN), + $this->getGraphAreaGradientColor(BLUE) + ); + } /** diff --git a/libraries/chart/pma_pchart_single_radar.php b/libraries/chart/pma_pchart_single_radar.php index 7bcc8579d..659058217 100644 --- a/libraries/chart/pma_pchart_single_radar.php +++ b/libraries/chart/pma_pchart_single_radar.php @@ -48,21 +48,21 @@ class PMA_pChart_single_radar extends PMA_pChart_single $this->getGraphAreaColor(BLUE), FALSE ); - - if($this->settings['gradientIntensity']>0) - $this->chart->drawGraphAreaGradient( - $this->getGraphAreaGradientColor(RED), - $this->getGraphAreaGradientColor(GREEN), - $this->getGraphAreaGradientColor(BLUE), - $this->settings['gradientIntensity'] - ); - else - $this->chart->drawGraphArea( - $this->getGraphAreaGradientColor(RED), - $this->getGraphAreaGradientColor(GREEN), - $this->getGraphAreaGradientColor(BLUE) - ); - + + if($this->settings['gradientIntensity']>0) + $this->chart->drawGraphAreaGradient( + $this->getGraphAreaGradientColor(RED), + $this->getGraphAreaGradientColor(GREEN), + $this->getGraphAreaGradientColor(BLUE), + $this->settings['gradientIntensity'] + ); + else + $this->chart->drawGraphArea( + $this->getGraphAreaGradientColor(RED), + $this->getGraphAreaGradientColor(GREEN), + $this->getGraphAreaGradientColor(BLUE) + ); + } /** diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index 21bc1df67..f22369ec2 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -116,23 +116,23 @@ $GLOBALS['cfg']['SQP']['fmtColor'] = array( */ $GLOBALS['cfg']['chartColor'] = array( - 'gradientIntensity' => 0, - // The style of the chart title. - 'titleColor' => '#000000', - 'titleBgColor' => $GLOBALS['cfg']['ThBackground'], - // Chart border (0 for no border) - 'border' => '#CCCCCC', - // Chart background color. - 'bgColor' => $GLOBALS['cfg']['BgTwo'], - // when graph area gradient is used, this is the color of the graph - // area border - 'graphAreaColor' => '#D5D9DD', - // the background color of the inner graph area - 'graphAreaGradientColor'=> $GLOBALS['cfg']['BgOne'], - // the color of the grid lines in the graph area - 'gridColor' => '#E6E6E6', - // the color of the scale and the labels - 'scaleColor' => '#D5D9DD', + 'gradientIntensity' => 0, + // The style of the chart title. + 'titleColor' => '#000000', + 'titleBgColor' => $GLOBALS['cfg']['ThBackground'], + // Chart border (0 for no border) + 'border' => '#CCCCCC', + // Chart background color. + 'bgColor' => $GLOBALS['cfg']['BgTwo'], + // when graph area gradient is used, this is the color of the graph + // area border + 'graphAreaColor' => '#D5D9DD', + // the background color of the inner graph area + 'graphAreaGradientColor' => $GLOBALS['cfg']['BgOne'], + // the color of the grid lines in the graph area + 'gridColor' => '#E6E6E6', + // the color of the scale and the labels + 'scaleColor' => '#D5D9DD', ); ?> diff --git a/themes/pmahomme/layout.inc.php b/themes/pmahomme/layout.inc.php index 2f7a0c903..8ff3ebc91 100644 --- a/themes/pmahomme/layout.inc.php +++ b/themes/pmahomme/layout.inc.php @@ -118,23 +118,23 @@ $GLOBALS['cfg']['SQP']['fmtColor'] = array( */ $GLOBALS['cfg']['chartColor'] = array( - 'gradientIntensity' => 50, - // The style of the chart title. - 'titleColor' => '#000000', - 'titleBgColor' => '#E5E5E5', - // Chart border (0 for no border) - 'border' => '#CCCCCC', - // Chart background color. - 'bgColor' => '#FBFBFB', - // when graph area gradient is used, this is the color of the graph - // area border - 'graphAreaColor' => '#D5D9DD', - // the background color of the graph area - 'graphAreaGradientColor'=> $GLOBALS['cfg']['BgTwo'], - // the color of the grid lines in the graph area - 'gridColor' => '#E6E6E6', - // the color of the scale and the labels - 'scaleColor' => '#D5D9DD', + 'gradientIntensity' => 50, + // The style of the chart title. + 'titleColor' => '#000000', + 'titleBgColor' => '#E5E5E5', + // Chart border (0 for no border) + 'border' => '#CCCCCC', + // Chart background color. + 'bgColor' => '#FBFBFB', + // when graph area gradient is used, this is the color of the graph + // area border + 'graphAreaColor' => '#D5D9DD', + // the background color of the graph area + 'graphAreaGradientColor' => $GLOBALS['cfg']['BgTwo'], + // the color of the grid lines in the graph area + 'gridColor' => '#E6E6E6', + // the color of the scale and the labels + 'scaleColor' => '#D5D9DD', );