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

Correct indent (spaces instead of tabs)

Browse Source
This commit is contained in:
tyron
2011-05-05 09:44:47 +02:00
parent cc8a27edce
commit 246cf649e4
6 changed files with 110 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
libraries/chart/pma_pchart_chart.php
View File

@@ -69,9 +69,9 @@ abstract class PMA_pChart_chart extends PMA_chart
// as in CSS (top, right, bottom, left) // as in CSS (top, right, bottom, left)
$this->setAreaMargins(array(20, 20, 40, 60)); $this->setAreaMargins(array(20, 20, 40, 60));
// Get color settings from theme // Get color settings from theme
$this->settings = array_merge($this->settings,$GLOBALS['cfg']['chartColor']); $this->settings = array_merge($this->settings,$GLOBALS['cfg']['chartColor']);
} }
protected function init() protected function init()
@@ -133,15 +133,15 @@ abstract class PMA_pChart_chart extends PMA_chart
*/ */
protected function drawCommon() protected function drawCommon()
{ {
$this->chart->drawGraphAreaGradient( $this->chart->drawGraphAreaGradient(
$this->getBgColor(RED), $this->getBgColor(RED),
$this->getBgColor(GREEN), $this->getBgColor(GREEN),
$this->getBgColor(BLUE), $this->getBgColor(BLUE),
// With a gradientIntensity of 0 the background does't draw, oddly // With a gradientIntensity of 0 the background does't draw, oddly
($this->settings['gradientIntensity']==0)?1:$this->settings['gradientIntensity'],TARGET_BACKGROUND); ($this->settings['gradientIntensity']==0)?1:$this->settings['gradientIntensity'],TARGET_BACKGROUND);
if(is_string($this->settings['border'])) if(is_string($this->settings['border']))
$this->chart->addBorder(1,$this->getBorderColor(RED),$this->getBorderColor(GREEN),$this->getBorderColor(BLUE)); $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), $this->getScaleColor(BLUE),
TRUE,0,2,TRUE TRUE,0,2,TRUE
); );
if($this->settings['gradientIntensity']>0) if($this->settings['gradientIntensity']>0)
$this->chart->drawGraphAreaGradient( $this->chart->drawGraphAreaGradient(
$this->getGraphAreaGradientColor(RED), $this->getGraphAreaGradientColor(RED),
$this->getGraphAreaGradientColor(GREEN), $this->getGraphAreaGradientColor(GREEN),
$this->getGraphAreaGradientColor(BLUE), $this->getGraphAreaGradientColor(BLUE),
$this->settings['gradientIntensity'] $this->settings['gradientIntensity']
); );
else else
$this->chart->drawGraphArea( $this->chart->drawGraphArea(
$this->getGraphAreaGradientColor(RED), $this->getGraphAreaGradientColor(RED),
$this->getGraphAreaGradientColor(GREEN), $this->getGraphAreaGradientColor(GREEN),
$this->getGraphAreaGradientColor(BLUE) $this->getGraphAreaGradientColor(BLUE)
); );
$this->chart->drawGrid( $this->chart->drawGrid(
4, 4,
TRUE, TRUE,
@@ -392,11 +392,11 @@ abstract class PMA_pChart_chart extends PMA_chart
{ {
return $this->hexStrToDecComp($this->settings['titleBgColor'], $component); return $this->hexStrToDecComp($this->settings['titleBgColor'], $component);
} }
protected function getBorderColor($component) protected function getBorderColor($component)
{ {
return $this->hexStrToDecComp($this->settings['border'], $component); return $this->hexStrToDecComp($this->settings['border'], $component);
} }
} }
?> ?>

28
libraries/chart/pma_pchart_multi_radar.php
View File

