[Koha-patches] [PATCH] Bug 3134 [Follow-up] Ability to select multiple reports to delete at once

[Owen Leonard]

This follow-up moves the checkboxes into a separate column from the
report ID in order to prevent visual inconsistencies.

To test, repeat the test plan from the original patch:

You must have two or more saved reports to delete. Deletion
should work properly when:

- Selecting one report for deletion by checking the box.
- Selecting more than one report for deletion by checking boxes.
- Clicking the old "Delete" link

Clicking the delete button should prompt you to confirm. Clicking cancel
should cancel.

Clicking the delete button when no boxes are checked should trigger an
alert asking you to select reports for deletion.
---
 .../en/modules/reports/guided_reports_start.tt     |   14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index 9f35e08..60bbe28 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -72,7 +72,7 @@ $(document).ready(function(){
         'iDisplayLength': 20,
         'aaSorting': [[ 1, "asc" ]],
         'aoColumnDefs': [
-            { 'bSortable': false, 'bSearchable':false, 'aTargets': [-1, -2, -3, -4] },
+            { 'bSortable': false, 'bSearchable':false, 'aTargets': [0, -1, -2, -3, -4] },
             { 'bSearchable': false, 'aTargets': [3, 4] }
         ],
         'oLanguage': {
@@ -87,16 +87,16 @@ $(document).ready(function(){
                 $(this).remove();
             }
         });
-        rtable.fnFilter('', 3);
         rtable.fnFilter('', 4);
-        rtable.fnSetColumnVis(3, true);
+        rtable.fnFilter('', 5);
         rtable.fnSetColumnVis(4, true);
+        rtable.fnSetColumnVis(5, true);
 
         var g_id = $(ui.tab).attr('id')
         var g_name = $(ui.tab).text();
         if (g_id && g_id.length > 0) {
-            rtable.fnFilter('^' + g_name + '$', 3, true, true, true, false);
-            rtable.fnSetColumnVis(3, false);
+            rtable.fnFilter('^' + g_name + '$', 4, true, true, true, false);
+            rtable.fnSetColumnVis(4, false);
             for(var i in group_subgroups[g_id]) {
                 $("#subgroup_filter").append(
                     '<option value="' + group_subgroups[g_id][i][0] + '">'
@@ -287,6 +287,7 @@ canned reports and writing custom SQL reports.</p>
         <table id="table_reports">
             <thead>
                 <tr>
+                    <th> </th>
                     <th>ID</th>
                     <th>Report name</th>
                     <th>Type</th>
@@ -304,7 +305,8 @@ canned reports and writing custom SQL reports.</p>
             <tbody>
                 [% FOREACH savedreport IN savedreports %]
                     [% UNLESS ( loop.odd ) %]<tr class="odd">[% ELSE %]<tr>[% END %]
-                        <td><label>[% savedreport.id %] <input type="checkbox" name="ids" value="[% savedreport.id %]" /></label></td>
+                        <td><input type="checkbox" name="ids" value="[% savedreport.id %]" /></td>
+                        <td><label for="ids">[% savedreport.id %]</label></td>
                         <td>
                             [% IF ( savedreport.report_name ) %]
                                 [% savedreport.report_name %]
-- 
1.7.9.5