Bug 25954: (follow-up) Correct label "for" attribute

This patch updates a couple of search include forms to change the "for"
attribute of the label. Although "idx" is the first field in this
situation, the label's text applies to the keyword field so it should
give focus to the keyword field.

Signed-off-by: Josef Moravec <josef.moravec@gmail.com>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
index 2ebd358..cdafcfe 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
@@ -27,7 +27,7 @@
 <div id="catalog_search" class="residentsearch">
     <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
         [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-            <label class="tip" for="idx">Enter search keywords:</label>
+            <label class="tip" for="search-form">Enter search keywords:</label>
             [% INCLUDE 'search_indexes.inc' %]
         [% ELSE %]
             <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
index 8eedbee..20c7d9d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
@@ -33,7 +33,7 @@
         <div id="catalog_search" class="residentsearch">
             <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
                 [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                    <label class="tip" for="idx">Enter search keywords:</label>
+                    <label class="tip" for="search-form">Enter search keywords:</label>
                     [% INCLUDE 'search_indexes.inc' %]
                 [% ELSE %]
                     <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
index 35b745d..ef3a232 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
@@ -18,7 +18,7 @@
 <div id="catalog_search" class="residentsearch">
     <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
         [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-            <label class="tip" for="idx">Enter search keywords:</label>
+            <label class="tip" for="search-form">Enter search keywords:</label>
             [% INCLUDE 'search_indexes.inc' %]
         [% ELSE %]
             <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
index 5a6fddb..8892c0d 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
@@ -24,7 +24,7 @@
 <div id="catalog_search" class="residentsearch">
     <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
         [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-            <label class="tip" for="idx">Enter search keywords:</label>
+            <label class="tip" for="search-form">Enter search keywords:</label>
             [% INCLUDE 'search_indexes.inc' %]
         [% ELSE %]
             <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
index 9a34f76..294af36 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cities-admin-search.inc
@@ -16,7 +16,7 @@
     <div id="catalog_search" class="residentsearch">
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="idx">Enter search keywords:</label>
+                <label class="tip" for="search-form">Enter search keywords:</label>
                 [% INCLUDE 'search_indexes.inc' %]
             [% ELSE %]
                 <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
index af045ad..d6060ce 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
@@ -17,7 +17,7 @@
     <div id="catalog_search" class="residentsearch">
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
         [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-            <label class="tip" for="idx">Enter search keywords:</label>
+            <label class="tip" for="search-form">Enter search keywords:</label>
             [% INCLUDE 'search_indexes.inc' %]
         [% ELSE %]
             <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
index c7634ca..70e00c9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
@@ -14,7 +14,7 @@
     <div id="catalog_search" class="residentsearch">
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="idx">Enter search keywords:</label>
+                <label class="tip" for="search-form">Enter search keywords:</label>
                 [% INCLUDE 'search_indexes.inc' %]
             [% ELSE %]
                 <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
index 4dd0618..5b67592 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc
@@ -16,7 +16,7 @@
     <div id="catalog_search" class="residentsearch">
                 <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="idx">Enter search keywords:</label>
+                <label class="tip" for="search-form">Enter search keywords:</label>
                 [% INCLUDE 'search_indexes.inc' %]
             [% ELSE %]
                 <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
index 7bb1bae..3f60b68 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
@@ -14,7 +14,7 @@
     <div id="catalog_search" class="residentsearch">
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="idx">Enter search keywords:</label>
+                <label class="tip" for="search-form">Enter search keywords:</label>
                 [% INCLUDE 'search_indexes.inc' %]
             [% ELSE %]
                 <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
index 4ca57ad..b8aee06 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
@@ -101,7 +101,7 @@
     <div id="catalog_search" class="residentsearch">
         <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="idx">Enter search keywords:</label>
+                <label class="tip" for="search-form">Enter search keywords:</label>
                 [% INCLUDE 'search_indexes.inc' %]
             [% ELSE %]
                 <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
index 8640c22..121df41 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
@@ -14,7 +14,7 @@
     <div id="catalog_search" class="residentsearch">
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="idx">Enter search keywords:</label>
+                <label class="tip" for="search-form">Enter search keywords:</label>
                 [% INCLUDE 'search_indexes.inc' %]
             [% ELSE %]
                 <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
index 0ce7e2a..996f7ca 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
@@ -16,7 +16,7 @@
     <div id="catalog_search" class="residentsearch">
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="idx">Enter search keywords:</label>
+                <label class="tip" for="search-form">Enter search keywords:</label>
                 [% INCLUDE 'search_indexes.inc' %]
             [% ELSE %]
                 <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
index 534baab..ee25012 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
@@ -23,7 +23,7 @@
       <div id="catalog_search" class="residentsearch">
         <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="idx">Enter search keywords:</label>
+                <label class="tip" for="search-form">Enter search keywords:</label>
                 [% INCLUDE 'search_indexes.inc' %]
             [% ELSE %]
                 <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
index 47fd41d..12b3fab 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
@@ -19,7 +19,7 @@
     <div id="catalog_search" class="residentsearch">
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="idx">Enter search keywords:</label>
+                <label class="tip" for="search-form">Enter search keywords:</label>
                 [% INCLUDE 'search_indexes.inc' %]
             [% ELSE %]
                 <label class="tip" for="search-form">Enter search keywords:</label>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
index 19409f1..51f77ee 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
@@ -16,7 +16,7 @@
     <div id="catalog_search" class="residentsearch">
                <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
-                <label class="tip" for="idx">Enter search keywords:</label>
+                <label class="tip" for="search-form">Enter search keywords:</label>
                 [% INCLUDE 'search_indexes.inc' %]
             [% ELSE %]
                 <label class="tip" for="search-form">Enter search keywords:</label>