From b15cb6bbdbb3c783bb416afbd2ddd991a54f1b67 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Wed, 28 Sep 2016 11:04:18 +0100
Subject: [PATCH] Bug 17282: Use fieldset.rows

---
 koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc | 29 +++++++++++-----------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc
index 0ec5a32..1d69a6f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/chart.inc
@@ -1,9 +1,10 @@
 <div id="makechart">
     [% supposed_x = header_row.shift.cell %]
 
-    <form>
-        <fieldset>
-            <div>
+    <fieldset class="rows">
+        <legend>Draw a chart</legend>
+        <ol>
+            <li>
                 <label for="chart-type">Chart type</label>
                 <select name="chart-type" id="chart-type">
                     <option value="pie">Pie</option>
@@ -15,9 +16,9 @@
                     <label for="horizontal">Horizontal bar:</label>
                     <input id="horizontal" name="column-horizontal" type="checkbox">
                 </div>
-            <div>
+            </li>
 
-            <div>
+            <li>
                 <label for="x_element">x column:</label>
                 <select id="x_element" name="x">
                     <option value="[% supposed_x %]" selected>[% supposed_x %]</option>
@@ -25,13 +26,13 @@
                         <option value="[% header.cell %]">[% header.cell %]</option>
                     [% END %]
                 </select>
-            </div>
+            </li>
 
             <label for="exclude-last">Exclude last line (Rollup)</label>
             <input id="exclude-last" name="chart-exclude-last" type="checkbox">
 
             [% column = 1 %]
-            <div>
+            <li>
                 [% FOREACH header IN header_row %]
                     <fieldset class="chart-column-conf" id="column_[% column %]" style="display: inline !important;">
                         <legend>
@@ -41,7 +42,7 @@
                             </a>
                         </legend>
                         <div>
-                            <label for="y_[% column %]">y:</label>
+                            <label for="y_[% column %]" >y:</label>
                             <select id="y_[% column %]" name="y">
                                 <option value="[% supposed_x %]" selected>[% supposed_x %]</option>
                                 [% FOREACH h IN header_row %]
@@ -76,12 +77,12 @@
                     </fieldset>
                     [% column = column + 1 %]
                 [% END %]
-            </div>
+            </li>
 
-            <div>
-                <button id="draw-chart" type="button">Draw</button>
-            </div>
-        </fieldset>
-    </form>
+            <li>
+                <button id="draw-chart"  class="btn">Draw</button>
+            </li>
+        </ol>
+    </fieldset>
     <div id="chart"></div>
 </div>
-- 
2.7.4