@@ -, +, @@
---
.../bootstrap/en/modules/opac-opensearch.tt | 47 +++++++++++++---------
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 6 +--
.../bootstrap/en/modules/opac-search-history.tt | 4 +-
opac/opac-search.pl | 7 +++-
4 files changed, 37 insertions(+), 27 deletions(-)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
@@ -11,20 +11,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 ) %]
- [% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | url %]&format=rss2
-
+
+ [% total | html %][% offset | html %]
@@ -34,12 +34,18 @@
20
[% END %]
[% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
-
+ [% INCLUDE 'biblio-title-head.inc' biblio=SEARCH_RESULT %]ISBN [% SEARCH_RESULT.isbn | html %]
- [% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% END %][% END %]
+ [% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %]
+
+ [% ELSIF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %]
+
+ [% ELSE %]
+
+ [% END %]
@@ -75,9 +81,9 @@
[% IF ( atom ) %]
- [% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | html %]&format=atom
+ [% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | $raw %][% limit_cgi | $raw %]&format=atom[% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]
-
+
[% timestamp | html %][% LibraryName | html %]
@@ -90,24 +96,25 @@
[% ELSE %]
20
[% END %]
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
[% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
- [% SEARCH_RESULT.title | html %]
-
+ [% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %]
+ [% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% OPACBaseURL | html %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% ELSE %][% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %][% END %][% END %]
[% SEARCH_RESULT.timestamp | html %]
-
- [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]
+
+
+
[% END %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -24,7 +24,7 @@
[% END %]
[% INCLUDE 'doc-head-close.inc' %]
-
+
[% BLOCK cssinclude %][% END %]
[% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %]
@@ -61,7 +61,7 @@
[% IF ( searchdesc ) %]
No results found for that in [% LibraryName | html %] catalog.
-
+
[% ELSE %]
@@ -107,7 +107,7 @@
[% END %]
).
[% END %]
-
+
[% END # / IF total %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-search-history.tt
@@ -72,7 +72,7 @@