@@ -, +, @@ - Run a report which returns more than one column. - On the report results page, click the "Create chart" button. The chart settings form should appear in a modal window. - Confirm that the form controls work correctly: Each label should give focus to the correct input. Changing the chart type should show or hide the appropriate form fields. - Click the "Draw" button. The modal should disappear and the chart should be shown. - Above the chart should be a "Hide chart" link which works to hide (and then show) the chart. --- koha-tmpl/intranet-tmpl/prog/css/reports.css | 36 ++++ koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc | 181 +++++++++++---------- .../prog/en/includes/reports-toolbar.inc | 3 +- .../en/modules/reports/guided_reports_start.tt | 77 ++++----- 4 files changed, 172 insertions(+), 125 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/reports.css +++ a/koha-tmpl/intranet-tmpl/prog/css/reports.css @@ -72,4 +72,40 @@ del { .clear_filter i { color: #C00; +} + +fieldset.rows { + background-color: transparent; + border: 0; + font-size: 100%; + margin: 0; + padding: 0; +} + +fieldset.rows label, +fieldset.rows span.label { + width: 12em; +} + +fieldset.rows legend { + margin-left: 0; +} + +fieldset.rows .column_config_row { + display: flex; + flex-wrap: wrap; + justify-content: flex-start; +} + +fieldset.rows .chart-column-conf { + padding: .7em; + width: auto; +} + +fieldset.rows .chart-column-conf label { + display: block; + float: none; + margin: .4em 0; + text-align: left; + width: auto; } --- a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc +++ a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc @@ -1,96 +1,105 @@ -