diff options
| -rw-r--r-- | templates/tbl_chart.phtml | 36 | ||||
| -rw-r--r-- | themes/original/css/common.css.php | 7 | ||||
| -rw-r--r-- | themes/pmahomme/css/common.css.php | 6 |
3 files changed, 34 insertions, 15 deletions
diff --git a/templates/tbl_chart.phtml b/templates/tbl_chart.phtml index 419c91473f..ee17eaa582 100644 --- a/templates/tbl_chart.phtml +++ b/templates/tbl_chart.phtml @@ -11,17 +11,27 @@ <legend> <?php echo __('Display chart'); ?> </legend> - <div style="float:left; width:420px;"> - <input type="radio" name="chartType" value="bar" id="radio_bar" /> - <label for ="radio_bar"><?php echo _pgettext('Chart type', 'Bar') ?></label> - <input type="radio" name="chartType" value="column" id="radio_column" /> - <label for ="radio_column"><?php echo _pgettext('Chart type', 'Column') ?></label> - <input type="radio" name="chartType" value="line" id="radio_line" checked="checked" /> - <label for ="radio_line"><?php echo _pgettext('Chart type', 'Line') ?></label> - <input type="radio" name="chartType" value="spline" id="radio_spline" /> - <label for ="radio_spline"><?php echo _pgettext('Chart type', 'Spline') ?></label> - <input type="radio" name="chartType" value="area" id="radio_area" /> - <label for ="radio_area"><?php echo _pgettext('Chart type', 'Area') ?></label> + <div class="chartOption"> + <div class="formelement"> + <input type="radio" name="chartType" value="bar" id="radio_bar" /> + <label for ="radio_bar"><?php echo _pgettext('Chart type', 'Bar') ?></label> + </div> + <div class="formelement"> + <input type="radio" name="chartType" value="column" id="radio_column" /> + <label for ="radio_column"><?php echo _pgettext('Chart type', 'Column') ?></label> + </div> + <div class="formelement"> + <input type="radio" name="chartType" value="line" id="radio_line" checked="checked" /> + <label for ="radio_line"><?php echo _pgettext('Chart type', 'Line') ?></label> + </div> + <div class="formelement"> + <input type="radio" name="chartType" value="spline" id="radio_spline" /> + <label for ="radio_spline"><?php echo _pgettext('Chart type', 'Spline') ?></label> + </div> + <div class="formelement"> + <input type="radio" name="chartType" value="area" id="radio_area" /> + <label for ="radio_area"><?php echo _pgettext('Chart type', 'Area') ?></label> + </div> <span class="span_pie" style="display:none;"> <input type="radio" name="chartType" value="pie" id="radio_pie" /> <label for ="radio_pie"><?php echo _pgettext('Chart type', 'Pie') ?></label> @@ -43,7 +53,7 @@ <input type="text" name="chartTitle" value="<?php echo __('Chart title'); ?>"> </div> <?php $xaxis = null; ?> - <div style="float:left; padding-left:40px;"> + <div class="chartOption"> <label for="select_chartXAxis"><?php echo __('X-Axis:'); ?></label> <select name="chartXAxis" id="select_chartXAxis"> <?php foreach ($keys as $idx => $key) : ?> @@ -87,7 +97,7 @@ }?>" /> </div> - <div style="float:left; padding-left:40px;"> + <div class="chartOption"> <label for="xaxis_panel"> <?php echo __('X-Axis label:'); ?> </label> diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index ee35492e44..f03beebc01 100644 --- a/themes/original/css/common.css.php +++ b/themes/original/css/common.css.php @@ -1170,6 +1170,13 @@ div#profilingchart { } /* end profiling */ +/* table charting */ +.chartOption { + float: <?php echo $left; ?>; + margin-<?php echo $right;?>: 40px; +} +/* end table charting */ + /* querybox */ div#sqlquerycontainer { diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index f1c53835a4..f490812e2c 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -1556,14 +1556,16 @@ div#profilingchart { /* end profiling */ /* table charting */ - #resizer { border: 1px solid silver; } #inner-resizer { /* make room for the resize handle */ padding: 10px; } - +.chartOption { + float: <?php echo $left; ?>; + margin-<?php echo $right;?>: 40px; +} /* end table charting */ /* querybox */ |