From f2b122801f2f23c3427518c7468cdebe4716ed00 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Thu, 11 Jun 2020 13:23:32 +0100
Subject: [PATCH] Bug 25154: Add heading where content is introduced in
 opac-results.tt

Prior to this patch, the search results page did not contain a
semantically accurate heading to introduce he main content of the page.

Test plan
1/ Perform a search in the OPAC that yields results
2/ Inspect the page and note that the 'title' stating how many results
   are found is not semantically marked up as a heading to introduce the
   content.
3/ Apply the patch
4/ Reload the page
5/ Inspect the page and note that the 'title' stating how many results
   are found is now properly marked up as a second level heading and
   appropriately designated as the start of the 'maincontent' block with an
   associated '.maincontent' class.
6/ Perform a search which yields zero results
7/ Note that the 'No results found' title is properly marked up as a
   second level heading.
8/ Signoff

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
---
 .../opac-tmpl/bootstrap/en/modules/opac-results.tt | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
index 17564fad73..b0fc79008d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -54,10 +54,10 @@
         </ul>
 
         [% UNLESS ( total ) %]
-            <div class="container-fluid maincontent">
+            <div class="container-fluid">
                 <div class="row-fluid">
                     <div class="span12">
-                        <strong>No results found!</strong>
+                        <h2 id="numresults">No results found!</h2>
                         <p>
                             [% IF ( searchdesc ) %]
                                 No results found for that in [% LibraryName | html %] catalog.
@@ -83,7 +83,7 @@
             </div> <!-- / .container-fluid -->
         [% END # / UNLESS searchdesc %]
 
-        <div id="maincontent" class="container-fluid">
+        <div class="container-fluid">
             <div class="row-fluid">
                 [% IF ( opacfacets && total ) %]
                     <div class="span2">
@@ -98,20 +98,17 @@
                 [% IF ( opacfacets && total ) %]<div class="span10 maincontent">[% ELSE %]<div class="span12 maincontent">[% END %]
 
                 [% IF ( searchdesc ) %]
-                    <p id="numresults">
-                    [% IF ( total ) %]<strong>Your search returned [% total | html %] results.</strong>
+                    [% IF ( total ) %]
+                        <h2 id="numresults">
+                            Your search returned [% total | html %] results.
+                            <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;format=rss" class="btn btn-link rsssearchlink noprint" aria-label="Subscribe to this search">
+                                <i class="fa fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to this search"></i>
+                            </a>
+                        </h2>
                         [% IF ( related ) %]
-                            (related searches:
-                                [% FOREACH relate IN related %]
-                                    [% relate.related_search | html %]
-                                [% END %]
-                            ).
+                        <p>(related searches:[% FOREACH relate IN related %] [% relate.related_search | html %][% END %]).</p>
                         [% END %]
-                        <a href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;format=rss" class="btn btn-link rsssearchlink noprint" aria-label="Subscribe to this search">
-                            <i class="fa fa-rss rsssearchicon" aria-hidden="true" title="Subscribe to this search"></i>
-                        </a>
                     [% END # / IF total %]
-                    </p>
                 [% END # / IF searchdesc %]
 
                 <div id="userresults">
-- 
2.11.0