Attachment 106659 Details for Bug 25954 – Bug 25954: Replace paragraph tags with labels in header search forms

[patch] Bug 25954: Replace paragraph tags with labels in header search forms

Bug-25954-Replace-paragraph-tags-with-labels-in-he.patch (text/plain), 47.24 KB, created by Owen Leonard on 2020-07-08 15:39:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2020-07-08 15:39:34 UTC

Size: 47.24 KB

patch

obsolete

>From ca47f93b5d572c1f4bf6e01f1a9760bfa4087dda Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Wed, 8 Jul 2020 13:40:37 +0000
>Subject: [PATCH] Bug 25954: Replace paragraph tags with labels in header
> search forms
>
>This patch replaces instances of <p class="tip"> with <label
>class="tip"> in header search forms where there is not already a label
>tag corresponding to the first form field.
>
>In cases where there is already a label on the first form field the <p>
>is kept.
>
>To test, apply the patch and rebuild the staff client CSS
>(https://wiki.koha-community.org/wiki/Working_with_SCSS_in_the_OPAC_and_staff_client)
>
>Test the header search forms on the following pages:
>
> - Staff interface home page
> - Acquisitions home
> - Acquisitions -> Vendor -> Contracts
> - Acquisitions -> Vendor -> Add to basket -> From a suggestion
> - Advanced catalog search
> - Authorities
> - Administration
> - Administration -> Funds
> - Administration -> Desks (UseCirculationDesks must be enabled)
> - Administration -> Cities and towns
> - Administration -> Currencies and exchange rates
> - Administration -> Patron categories
> - Administration -> Z39.50/SRU servers
> - Catalog -> Search results
> - Cataloging
> - Circulation
> - Circulation -> Check in
> - Patrons
> - Serials
> - Tools -> Notices and Slips
>
>In each case, check that the search form labels work as expected to move
>focus to the corresponding form field.
>---
> koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss |  5 +++++
> .../prog/en/includes/acquisitions-search.inc           |  2 +-
> .../intranet-tmpl/prog/en/includes/adv-search.inc      |  6 +++---
> .../prog/en/includes/authorities-search.inc            | 18 +++++++++---------
> .../prog/en/includes/budgets-admin-search.inc          |  2 +-
> .../intranet-tmpl/prog/en/includes/cat-search.inc      | 12 ++++++++----
> .../prog/en/includes/cataloging-search.inc             | 16 ++++++++++------
> .../intranet-tmpl/prog/en/includes/checkin-search.inc  | 10 +++++++---
> .../intranet-tmpl/prog/en/includes/circ-search.inc     | 12 ++++++++----
> .../prog/en/includes/cities-admin-search.inc           | 12 ++++++++----
> .../prog/en/includes/contracts-admin-search.inc        | 12 ++++++++----
> .../prog/en/includes/currencies-admin-search.inc       | 12 ++++++++----
> .../prog/en/includes/desks-admin-search.inc            | 12 ++++++++----
> .../intranet-tmpl/prog/en/includes/home-search.inc     |  8 ++++----
> .../intranet-tmpl/prog/en/includes/letters-search.inc  | 12 ++++++++----
> .../prog/en/includes/patron-search-box.inc             |  2 +-
> .../intranet-tmpl/prog/en/includes/patron-search.inc   | 18 +++++++++++-------
> .../prog/en/includes/patrons-admin-search.inc          | 12 ++++++++----
> .../prog/en/includes/prefs-admin-search.inc            | 12 ++++++++----
> .../intranet-tmpl/prog/en/includes/search_indexes.inc  |  2 +-
> .../intranet-tmpl/prog/en/includes/serials-search.inc  |  8 ++++++--
> .../prog/en/includes/suggestions-add-search.inc        |  8 ++++++--
> .../prog/en/includes/z3950-admin-search.inc            | 12 ++++++++----
> .../intranet-tmpl/prog/en/modules/admin/authtypes.tt   |  2 +-
> 24 files changed, 146 insertions(+), 81 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>index b55b97eea8..ed925ae83d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -3188,6 +3188,11 @@ label {
>         margin-left: 20px;
>         padding-left: 0;
>     }
>+
>+    &.tip {
>+        display: block;
>+        margin: .5em 0;
>+    }
> }
> 
> .radio {
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>index 220e0e18fb..22bcc14b43 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc
>@@ -2,7 +2,7 @@
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1>
> <div id="header_search">
> <div id="supplier_search" class="residentsearch">
>-	<p class="tip">Search vendors:</p>
>+    <label class="tip" for="supplier">Search vendors:</label>
>         <form name="findsupplier" action="/cgi-bin/koha/acqui/booksellers.pl" method="post">
>            <input type="text" size="25" name="supplier" id="supplier" class="focus" />
>             <input type="submit" class="submit" value="Submit" /></form>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
>index 500134626f..a62f8e3556 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/adv-search.inc
>@@ -6,14 +6,14 @@
>         [% INCLUDE 'patron-search-box.inc' %]
>         [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>             <div id="checkin_search" class="residentsearch">
>-                <p class="tip">Scan a barcode to check in:</p>
>+                <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
>                 <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>                     <input type="text" name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" />
>                     <input value="Submit" class="submit" type="submit" />
>                 </form>
>             </div>
>             <div id="renew_search" class="residentsearch">
>-                <p class="tip">Scan a barcode to renew:</p>
>+                <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
>                 <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>                     <input type="text" class="head-searchbox" name="barcode" id="ren_barcode" size="40" />
>                     <input value="Submit" class="submit" type="submit" />
>@@ -23,7 +23,7 @@
> 
>         [% IF CAN_user_borrowers_edit_borrowers %]
>             <div id="patron_search" class="residentsearch">
>-                <p class="tip">Enter patron card number or partial name:</p>
>+                <label class="tip" for="searchmember">Enter patron card number or partial name:</label>
>                 <form action="/cgi-bin/koha/members/member.pl" method="post">
>                     <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text" />
>                     <input type="hidden" name="quicksearch" value="1" />
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
>index 3fa669a60d..06e6b5b196 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-search.inc
>@@ -3,11 +3,11 @@
> 
> <div id="header_search" class="residentsearch">
>     <div id="mainmain_heading" class="residentsearch">
>-    <p class="tip">Enter main heading ($a only):</p>
>     <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
>+        <label class="tip" for="authtype_main_heading_a">Enter main heading ($a only):</label>
>         <input type="hidden" name="op" value="do_search" />
>         <input type="hidden" name="type" value="intranet" />
>-        <select name="authtypecode">
>+        <select name="authtypecode" id="authtype_main_heading_a">
>         [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
>         [% FOREACH authority_type IN authority_types %]
>             [% IF authority_type.authtypecode == authtypecode %]
>@@ -59,11 +59,11 @@
>     </form>
>     </div>
>     <div id="main_heading" class="residentsearch">
>-    <p class="tip">Enter main heading:</p>
>     <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
>+        <label class="tip" for="authtype_main_heading">Enter main heading:</label>
>         <input type="hidden" name="op" value="do_search" />
>         <input type="hidden" name="type" value="intranet" />
>-        <select name="authtypecode">
>+        <select name="authtypecode" id="authtype_main_heading">
>         [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
>         [% FOREACH authority_type IN authority_types %]
>             [% IF authority_type.authtypecode == authtypecode %]
>@@ -93,7 +93,7 @@
>             <option value="is">is exactly</option>
>             [% END %]
>         </select>
>-        <input id="value_mainentry" type="text" name="value" value="[% value | html %]" class="head-searchbox" />
>+        <input id="value_mainheading" type="text" name="value" value="[% value | html %]" class="head-searchbox" />
>         <select name="orderby">
>             [% IF ( orderby == 'HeadingAsc' ) %]
>             <option value="HeadingAsc" selected="selected">Heading A-Z</option>
>@@ -115,11 +115,11 @@
>     </form>
>     </div>
>     <div id="matchheading_search" class="residentsearch">
>-    <p class="tip">Enter any heading:</p>
>     <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
>+        <label class="tip" for="authtype_all_headings">Enter any heading:</label>
>         <input type="hidden" name="op" value="do_search" />
>         <input type="hidden" name="type" value="intranet" />
>-        <select name="authtypecode">
>+        <select name="authtypecode" id="authtype_all_headings">
>         [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
>         [% FOREACH authority_type IN authority_types %]
>             [% IF authority_type.authtypecode == authtypecode %]
>@@ -169,11 +169,11 @@
>     </form>
>     </div>
>     <div id="entire_record" class="residentsearch">
>-    <p class="tip">Enter any authority field:</p>
>     <form action="/cgi-bin/koha/authorities/authorities-home.pl" method="get">
>+        <label class="tip" for="authtype_entire_record">Enter any authority field:</label>
>         <input type="hidden" name="op" value="do_search" />
>         <input type="hidden" name="type" value="intranet" />
>-        <select name="authtypecode">
>+        <select name="authtypecode" id="authtype_entire_record">
>         [% IF (marcflavour == 'UNIMARC' ) %]<option value="">All authority types</option>[% END %]
>         [% FOREACH authority_type IN authority_types %]
>             [% IF authority_type.authtypecode == authtypecode %]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
>index 812f226f8f..894f844a1b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
>@@ -28,8 +28,8 @@
> 
>     [% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-    <p class="tip">Enter search keywords:</p>
>         <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>+            <label class="tip" for="search-form">Enter search keywords:</label>
>              [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>              <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="query form-text" />
>                 <input type="submit" value="Submit"  class="submit" />
>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 b14619bdb1..dfe202309f 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
>@@ -7,16 +7,16 @@
> 
> [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
> <div id="checkin_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to check in:</p>
>     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>+        <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
>         <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" type="text" />
> 
>         <input value="Submit" class="submit" type="submit" />
>     </form>
> </div>
> <div id="renew_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to renew:</p>
>     <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>+        <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
>         <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
>         <input value="Submit" class="submit" type="submit" />
>     </form>
>@@ -25,9 +25,13 @@
> 
> [% IF ( CAN_user_catalogue ) %]
> <div id="catalog_search" class="residentsearch">
>-    <p class="tip">Enter search keywords:</p>
>     <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+            <label class="tip" for="idx">Enter search keywords:</label>
>+            [% INCLUDE 'search_indexes.inc' %]
>+        [% ELSE %]
>+            <label class="tip" for="search-form">Enter search keywords:</label>
>+        [% END %]
>         <input type="text" name="q" id="search-form" size="40" value="[% ms_value | html %]" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>         <input type="submit" class="submit" value="Submit" />
>     </form>
>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 d979f692b4..8eedbee2bb 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
>@@ -3,9 +3,9 @@
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1>
>     <div id="header_search">
>         <div id="addbooks_search" class="residentsearch">
>-        <p class="tip">Search the catalog and the reservoir:</p>
>             <form name="search" action="addbooks.pl">
>-                <input class="head-searchbox" type="text" name="q" size="40" />
>+                <label class="tip" for="cat_search">Search the catalog and the reservoir:</label>
>+                <input class="head-searchbox" type="text" name="q" id="cat_search" size="40" />
>                 <input type="submit" class="submit" value="Submit" />
>             </form>
>         </div>
>@@ -14,15 +14,15 @@
> 
>         [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>         <div id="checkin_search" class="residentsearch">
>-            <p class="tip">Scan a barcode to check in:</p>
>             <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>+                <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
>                 <input class="head-searchbox" type="text" name="barcode" id="ret_barcode" size="40" />
>                 <input value="Submit" class="submit" type="submit" />
>             </form>
>         </div>
>         <div id="renew_search" class="residentsearch">
>-        <p class="tip">Scan a barcode to renew:</p>
>             <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>+                <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
>                 <input class="head-searchbox" type="text" name="barcode" id="ren_barcode" size="40" />
>                 <input value="Submit" class="submit" type="submit" />
>             </form>
>@@ -31,9 +31,13 @@
> 
> 
>         <div id="catalog_search" class="residentsearch">
>-            <p class="tip">Enter search keywords:</p>
>             <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-                [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+                [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+                    <label class="tip" for="idx">Enter search keywords:</label>
>+                    [% INCLUDE 'search_indexes.inc' %]
>+                [% ELSE %]
>+                    <label class="tip" for="search-form">Enter search keywords:</label>
>+                [% END %]
>                 <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>                 <input type="submit" class="submit" value="Submit" />
>             </form>
>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 f56af3e249..35b745d134 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc
>@@ -6,8 +6,8 @@
> 
> [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
> <div id="renew_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to renew:</p>
>     <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>+        <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
>         <input class="head-searchbox" type="text" name="barcode" id="ren_barcode" size="40" />
>         <input value="Submit" class="submit" type="submit" />
>     </form>
>@@ -16,9 +16,13 @@
> 
> [% IF ( CAN_user_catalogue ) %]
> <div id="catalog_search" class="residentsearch">
>-    <p class="tip">Enter search keywords:</p>
>     <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+            <label class="tip" for="idx">Enter search keywords:</label>
>+            [% INCLUDE 'search_indexes.inc' %]
>+        [% ELSE %]
>+            <label class="tip" for="search-form">Enter search keywords:</label>
>+        [% END %]
>         <input class="head-searchbox" type="text" name="q" id="search-form" size="40" />
>         <input type="submit" class="submit" value="Submit"/>
>     </form>
>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 e94b3e4c31..5a6fddb1f7 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
>@@ -6,15 +6,15 @@
>     [% INCLUDE 'patron-search-box.inc' %]
> [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
> <div id="checkin_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to check in:</p>
>     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>+        <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
>         <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" type="text" />
>         <input value="Submit" class="submit" type="submit" />
>     </form>
> </div>
> <div id="renew_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to renew:</p>
>     <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>+        <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
>         <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
>         <input value="Submit" class="submit" type="submit" />
>     </form>
>@@ -22,9 +22,13 @@
> [% END %]
> [% IF ( CAN_user_catalogue ) %]
> <div id="catalog_search" class="residentsearch">
>-    <p class="tip">Enter search keywords:</p>
>     <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+            <label class="tip" for="idx">Enter search keywords:</label>
>+            [% INCLUDE 'search_indexes.inc' %]
>+        [% ELSE %]
>+            <label class="tip" for="search-form">Enter search keywords:</label>
>+        [% END %]
>         <input class="head-searchbox" type="text" name="q" id="search-form" size="40" accesskey="q" />
>         <input type="submit" class="submit" value="Submit"/>
>     </form>
>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 ffde9faf85..9a34f7610f 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
>@@ -3,9 +3,9 @@
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1>
> <div id="header_search">
> 	<div id="city_search" class="residentsearch">
>-    <p class="tip">City search:</p>
> 	<form action="[% script_name | html %]" method="post">
>-        <input class="head-searchbox" type="text" name="city_name_filter" value="[% city_name_filter | html %]" size="40" />
>+        <label class="tip" for="city_name_filter">City search:</label>
>+        <input class="head-searchbox" type="text" name="city_name_filter" id="city_name_filter" value="[% city_name_filter | html %]" size="40" />
> 		<input type="submit" name="submit" value="OK" class="submit" />
> 	</form>
> 	</div>
>@@ -14,9 +14,13 @@
> 
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
> 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+                <label class="tip" for="idx">Enter search keywords:</label>
>+                [% INCLUDE 'search_indexes.inc' %]
>+            [% ELSE %]
>+                <label class="tip" for="search-form">Enter search keywords:</label>
>+            [% END %]
>              <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
> 				<input type="submit" value="Submit"  class="submit" />
> 		</form>
>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 d69495220c..af045ad464 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
>@@ -4,9 +4,9 @@
> 
> <div id="header_search">
> 	<div id="contract_description_search" class="residentsearch">
>-	<p class="tip">Search by contract name or/and description:</p>
> 	<form action="[% script_name | html %]" method="post">
>-        <input class="head-searchbox" type="text" name="searchfield" size="40" value="[% searchfield | html %]" />
>+        <label class="tip" for="searchfield">Search by contract name or/and description:</label>
>+        <input class="head-searchbox" type="text" name="searchfield" id="searchfield" size="40" value="[% searchfield | html %]" />
> 		<input type="submit" class="submit" name="search" value="Search" />
> 	</form>	
> 	</div>
>@@ -15,9 +15,13 @@
> 
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
> 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+        [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+            <label class="tip" for="idx">Enter search keywords:</label>
>+            [% INCLUDE 'search_indexes.inc' %]
>+        [% ELSE %]
>+            <label class="tip" for="search-form">Enter search keywords:</label>
>+        [% END %]
>              <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
> 				<input type="submit" value="Submit"  class="submit" />
> 		</form>
>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 0dfa51b74c..c7634cab60 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
>@@ -3,18 +3,22 @@
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1>
> <div id="header_search">
> 	<div id="currency_search" class="residentsearch">
>-    <p class="tip">Currencies search:</p>
>         <form action="[% script_name | html %]" method="post">
>-                <input class="head-searchbox" type="text" name="description" size="40" value="[% searchfield | html %]" />
>+            <label class="tip" for="description">Currencies search:</label>
>+                <input class="head-searchbox" type="text" name="description" id="description" size="40" value="[% searchfield | html %]" />
>                 <input type="submit" class="submit" name="search" value="Search" />
>         </form>	
> 	</div>
>     [% INCLUDE 'patron-search-box.inc' %]
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
> 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+                <label class="tip" for="idx">Enter search keywords:</label>
>+                [% INCLUDE 'search_indexes.inc' %]
>+            [% ELSE %]
>+                <label class="tip" for="search-form">Enter search keywords:</label>
>+            [% END %]
>              <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
> 				<input type="submit" value="Submit"  class="submit" />
> 		</form>
>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 cde4c70f9a..4dd0618db2 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
>@@ -3,9 +3,9 @@
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName|html %]</a></h1>
> <div id="header_search">
>         <div id="desk_search" class="residentsearch">
>-    <p class="tip">Desk search:</p>
>         <form action="[% script_name|html %]" method="post">
>-        <input class="head-searchbox" type="text" name="desk_name" value="[% searchfield|html %]" size="40" />
>+            <label class="tip" for="desk_name">Desk search:</label>
>+        <input class="head-searchbox" type="text" name="desk_name" id="desk_name" value="[% searchfield|html %]" size="40" />
>                 <input type="submit" name="submit" value="OK" class="submit" />
>         </form>
>         </div>
>@@ -14,9 +14,13 @@
> 
>         [% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-        <p class="tip">Enter search keywords:</p>
>                 <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+                <label class="tip" for="idx">Enter search keywords:</label>
>+                [% INCLUDE 'search_indexes.inc' %]
>+            [% ELSE %]
>+                <label class="tip" for="search-form">Enter search keywords:</label>
>+            [% END %]
>              <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>                                 <input type="submit" value="Submit"  class="submit" />
>                 </form>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
>index 91e6fe452d..eb397b8b5a 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
>@@ -6,14 +6,14 @@
>     [% INCLUDE 'patron-search-box.inc' %]
> [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
> <div id="checkin_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to check in:</p>
>+    <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
>     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>         <input name="barcode" class="head-searchbox" id="ret_barcode" size="40" accesskey="r" type="text" />
>         <input value="Submit" class="submit" type="submit" />
>     </form>
> </div>
> <div id="renew_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to renew:</p>
>+    <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
>         <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>             <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
>             <input value="Submit" class="submit" type="submit" />
>@@ -23,7 +23,7 @@
> 
> [% IF CAN_user_borrowers_edit_borrowers %]
> <div id="patron_search" class="residentsearch">
>-    <p class="tip">Enter patron card number or partial name:</p>
>+    <label class="tip" for="searchmember">Enter patron card number or partial name:</label>
>     <form action="/cgi-bin/koha/members/member.pl" method="post">
>         <input name="searchmember" class="head-searchbox" id="searchmember" size="40" type="text" autocomplete="off" />
>         <input type="hidden" name="quicksearch" value="1" />
>@@ -32,7 +32,7 @@
> </div>[% END %]
> [% IF ( CAN_user_catalogue ) %]
> <div id="catalog_search" class="residentsearch">
>-    <p class="tip">Enter search keywords:</p>
>+    <label class="tip" for="search-form">Enter search keywords:</label>
>     <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>         [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>         <input type="text" name="q" id="search-form" class="head-searchbox" size="40" accesskey="q" />
>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 ce7703b835..7bb1bae5d0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
>@@ -3,18 +3,22 @@
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1>
> <div id="header_search">
> 	<div id="notices_search" class="residentsearch">
>-    <p class="tip">Search existing notices:</p>
> <form action="/cgi-bin/koha/tools/letter.pl" method="post">
>-        <input class="head-searchbox" type="text" name="searchfield" size="40" value="" />
>+        <label class="tip" for="searchfield">Search existing notices:</label>
>+        <input class="head-searchbox" type="text" name="searchfield" id="searchfield" size="40" value="" />
>                 <input type="submit" class="submit" name="search" value="Search" />
>         </form>	
> 	</div>
>     [% INCLUDE 'patron-search-box.inc' %]
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
> 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+                <label class="tip" for="idx">Enter search keywords:</label>
>+                [% INCLUDE 'search_indexes.inc' %]
>+            [% ELSE %]
>+                <label class="tip" for="search-form">Enter search keywords:</label>
>+            [% END %]
>             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
> 				<input type="submit" name="op" value="Submit"  class="submit" />
> 		</form>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
>index c66eefb2a5..726e39d30d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc
>@@ -1,7 +1,7 @@
> [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>     <div id="circ_search" class="residentsearch">
>-    <p class="tip">Enter patron card number or partial name:</p>
>     <form action="/cgi-bin/koha/circ/circulation.pl" id="patronsearch" method="post">
>+    <label class="tip" for="findborrower">Enter patron card number or partial name:</label>
>     [% IF ( PatronAutoComplete ) %]
>     <div class="autocomplete">
>                 <input autocomplete="off" id="findborrower" name="findborrower" size="40" class="head-searchbox focus" type="text" />
>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 6142cd53a5..4ca57adb41 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc
>@@ -8,8 +8,8 @@
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1>
> <div id="header_search">
>     <div id="patron_search" class="residentsearch">
>-    <p class="tip">Enter patron card number or partial name:</p>
>     <form action="/cgi-bin/koha/members/member.pl" method="post">
>+        <label class="tip" for="searchmember">Enter patron card number or partial name:</label>
>     <div class="autocomplete">
>         <input id="searchmember" data-toggle="tooltip" size="25" class="head-searchbox focus" name="searchmember" type="text" value="[% searchmember | html %]" autocomplete="off" />
>         <input type="hidden" name="quicksearch" value="1" />
>@@ -30,9 +30,9 @@
>                   [% display_name = PROCESS patron_fields name=s_o %]
>                   [% NEXT IF !display_name.length %]
>                   [% IF searchfieldstype == s_o %]
>-                      <option selected="selected" value=[% s_o | html %]>[% display_name | $raw %]</option>
>+                      <option selected="selected" value="[% s_o | html %]">[% display_name | $raw %]</option>
>                   [% ELSE %]
>-                      <option value=[% s_o | html %]>[% display_name | $raw %]</option>
>+                      <option value="[% s_o | html %]">[% display_name | $raw %]</option>
>                   [% END %]
>               [% END %]
>             </select>
>@@ -82,15 +82,15 @@
> 
>     [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>     <div id="checkin_search" class="residentsearch">
>-    <p class="tip">Scan a barcode to check in:</p>
>     <form method="post" action="/cgi-bin/koha/circ/returns.pl" autocomplete="off">
>+        <label class="tip" for="ret_barcode">Scan a barcode to check in:</label>
>     <input class="head-searchbox" name="barcode" id="ret_barcode" size="40" accesskey="r" type="text" />
>     <input value="Submit" class="submit" type="submit" />
>     </form>
>     </div>
>         <div id="renew_search" class="residentsearch">
>-        <p class="tip">Scan a barcode to renew:</p>
>             <form method="post" action="/cgi-bin/koha/circ/renew.pl" autocomplete="off">
>+                <label class="tip" for="ren_barcode">Scan a barcode to renew:</label>
>                 <input class="head-searchbox" name="barcode" id="ren_barcode" size="40" type="text" />
>                 <input value="Submit" class="submit" type="submit" />
>             </form>
>@@ -99,9 +99,13 @@
> 
>     [% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-    <p class="tip">Enter search keywords:</p>
>         <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+                <label class="tip" for="idx">Enter search keywords:</label>
>+                [% INCLUDE 'search_indexes.inc' %]
>+            [% ELSE %]
>+                <label class="tip" for="search-form">Enter search keywords:</label>
>+            [% END %]
>              <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>              <input type="submit" name="op" id="opac-submit" value="Submit" class="submit" />
>         </form>
>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 a77b92c6d5..8640c2268e 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
>@@ -3,18 +3,22 @@
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1>
> <div id="header_search">
> 	<div id="patron_category_search" class="residentsearch">
>-    <p class="tip">Search by patron category name:</p>
> 	<form action="[% script_name | html %]" method="post">
>-        <input class="head-searchbox" type="text" name="description" size="40" value="[% searchfield | html %]" />
>+        <label class="tip" for="description">Search by patron category name:</label>
>+        <input class="head-searchbox" type="text" name="description" id="description" size="40" value="[% searchfield | html %]" />
> 		<input type="submit" class="submit" name="search" value="Search" />
> 	</form>	
> 	</div>
>     [% INCLUDE 'patron-search-box.inc' %]
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
> 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+                <label class="tip" for="idx">Enter search keywords:</label>
>+                [% INCLUDE 'search_indexes.inc' %]
>+            [% ELSE %]
>+                <label class="tip" for="search-form">Enter search keywords:</label>
>+            [% END %]
>             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
> 				<input type="submit" value="Submit"  class="submit" />
> 		</form>
>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 8d4aebaeac..0ce7e2afe4 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
>@@ -3,20 +3,24 @@
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1>
> <div id="header_search">
> 	<div id="syspref_search" class="residentsearch">
>-	<p class="tip">System preference search:</p>
> 	    <form action="/cgi-bin/koha/admin/preferences.pl">
>+            <label class="tip" for="searchfield">System preference search:</label>
>         <input type="hidden" name="tab" value="[% last_tab | html %]" />
>         <input type="hidden" name="op" value="search" />
>-        <input class="head-searchbox" type="text" size="40" name="searchfield" value="">
>+        <input class="head-searchbox" type="text" size="40" name="searchfield" id="searchfield" value="">
>         <input type="submit" class="submit" value="Search" />
>     </form>
> 	</div>
>     [% INCLUDE 'patron-search-box.inc' %]
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-<p class="tip">Enter search keywords:</p>
> 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-             [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+                <label class="tip" for="idx">Enter search keywords:</label>
>+                [% INCLUDE 'search_indexes.inc' %]
>+            [% ELSE %]
>+                <label class="tip" for="search-form">Enter search keywords:</label>
>+            [% END %]
>              <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
> 				<input type="submit" value="Submit" class="submit" />
> 		</form>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
>index 97eeb6716e..d4ee49148b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
>@@ -1,5 +1,5 @@
> [% USE Koha %]
>-<select class="advsearch" name="idx">
>+<select class="advsearch" name="idx" id="idx">
>     [% IF ms_kw %]
>         <option selected="selected" value="kw">Keyword</option>
>     [% ELSE %]
>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 977c83799f..534baab879 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
>@@ -21,9 +21,13 @@
>     [% INCLUDE 'patron-search-box.inc' %]
>     [% IF ( CAN_user_catalogue ) %]
>       <div id="catalog_search" class="residentsearch">
>-        <p class="tip">Enter search keywords:</p>
>         <form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-          [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+                <label class="tip" for="idx">Enter search keywords:</label>
>+                [% INCLUDE 'search_indexes.inc' %]
>+            [% ELSE %]
>+                <label class="tip" for="search-form">Enter search keywords:</label>
>+            [% END %]
>           <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
>           <input type="submit" value="Submit"  class="submit" />
>         </form>
>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 6f2da8ec67..47fd41dd56 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
>@@ -17,9 +17,13 @@
> 
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
> 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+                <label class="tip" for="idx">Enter search keywords:</label>
>+                [% INCLUDE 'search_indexes.inc' %]
>+            [% ELSE %]
>+                <label class="tip" for="search-form">Enter search keywords:</label>
>+            [% END %]
>             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
> 				<input type="submit" value="Submit"  class="submit" />
> 		</form>
>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 389d3bdfe6..19409f15d0 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
>@@ -3,9 +3,9 @@
> <h1 id="logo"><a href="/cgi-bin/koha/mainpage.pl">[% LibraryName | html %]</a></h1>
> <div id="header_search">
>     <div id="z3950_search" class="residentsearch">
>-    <p class="tip">Z39.50/SRU server search:</p>
> 	<form action="/cgi-bin/koha/admin/z3950servers.pl" method="post">
>-                <input class="head-searchbox" type="text" name="searchfield" size="40" value="[% searchfield | html %]" />
>+        <label class="tip" for="searchfield">Z39.50/SRU server search:</label>
>+                <input class="head-searchbox" type="text" name="searchfield" id="searchfield" size="40" value="[% searchfield | html %]" />
>                 <input type="submit" class="submit" name="search" value="Search" />
>         </form>
> 	</div>
>@@ -14,9 +14,13 @@
> 
> 	[% IF ( CAN_user_catalogue ) %]
>     <div id="catalog_search" class="residentsearch">
>-	<p class="tip">Enter search keywords:</p>
> 		<form action="/cgi-bin/koha/catalogue/search.pl"  method="get" id="cat-search-block">
>-            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %][% INCLUDE 'search_indexes.inc' %][% END %]
>+            [% IF ( Koha.Preference('IntranetCatalogSearchPulldown') ) %]
>+                <label class="tip" for="idx">Enter search keywords:</label>
>+                [% INCLUDE 'search_indexes.inc' %]
>+            [% ELSE %]
>+                <label class="tip" for="search-form">Enter search keywords:</label>
>+            [% END %]
>             <input type="text" name="q" id="search-form" size="40" value="" title="Enter the terms you wish to search for." class="head-searchbox form-text" />
> 				<input type="submit" value="Submit"  class="submit" />
> 		</form>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>index c7d35d0b06..7aefc88de1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tt
>@@ -88,7 +88,7 @@
>                     <textarea id="summary" name="summary" cols="55" rows="7">[% authority_type.summary | html %]</textarea>
>                 </li>
>                 <li>
>-                    <p class="tip">Note: for 'Authority field to copy', enter the authority field that should be copied from the authority record to the bibliographic record. E.g., in MARC21, field 100 in the authority record should be copied to field 100 in the bibliographic record</p>
>+                    <div class="hint">Note: for 'Authority field to copy', enter the authority field that should be copied from the authority record to the bibliographic record. E.g., in MARC21, field 100 in the authority record should be copied to field 100 in the bibliographic record</div>
>                     <label for="auth_tag_to_report">Authority field to copy: </label>
>                     <input type="text" id="auth_tag_to_report" name="auth_tag_to_report" size="5" maxlength="3" value="[% authority_type.auth_tag_to_report | html %]" />
>                     <input type="hidden" name="op" value="add_validate" />
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 25954: 106659 | 107896 | 107900 | 107915 | 107986 | 113747 | 113748 | 113749 | 114681 | 114682 | 114683 | 114790