@@ -, +, @@
Bug 21526: Fix search result pages (url vs uri vs raw)
query_cgi is uri_escaped from the pl, so we should displayed as raw
Test plan:
Use wide characters ❤
Search, filter, facets, search history, rss (both interfaces)
---
koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc | 2 +-
.../intranet-tmpl/prog/en/includes/page-numbers.inc | 10 +++++-----
.../intranet-tmpl/prog/en/modules/catalogue/results.tt | 6 +++---
.../prog/en/modules/catalogue/search-history.tt | 8 ++++----
.../opac-tmpl/bootstrap/en/includes/opac-facets.inc | 4 ++--
.../opac-tmpl/bootstrap/en/includes/page-numbers.inc | 10 +++++-----
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +++---
.../bootstrap/en/modules/opac-search-history.tt | 8 ++++----
8 files changed, 27 insertions(+), 27 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/facets.inc
@@ -5,7 +5,7 @@
Refine your search
- Availability
+ Availability
[% IF ( related ) %] (related searches: [% FOREACH relate IN related %][% relate.related_search | html %][% END %]) [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/page-numbers.inc
@@ -1,19 +1,19 @@
[% IF ( PAGE_NUMBERS ) %] [% END %]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt
@@ -599,7 +599,7 @@
[% IF ( outer_sup_results_loo.inner_sup_results_loop ) %]
[% outer_sup_results_loo.servername | html %]
[% FOREACH inner_sup_results_loo IN outer_sup_results_loo.inner_sup_results_loop %]
-
+
[% END %]
[% END %]
@@ -742,7 +742,7 @@
[%- END -%]
];
var browser = KOHA.browser('[% searchid | html %]', parseInt('[% biblionumber | html %]', 10));
- browser.create([% SEARCH_RESULTS.first.result_number | html %], '[% query_cgi | html %]', '[% limit_cgi | uri %]','[% sort_cgi | uri %]',
+ browser.create([% SEARCH_RESULTS.first.result_number | html %], '[% query_cgi | html %]', '[% limit_cgi | html %]','[% sort_cgi | html %]',
newresults, '[% total | html %]');
[% END %]
@@ -875,7 +875,7 @@
var bibnums = getContextBiblioNumbers();
if ( bibnums && bibnums.length > 0 ) {
var browser = KOHA.browser('', parseInt('[% biblionumber | html %]', 10));
- browser.create(1, '[% query_cgi | html %]', '[% limit_cgi | uri %]','[% sort_cgi | uri %]', bibnums, bibnums.length);
+ browser.create(1, '[% query_cgi | html %]', '[% limit_cgi | html %]','[% sort_cgi | html %]', bibnums, bibnums.length);
window.location = '/cgi-bin/koha/catalogue/detail.pl?biblionumber=' + bibnums[0] + '&searchid='+browser.searchid;
} else {
alert(MSG_NO_ITEM_SELECTED);
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/search-history.tt
@@ -57,7 +57,7 @@
[% s.time |$KohaDates with_hours => 1 | html %]
- [% s.query_desc | html %]
+ [% s.query_desc | html %]
[% s.total | html %]
[% END %]
@@ -94,7 +94,7 @@
[% s.time |$KohaDates with_hours => 1 | html %]
- [% s.query_desc | html %]
+ [% s.query_desc | html %]
[% s.total | html %]
[% END %]
@@ -137,7 +137,7 @@
[% s.time |$KohaDates with_hours => 1 | html %]
- [% s.query_desc | html %]
+ [% s.query_desc | html %]
[% s.total | html %]
[% END %]
@@ -174,7 +174,7 @@
[% s.time |$KohaDates with_hours => 1 | html %]
- [% s.query_desc | html %]
+ [% s.query_desc | html %]
[% s.total | html %]
[% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/opac-facets.inc
@@ -8,9 +8,9 @@
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/includes/page-numbers.inc
@@ -3,19 +3,19 @@
[% IF hits_to_paginate < total %][% hits_to_paginate | html %] of [% total | html %] results loaded, refine your search to view other records [% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -20,7 +20,7 @@
[% END %]
[% END %]
-
+
[% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %]
@@ -45,7 +45,7 @@
No results found!
[% IF ( searchdesc ) %]
- No results found for that in [% LibraryName | html %] catalog.
+ No results found for that in [% LibraryName | html %] catalog.
[% ELSE %]
You did not specify any search criteria.
[% END %]
@@ -89,7 +89,7 @@
[% END %]
).
[% END %]
-
+
[% END # / IF total %]
[% END # / IF searchdesc %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
@@ -71,7 +71,7 @@
[% s.time |$KohaDates with_hours => 1 | html %]
- [% s.query_desc | html %]
+ [% s.query_desc | html %]
[% s.total | html %]
[% END %]
@@ -111,7 +111,7 @@
[% s.time |$KohaDates with_hours => 1 | html %]
- [% s.query_desc | html %]
+ [% s.query_desc | html %]
[% s.total | html %]
[% END %]
@@ -156,7 +156,7 @@
[% s.time |$KohaDates with_hours => 1 | html %]
- [% s.query_desc | html %]
+ [% s.query_desc | html %]
[% s.total | html %]
[% END %]
@@ -193,7 +193,7 @@
[% s.time |$KohaDates with_hours => 1 | html %]
- [% s.query_desc | html %]
+ [% s.query_desc | html %]
[% s.total | html %]
[% END %]
--