Bug 27748: Encoding problem in link to OverDrive results

[koha-ffzg.git] / koha-tmpl / opac-tmpl / bootstrap / en / modules / opac-results.tt

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 a60ac5f..ad6c7ee 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -12,7 +12,7 @@
 [% END %]
 
 [% INCLUDE 'doc-head-open.inc' %]
-<title>[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog &rsaquo;
+<title>
 [% IF ( searchdesc ) %]
     [% IF ( ms_value ) %]
         Results of search for '[% ms_value | html %]'
@@ -21,7 +21,10 @@
     [% END %]
 [% ELSE %]
     You did not specify any search criteria.
-[% END %]</title>
+[% END %]
+&rsaquo;
+[% IF ( LibraryNameTitle ) %][% LibraryNameTitle | html %][% ELSE %]Koha online[% END %] catalog
+</title>
 [% INCLUDE 'doc-head-close.inc' %]
 
 <link rel="alternate" type="application/rss+xml" title="[% LibraryName | html %] Search RSS feed" href="[% OPACBaseURL | url %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&amp;count=[% countrss |uri %]&amp;sort_by=acqdate_dsc&amp;format=rss" />
@@ -61,7 +64,7 @@
             <div class="container-fluid">
                 <div class="row">
                     <div class="col">
-                        <h2 id="numresults">No results found!</h2>
+                        <h1 id="numresults">No results found!</h1>
                         <p>
                             [% IF ( searchdesc ) %]
                                 No results found for that in [% LibraryName | html %] catalog.
@@ -115,12 +118,12 @@
 
                 [% IF ( searchdesc ) %]
                     [% IF ( total ) %]
-                        <h2 id="numresults">
+                        <h1 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>
+                        </h1>
                         [% IF ( related ) %]
                             <p>(related searches:[% FOREACH relate IN related %] [% relate.related_search | html %][% END %]).</p>
                         [% END %]
@@ -262,7 +265,7 @@
                                                             [% IF ( add_to_some_private_shelves and add_to_some_private_shelves.count > 10 ) or ( add_to_some_public_shelves and add_to_some_public_shelves.count > 10 ) %]
                                                                 <option value="morelists">[ More lists ]</option>
                                                             [% END %]
-                                                            <option value="newlist">[ New list ]</option>"
+                                                            <option value="newlist">[ New list ]</option>
                                                         [% END # /IF virtualshelves %]
                                                     </select>
                                                     <input type="submit" class="btn btn-sm btn-primary" value="Save" />
@@ -931,7 +934,7 @@
                         }
 
                         if ( data.totalItems ) {
-                            $overdrive_results.html( '<a href="/cgi-bin/koha/opac-overdrive-search.pl?q=' + escape( od_querystring ) + '">' + MSG_RESULTS_FOUND_IN_COLLECTION.format(data.totalItems, 'OverDrive') + '</a>' );
+                            $overdrive_results.html( '<a href="/cgi-bin/koha/opac-overdrive-search.pl?q=' + encodeURIComponent( od_querystring ) + '">' + MSG_RESULTS_FOUND_IN_COLLECTION.format(data.totalItems, 'OverDrive') + '</a>' );
                         } else {
                             $overdrive_results.remove();
                         }
@@ -949,7 +952,7 @@
 
                         // data.total can be either 42 or "60+"
                         if ( typeof(data.total) === 'string' && data.total.charAt(0) > 0 || typeof(data.total) === 'number' && data.total > 0 ) {
-                            $recordedbooks_results.html( '<a href="/cgi-bin/koha/opac-recordedbooks-search.pl?q=' + escape( querystring ) + '">' + MSG_RESULTS_FOUND_IN_COLLECTION.format(data.total, 'RecordedBooks') + '</a>' );
+                            $recordedbooks_results.html( '<a href="/cgi-bin/koha/opac-recordedbooks-search.pl?q=' + encodeURIComponent( querystring ) + '">' + MSG_RESULTS_FOUND_IN_COLLECTION.format(data.total, 'RecordedBooks') + '</a>' );
                         } else {
                             $recordedbooks_results.remove();
                         }