Bug 14608: Follow up on labels and search box
authorMark Tompsett <mtompset@hotmail.com>
Fri, 13 Jan 2017 18:33:05 +0000 (13:33 -0500)
committerJulian Maurice <julian.maurice@biblibre.com>
Wed, 10 May 2017 11:53:49 +0000 (13:53 +0200)
This addresses concerns raised in comment #26 and comment #27.

Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
(cherry picked from commit ffbeae312bb472a58adf33e13b8c3d5f9124f0af)
Signed-off-by: Julian Maurice <julian.maurice@biblibre.com>

koha-tmpl/intranet-tmpl/prog/en/modules/admin/usage_statistics.tt

index 4b943ea..5da2693 100644 (file)
@@ -9,7 +9,7 @@
 
 <body id="admin_usage_statistics" class="admin">
 [% INCLUDE 'header.inc' %]
-[% INCLUDE 'patrons-admin-search.inc' %]
+[% INCLUDE 'cat-search.inc' %]
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; Usage statistics</div>
 
@@ -50,8 +50,8 @@
         <fieldset class="rows">
             <ol>
                 <li>
-                    <span class="label">Share my Koha usage statistics: </span>
-                    <select name="UsageStats">
+                    <label for="UsageStats">Share my Koha usage statistics: </label>
+                    <select name="UsageStats" id="UsageStats">
                     [% IF Koha.Preference('UsageStats') %]
                         <option value="1" selected="selected">Yes</option>
                         <option value="0">No</option>
                     </select>
                 </li>
                 <li>
-                    <span class="label">Your country: </span>
+                    <label for="UsageStatsCountry">Your country: </label>
                     [% SET UsageStatsCountry = Koha.Preference('UsageStatsCountry') %]
                     [% SET IsUsageStatsCountryValid = 0 %]
                     [% IF NOT UsageStatsCountry %]
                         [% SET IsUsageStatsCountryValid = 1 %]
                     [% END %]
-                    <select name="UsageStatsCountry">
-                        <option value=""></option>
+                    <select name="UsageStatsCountry" id="UsageStatsCountry">
+                        <option value="">&nbsp;</option>
                         [% FOR country IN [
 "Afghanistan",
 "Albania",
                     [% END %]
                 </li>
                 <li>
-                    <span class="label">Library name: </span>
-                    <input type="text" value="[% Koha.Preference('UsageStatsLibraryName') %]" name="UsageStatsLibraryName" />
+                    <label for="UsageStatsLibraryName">Library name: </label>
+                    <input type="text" value="[% Koha.Preference('UsageStatsLibraryName') %]" name="UsageStatsLibraryName" id="UsageStatsLibraryName" />
                 </li>
                 <li>
-                    <span class="label">Library type: </span>
+                    <label for="UsageStatsLibraryType">Library type: </label>
                     [% SET UsageStatsLibraryType = Koha.Preference('UsageStatsLibraryType') %]
-                    <select name="UsageStatsLibraryType">
-                        <option value=""></option>
+                    <select name="UsageStatsLibraryType" id="UsageStatsLibraryType">
+                        <option value="">&nbsp;</option>
                         [% IF UsageStatsLibraryType == 'public' %]
                             <option value="public" selected="selected">Public</option>
                         [% ELSE %]
                     </select>
                 </li>
                 <li>
-                    <span class="label">Library URL: </span>
-                    <input type="text" name="UsageStatsLibraryUrl" value="[% Koha.Preference('UsageStatsLibraryUrl') %]" />
+                    <label for="UsageStatsLibraryUrl">Library URL: </label>
+                    <input type="text" name="UsageStatsLibraryUrl" value="[% Koha.Preference('UsageStatsLibraryUrl') %]" id="UsageStatsLibraryUrl" />
                 </li>
                 <li>
                     <span class="label">Last update: </span>