From 8e5d66a27986f3e1f0970054e50648f632afef7b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Thu, 6 Aug 2020 19:09:43 +0000
Subject: [PATCH] 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>
(cherry picked from commit 1920c92d811dc5477a9cb1064f6f7e2dd473a380)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc         | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc        | 2 +-
 .../intranet-tmpl/prog/en/includes/cities-admin-search.inc      | 2 +-
 .../intranet-tmpl/prog/en/includes/contracts-admin-search.inc   | 2 +-
 .../intranet-tmpl/prog/en/includes/currencies-admin-search.inc  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/desks-admin-search.inc | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc      | 2 +-
 .../intranet-tmpl/prog/en/includes/patrons-admin-search.inc     | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc     | 2 +-
 .../intranet-tmpl/prog/en/includes/suggestions-add-search.inc   | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc | 2 +-
 15 files changed, 15 insertions(+), 15 deletions(-)

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 2ebd358afe..cdafcfe01f 100644
--- 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 8eedbee2bb..20c7d9d2c3 100644
--- 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 35b745d134..ef3a232e78 100644
--- 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 5a6fddb1f7..8892c0d264 100644
--- 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 9a34f7610f..294af36d9c 100644
--- 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 af045ad464..d6060cea7d 100644
--- 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 c7634cab60..70e00c92b2 100644
--- 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 4dd0618db2..5b67592d68 100644
--- 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 7bb1bae5d0..3f60b68533 100644
--- 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 4ca57adb41..b8aee067d9 100644
--- 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 8640c2268e..121df410ab 100644
--- 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 0ce7e2afe4..996f7cacad 100644
--- 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 534baab879..ee25012e20 100644
--- 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 47fd41dd56..12b3fab3a5 100644
--- 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 19409f15d0..51f77ee0b3 100644
--- 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>
-- 
2.39.5