moved setting defaults to the correct place.

This commit is contained in:
Martynas Mickevicius
2010-07-28 12:26:40 +03:00
parent 34ec78abb5
commit c6ce98be18
3 changed files with 5 additions and 11 deletions

View File

@@ -88,16 +88,6 @@ function PMA_chart_results($data, &$chartSettings, &$chartErrors = array())
$chartSettings['barType'] = 'stacked'; $chartSettings['barType'] = 'stacked';
} }
// set default if image is continuous (one part)
if (empty($chartSettings['continuous'])) {
$chartSettings['continuous'] = 'off';
}
// set default font size if needed
if (empty($chartSettings['fontSize'])) {
$chartSettings['fontSize'] = 8;
}
// default for legend // default for legend
$chartSettings['legend'] = false; $chartSettings['legend'] = false;

View File

@@ -35,6 +35,10 @@ abstract class PMA_pChart_Chart extends PMA_Chart
$this->settings['labelHeight'] = 20; $this->settings['labelHeight'] = 20;
$this->settings['fontSize'] = 8;
$this->settings['continuous'] = 'off';
// 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));
} }

View File

@@ -165,7 +165,7 @@ $url_params['reload'] = 1;
<?php if ($chartSettings['type'] == 'radar') { ?> <?php if ($chartSettings['type'] == 'radar') { ?>
<tr><td colspan="2"> <tr><td colspan="2">
<p> <p>
<?php echo _('When drawing a radar chart all values are normalized to a range [0..10].'); ?> <?php echo __('When drawing a radar chart all values are normalized to a range [0..10].'); ?>
</p> </p>
</td></tr> </td></tr>
<?php } ?> <?php } ?>