From 31eb626230e5a689be7013af8cdd565e886e9887 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' Signed-off-by: Owen Leonard Signed-off-by: Andrew Isherwood --- 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 7bca50de4d..5aafb258d7 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 | html %]/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 | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=rss2 - + [% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=rss + [% total | html %] [% offset | html %] 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 45733ea8eb..04bf97b14c 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt @@ -18,7 +18,7 @@ [% END %] [% END %] - + [% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %] @@ -43,7 +43,7 @@ No results found!

[% IF ( searchdesc ) %] - No results found for that in [% LibraryName | html %] catalog. Subscribe to this search + No results found for that in [% LibraryName | html %] catalog. Subscribe to this search [% ELSE %] You did not specify any search criteria. [% END %] @@ -87,7 +87,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 284955359d..0bfff681bb 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 @@ -71,7 +71,7 @@ [% s.time |$KohaDates with_hours => 1 | html %] - Subscribe to this search [% s.query_desc | html %] + Subscribe to this search [% s.query_desc | html %] [% s.total | html %] [% END %] @@ -111,7 +111,7 @@ [% s.time |$KohaDates with_hours => 1 | html %] - Subscribe to this search [% s.query_desc | html %] + Subscribe to this search [% s.query_desc | html %] [% s.total | html %] [% END %] -- 2.11.0