From b62f40b776beca503cbec128ae1ac399fc054d21 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 18 Jun 2018 17:43:04 -0300 Subject: [PATCH] Bug 16111: Remove 'rss2' which should be 'rss' or 'atom' --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt | 8 ++++---- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +++--- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt index a9be7d7099..07d7cf91ee 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt @@ -7,20 +7,20 @@ koha opac [% LibraryName |html %] [% KohaAdminEmailAddress |html %] + template="[% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?q={searchTerms}&pw={startPage?}&format=rss"/> [% ELSE %] -[% IF ( rss2 ) %] +[% IF ( rss ) %] <![CDATA[[% LibraryName |html %] Search [% IF ( query_desc ) %]for '[% query_desc |html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc |html %]'[% END %]]]> - [% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&format=rss2 - + [% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi |html %][% limit_cgi |html %]&format=rss + [% total %] [% offset %] 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 8c65b2a1b4..6645428356 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -17,7 +17,7 @@ [% END %] [% END %] - + [% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %] @@ -42,7 +42,7 @@ No results found!

[% IF ( searchdesc ) %] - No results found for that in [% LibraryName %] catalog. Subscribe to this search + No results found for that in [% LibraryName %] catalog. Subscribe to this search [% ELSE %] You did not specify any search criteria. [% END %] @@ -86,7 +86,7 @@ [% END %] ). [% END %] - Subscribe to this search + Subscribe to this search [% END # / IF total %]

[% END # / IF searchdesc %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt index 9ad78c3f91..b3510c9f98 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt @@ -69,7 +69,7 @@ [% s.time |$KohaDates with_hours => 1 %] - Subscribe to this search [% s.query_desc |html %] + Subscribe to this search [% s.query_desc |html %] [% s.total %] [% END %] @@ -109,7 +109,7 @@ [% s.time |$KohaDates with_hours => 1 %] - Subscribe to this search [% s.query_desc |html %] + Subscribe to this search [% s.query_desc |html %] [% s.total %] [% END %] -- 2.11.0