From e90d9d148148e66bc99e204e0e29be8e732d4153 Mon Sep 17 00:00:00 2001
From: Mark Tompsett <mtompset@hotmail.com>
Date: Thu, 27 Apr 2017 13:15:31 -0400
Subject: [PATCH] Bug 3311: Borrower stats HTML clean up.

---
 .../prog/en/modules/reports/borrowers_stats.tt     | 28 ++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
index 3e7f04c..49a9fa5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_stats.tt
@@ -85,7 +85,7 @@
 			<td><input type="radio" name="Column" required value="categorycode" /></td>
             <td>
                 <select name="Filter"  size="1" id="catcode">
-                    <option value=""></option>
+                    <option value="">Not filtered by category</option>
                     [% FOREACH patron_category IN patron_categories %]
                         <option value="[% patron_category.categorycode %]">[% patron_category.description %]</option>
                     [% END %]
@@ -95,7 +95,7 @@
 			<tr>
 			<td>Patron status</td>
 			<td colspan="2"></td>
-			<td ><select name="status"><option value=""> </option><option value="debarred">restricted</option><option value="gonenoadress">gone no address</option><option value="lost">lost</option></select></td>
+			<td ><select name="status"><option value="">Not filtered by status</option><option value="debarred">restricted</option><option value="gonenoadress">gone no address</option><option value="lost">lost</option></select></td>
 			</tr>
             <tr>
 			<td>Patron activity</td>
@@ -106,7 +106,7 @@
 			</select>
 			<label for="period">years of activity</label> 
 			</td>
-			<td><select name="activity"><option value=""> </option><option value="active">active</option><option value="nonactive">no active</option></select></td>
+			<td><select name="activity"><option value="">Not filtered by activity</option><option value="active">active</option><option value="nonactive">no active</option></select></td>
 			</tr>
 
 			<tr>
@@ -114,7 +114,7 @@
 			<td><input type="radio" name="Line" value="zipcode" /></td>
 			<td><input type="radio" name="Column" value="zipcode" /></td>
 			<td><select name="Filter"  size="1" id="zipcode">
-				<option value=""> </option>
+				<option value="">Not filtered by ZIP/Postal code</option>
 				[% FOREACH ZIP_LOO IN ZIP_LOOP %]
 				<option value="[% ZIP_LOO.zipcode %]">[% ZIP_LOO.zipcode %]</option>
 				[% END %]
@@ -123,7 +123,7 @@
 			</tr>
 			<tr>
 			<td colspan="2"><select name="digits" id="digits">
-			<option value=""> </option>
+			<option value="">Not filtered by digits</option>
 			<option value ="1">1</option>
 			<option value ="2">2</option>
 			<option value ="3">3</option>
@@ -146,7 +146,7 @@
 			<td><input type="radio" name="Column" value="branchcode" /></td>
 			<td>
                 <select name="Filter"  size="1" id="branch">
-                <option value=""></option>
+                <option value="">Not filtered by library</option>
                 [% FOREACH l IN Branches.all( unfiltered => 1 ) %]
                     <option value="[% l.branchcode %]">[% l.branchcode %] - [% l.branchname || 'UNKNOWN' %]</option>
                 [% END %]
@@ -167,7 +167,7 @@
                 <td><input type="radio" name="Column" value="sex" /></td>
                 <td>
                     <select id="sex" size="1" name="Filter">
-                        <option value="" />
+                        <option value="">Not filtered by sex</option>
                         <option value="M">Men</option>
                         <option value="F">Women</option>
                     </select>
@@ -180,7 +180,7 @@
 				<td><input type="radio" name="Column" value="sort1" /></td>
 				<td>
 					<select id="sort1" size="1" name="Filter">
-					<option value=""/>
+					<option value="">Not filtered by Sort1</option>
 					[% FOREACH SORT1_LOO IN SORT1_LOOP %]
 						<option value="[% SORT1_LOO.authorized_value %]">[% SORT1_LOO.lib %]</option>
 					[% END %]
@@ -188,7 +188,9 @@
 				</td>
 				</tr>
             [% ELSE %]
-                <input type="hidden" name="Filter" />
+                <tr style="display:none"><td></td><td></td><td></td><td>
+                <input type="hidden" name="Filter">
+                </td></tr>
 			[% END %]
 			[% IF ( SORT2_LOOP ) %]
                 <tr>
@@ -197,7 +199,7 @@
 				<td><input type="radio" name="Column" value="sort2" /></td>
 				<td>
 					<select id="sort2" size="1" name="Filter">
-					<option value=""/>
+					<option value="">Not filtered by Sort2</option>
 					[% FOREACH SORT2_LOO IN SORT2_LOOP %]
 						<option value="[% SORT2_LOO.value %]">[% SORT2_LOO.value %]</option>
 					[% END %]
@@ -205,7 +207,9 @@
 				</td>
 				</tr>
             [% ELSE %]
-                <input type="hidden" name="Filter" />
+                <tr style="display:none"><td></td><td></td><td></td><td>
+                <input type="hidden" name="Filter">
+                </td></tr>
 			[% END %]
             [% IF ( ExtendedPatronAttributes ) %]
                 <tr>
@@ -235,7 +239,7 @@
                     <td>
                         [% IF ( patron_attribute.use_dropdown ) %]
                             <select name="Filter_patron_attr.[% patron_attribute.code %]"  >
-                                <option value="" />
+                                <option value="">Not filtered by patron attributes</option>
                                 [% FOREACH auth_val_loo IN patron_attribute.auth_val_loop %]
                                     <option value="[% auth_val_loo.authorised_value %]" >
                                         [% auth_val_loo.lib %]
-- 
2.1.4