@@ -, +, @@
- "Self reference doesn't match document location"
- "Unregistered link relationship: search"
---
.../bootstrap/en/modules/opac-opensearch.tt | 241 ++++++++++++---------
.../opac-tmpl/bootstrap/en/modules/opac-results.tt | 10 +-
2 files changed, 147 insertions(+), 104 deletions(-)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-opensearch.tt
@@ -1,109 +1,150 @@
[% USE Koha %]
+[% BLOCK item_description %]
+
+ [% END %]
+ [% END %]
+ [% IF ( SyndeticsEnabled ) %]
+ [% IF ( SyndeticsCoverImages ) %]
+ [% IF ( SEARCH_RESULT.content_identifier_exists ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ [% END %]
+ [% END %]
+ [% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) %]
+ [% IF ( BakerTaylorEnabled ) %]
+ [% IF bt_id %]
+
+ [% END %]
+ [% END %]
+
+ [% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author | html %]. [% END %]
+ [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place | html %] [% END %]
+ [% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode | html %][% END %]
+ [% IF ( SEARCH_RESULT.publicationyear ) %]
+ [% SEARCH_RESULT.publicationyear | html %]
+ [% ELSE %]
+ [% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate | html %][% END %]
+ [% END %]
+ [% IF ( SEARCH_RESULT.pages ) %]. [% SEARCH_RESULT.pages | html %][% END %]
+ [% IF ( SEARCH_RESULT.notes ) %], [% SEARCH_RESULT.notes | html %][% END %]
+ [% IF ( SEARCH_RESULT.size ) %] [% SEARCH_RESULT.size | html %]. [% END %]
+ [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn | html %][% END %]
+
+ [% IF Koha.Preference( 'RequestOnOpac' ) == 1 %]
+
+ [% END %]
+ ]]>
+[% END %]
+[% BLOCK feed_url %][% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi |uri %]&count=[% countrss |uri %]&offset=[% offset %]&sort_by=acqdate_dsc&format=[% END %]
+
[% IF ( opensearchdescription ) %]
-
- [% LibraryName | html %] Search
- Search the [% LibraryName | html %]
- koha opac [% LibraryName | html %]
- [% KohaAdminEmailAddress | html %]
-
-
-[% ELSE %]
+
+ [% LibraryName | html %] Search
+ Search the [% LibraryName | html %]
+ koha opac [% LibraryName | html %]
+ [% KohaAdminEmailAddress | html %]
+
+
-[% IF ( rss ) %]
-
-
-
- [% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=rss
-
-
- [% total | html %]
- [% offset | html %]
- [% IF ( results_per_page ) %]
- [% results_per_page | html %]
- [% ELSE %]
- 20
- [% END %]
- [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
-
-
-
- [% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %]
- 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 %]
- [% END %][% END %]
-[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %]
[% ELSE %]
-
-[% END %][% END %][% END %]
+ [% IF ( rss ) %]
+
+
+
+ [% PROCESS feed_url %]rss
+
+
+ [% total | html %]
+ [% offset | html %]
+ [% IF ( results_per_page ) %]
+ [% results_per_page | html %]
+ [% ELSE %]
+ 20
+ [% END %]
+
+
+ [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
+
+ [% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %]
+ ISBN [% SEARCH_RESULT.isbn | html %]
+
+ [% IF ( BiblioDefaultViewmarc ) %]
+ [% OPACBaseURL | html %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]
+ [% ELSE %]
+ [% IF ( 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 %]
+
+
+ [% PROCESS item_description %]
+
+ [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]
+
+ [% END %]
+
+
+ [% END # /IF rss %]
-[% bt_id = ( SEARCH_RESULT.normalized_upc || SEARCH_RESULT.normalized_isbn ) | html %]
-[% IF ( BakerTaylorEnabled ) %][% IF bt_id %][% END %][% END %]
-
[% IF ( SEARCH_RESULT.author ) %]By [% SEARCH_RESULT.author | html %]. [% END %]
- [% IF ( SEARCH_RESULT.place ) %][% SEARCH_RESULT.place | html %] [% END %][% IF ( SEARCH_RESULT.publishercode ) %][% SEARCH_RESULT.publishercode | html %][% END %][% IF ( SEARCH_RESULT.publicationyear ) %] [% SEARCH_RESULT.publicationyear | html %]
- [% ELSE %][% IF ( SEARCH_RESULT.copyrightdate ) %] [% SEARCH_RESULT.copyrightdate | html %][% END %][% END %]
- [% IF ( SEARCH_RESULT.pages ) %]. [% SEARCH_RESULT.pages | html %][% END %]
- [% IF ( SEARCH_RESULT.notes ) %], [% SEARCH_RESULT.notes | html %][% END %]
- [% IF ( SEARCH_RESULT.size ) %] [% SEARCH_RESULT.size | html %]. [% END %]
- [% IF ( SEARCH_RESULT.isbn ) %] [% SEARCH_RESULT.isbn | html %][% END %]
-
-[% IF Koha.Preference( 'RequestOnOpac' ) == 1 %]
-
-[% END %]
- ]]>
- [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]
-
- [% END %]
-
-
-[% END %]
+ [% IF ( atom ) %]
+
+ [% OPACBaseURL | html %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=atom
+ [% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]
+
+ [% IF ( timestamp ) %][% timestamp | html %][% END %]
+
+ [% LibraryName | html %]
+
+
+ [% total | html %]
+ [% page | html %]
+ [% IF ( results_per_page ) %]
+ [% results_per_page | html %]
+ [% ELSE %]
+ 20
+ [% END %]
+
+
+
+
+
+
+
+
-[% IF ( atom ) %]
-
- [% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | html %][% limit_cgi | html %]&format=atom
- [% LibraryName | html %] Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %] with limit(s): '[% limit_desc | html %]'[% END %]
-
- [% timestamp %]
-
- [% LibraryName | html %]
-
-
- [% total | html %]
- [% page | html %]
- [% IF ( results_per_page ) %]
- [% results_per_page | html %]
- [% ELSE %]
- 20
- [% END %]
-
-
-
-
-
-
-
-
+ [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
+
+ [% SEARCH_RESULT.title | html %] [% FOREACH subtitl IN SEARCH_RESULT.subtitle %], [% subtitl.subfield | html %][% END %]
+ [% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %]
+
+ [% ELSE %]
+ [% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %]
+
+ [% ELSE %]
+
+ [% END %]
+ [% END %]
+ [% IF ( SEARCH_RESULT.dateaccessioned ) %][% SEARCH_RESULT.dateaccessioned | html %][% END %]
+ [% OPACBaseURL | html %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber | html %]
+
+ [% PROCESS item_description %]
+
+
+ [% END %]
+
+ [% END # /IF atom %]
- [% FOREACH SEARCH_RESULT IN SEARCH_RESULTS %]
-
- [% 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 %]
-
-[% END %]
-
-[% END %]
+[% END # /IF opensearchdescription %]
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
+++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-results.tt
@@ -17,8 +17,10 @@
[% Asset.css("css/jquery.rating.css") | $raw %]
[% END %]
[% END %]
-
-
+[% BLOCK rss_feed %]
+ [% OPACBaseURL %]/cgi-bin/koha/opac-search.pl?[% query_cgi | url %][% limit_cgi |uri %]&count=[% countrss |uri %]&offset=[% offset | html %]&sort_by=acqdate_dsc&format=rss
+[% END %]
+
[% INCLUDE 'bodytag.inc' bodyid='results' bodyclass='scrollto' %]
@@ -43,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 %]
@@ -87,7 +89,7 @@
[% END %]
).
[% END %]
-
+
[% END # / IF total %]