@@ -57,20 +57,20 @@ class PMA_pChart_multi_radar extends PMA_pChart_multi
$this->getGraphAreaColor(BLUE), $this->getGraphAreaColor(BLUE),
FALSE FALSE
); );
if($this->settings['gradientIntensity']>0) if($this->settings['gradientIntensity']>0)
$this->chart->drawGraphAreaGradient( $this->chart->drawGraphAreaGradient(
$this->getGraphAreaGradientColor(RED), $this->getGraphAreaGradientColor(RED),
$this->getGraphAreaGradientColor(GREEN), $this->getGraphAreaGradientColor(GREEN),
$this->getGraphAreaGradientColor(BLUE), $this->getGraphAreaGradientColor(BLUE),
$this->settings['gradientIntensity'] $this->settings['gradientIntensity']
); );
else else
$this->chart->drawGraphArea( $this->chart->drawGraphArea(
$this->getGraphAreaGradientColor(RED), $this->getGraphAreaGradientColor(RED),
$this->getGraphAreaGradientColor(GREEN), $this->getGraphAreaGradientColor(GREEN),
$this->getGraphAreaGradientColor(BLUE) $this->getGraphAreaGradientColor(BLUE)
); );
} }
/** /**

30
libraries/chart/pma_pchart_pie.php
View File

@@ -47,21 +47,21 @@ class PMA_pChart_Pie extends PMA_pChart_multi
$this->getGraphAreaColor(BLUE), $this->getGraphAreaColor(BLUE),
FALSE FALSE
); );
if($this->settings['gradientIntensity']>0) if($this->settings['gradientIntensity']>0)
$this->chart->drawGraphAreaGradient( $this->chart->drawGraphAreaGradient(
$this->getGraphAreaGradientColor(RED), $this->getGraphAreaGradientColor(RED),
$this->getGraphAreaGradientColor(GREEN), $this->getGraphAreaGradientColor(GREEN),
$this->getGraphAreaGradientColor(BLUE), $this->getGraphAreaGradientColor(BLUE),
$this->settings['gradientIntensity'] $this->settings['gradientIntensity']
); );
else else
$this->chart->drawGraphArea( $this->chart->drawGraphArea(
$this->getGraphAreaGradientColor(RED), $this->getGraphAreaGradientColor(RED),
$this->getGraphAreaGradientColor(GREEN), $this->getGraphAreaGradientColor(GREEN),
$this->getGraphAreaGradientColor(BLUE) $this->getGraphAreaGradientColor(BLUE)
); );
} }
/** /**

30
libraries/chart/pma_pchart_single_radar.php
View File

@@ -48,21 +48,21 @@ class PMA_pChart_single_radar extends PMA_pChart_single
$this->getGraphAreaColor(BLUE), $this->getGraphAreaColor(BLUE),
FALSE FALSE
); );
if($this->settings['gradientIntensity']>0) if($this->settings['gradientIntensity']>0)
$this->chart->drawGraphAreaGradient( $this->chart->drawGraphAreaGradient(
$this->getGraphAreaGradientColor(RED), $this->getGraphAreaGradientColor(RED),
$this->getGraphAreaGradientColor(GREEN), $this->getGraphAreaGradientColor(GREEN),
$this->getGraphAreaGradientColor(BLUE), $this->getGraphAreaGradientColor(BLUE),
$this->settings['gradientIntensity'] $this->settings['gradientIntensity']
); );
else else
$this->chart->drawGraphArea( $this->chart->drawGraphArea(
$this->getGraphAreaGradientColor(RED), $this->getGraphAreaGradientColor(RED),
$this->getGraphAreaGradientColor(GREEN), $this->getGraphAreaGradientColor(GREEN),
$this->getGraphAreaGradientColor(BLUE) $this->getGraphAreaGradientColor(BLUE)
); );
} }
/** /**

34
themes/original/layout.inc.php
View File

@@ -116,23 +116,23 @@ $GLOBALS['cfg']['SQP']['fmtColor'] = array(
*/ */
$GLOBALS['cfg']['chartColor'] = array( $GLOBALS['cfg']['chartColor'] = array(
'gradientIntensity' => 0, 'gradientIntensity' => 0,
// The style of the chart title. // The style of the chart title.
'titleColor' => '#000000', 'titleColor' => '#000000',
'titleBgColor' => $GLOBALS['cfg']['ThBackground'], 'titleBgColor' => $GLOBALS['cfg']['ThBackground'],
// Chart border (0 for no border) // Chart border (0 for no border)
'border' => '#CCCCCC', 'border' => '#CCCCCC',
// Chart background color. // Chart background color.
'bgColor' => $GLOBALS['cfg']['BgTwo'], 'bgColor' => $GLOBALS['cfg']['BgTwo'],
// when graph area gradient is used, this is the color of the graph // when graph area gradient is used, this is the color of the graph
// area border // area border
'graphAreaColor' => '#D5D9DD', 'graphAreaColor' => '#D5D9DD',
// the background color of the inner graph area // the background color of the inner graph area
'graphAreaGradientColor'=> $GLOBALS['cfg']['BgOne'], 'graphAreaGradientColor' => $GLOBALS['cfg']['BgOne'],
// the color of the grid lines in the graph area // the color of the grid lines in the graph area
'gridColor' => '#E6E6E6', 'gridColor' => '#E6E6E6',
// the color of the scale and the labels // the color of the scale and the labels
'scaleColor' => '#D5D9DD', 'scaleColor' => '#D5D9DD',
); );
?> ?>

34
themes/pmahomme/layout.inc.php
View File

@@ -118,23 +118,23 @@ $GLOBALS['cfg']['SQP']['fmtColor'] = array(
*/ */
$GLOBALS['cfg']['chartColor'] = array( $GLOBALS['cfg']['chartColor'] = array(
'gradientIntensity' => 50, 'gradientIntensity' => 50,
// The style of the chart title. // The style of the chart title.
'titleColor' => '#000000', 'titleColor' => '#000000',
'titleBgColor' => '#E5E5E5', 'titleBgColor' => '#E5E5E5',
// Chart border (0 for no border) // Chart border (0 for no border)
'border' => '#CCCCCC', 'border' => '#CCCCCC',
// Chart background color. // Chart background color.
'bgColor' => '#FBFBFB', 'bgColor' => '#FBFBFB',
// when graph area gradient is used, this is the color of the graph // when graph area gradient is used, this is the color of the graph
// area border // area border
'graphAreaColor' => '#D5D9DD', 'graphAreaColor' => '#D5D9DD',
// the background color of the graph area // the background color of the graph area
'graphAreaGradientColor'=> $GLOBALS['cfg']['BgTwo'], 'graphAreaGradientColor' => $GLOBALS['cfg']['BgTwo'],
// the color of the grid lines in the graph area // the color of the grid lines in the graph area
'gridColor' => '#E6E6E6', 'gridColor' => '#E6E6E6',
// the color of the scale and the labels // the color of the scale and the labels
'scaleColor' => '#D5D9DD', 'scaleColor' => '#D5D9DD',
); );