From 156a849aa3759f377af07d4cdc7a6f58e58c18f4 Mon Sep 17 00:00:00 2001 From: Ian Walls Date: Fri, 9 Sep 2011 06:34:56 -0400 Subject: [PATCH] Bug 6860: SyndeticsClientCode improperly scoped on many OPAC pages SyndeticsClientCode was locally scoped in nearly all loops, preventing it from working. This patch fixes not only search results and shelf browsers, but also rarely-used parts of opac-detail, opac-opensearch, opac-readingrecord, opac-showreviews and opac-user Signed-off-by: Nicole C. Engard Signed-off-by: Chris Cormack --- .../opac-tmpl/prog/en/modules/opac-detail.tt | 16 ++++++++-------- .../opac-tmpl/prog/en/modules/opac-opensearch.tt | 4 ++-- .../prog/en/modules/opac-readingrecord.tt | 4 ++-- .../opac-tmpl/prog/en/modules/opac-results.tt | 4 ++-- .../opac-tmpl/prog/en/modules/opac-shelves.tt | 4 ++-- .../prog/en/modules/opac-showreviews-rss.tt | 4 ++-- .../prog/en/modules/opac-showreviews.tt | 4 ++-- koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt | 8 ++++---- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt index 1950e4e3e8..7f427707e1 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt @@ -446,8 +446,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( PREVIOUS_SHELF_BROWS.content_identifier_exists ) %] [% IF ( using_https ) %] - - [% ELSE %][% END %] + + [% ELSE %][% END %] [% ELSE %]No cover image available[% END %][% END %][% END %] [% IF ( GoogleJackets ) %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_isbn ) %]
[% ELSE %]No cover image available[% END %][% END %] [% IF ( BakerTaylorEnabled ) %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_isbn ) %] @@ -464,8 +464,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( NEXT_SHELF_BROWS.content_identifier_exists ) %] [% IF ( using_https ) %] - - [% ELSE %][% END %] + + [% ELSE %][% END %] [% ELSE %]No cover image available[% END %][% END %][% END %] [% IF ( GoogleJackets ) %][% IF ( NEXT_SHELF_BROWS.browser_normalized_isbn ) %]
[% ELSE %]No cover image available[% END %][% END %] @@ -737,8 +737,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( XISBN.content_identifier_exists ) %] [% IF ( using_https ) %] - -[% ELSE %][% END %] + +[% ELSE %][% END %] [% ELSE %]No cover image available[% END %][% END %][% END %] @@ -762,8 +762,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% IF ( OPACAmazonCoverImages ) %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( similar_biblionumber.content_identifier_exists ) %] [% IF ( using_https ) %] - - [% ELSE %][% END %] + + [% ELSE %][% END %] [% ELSE %]No cover image available[% END %][% END %][% END %] [% similar_biblionumber.title |html %] [% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt index 5a1311914d..8c579e3bf6 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-opensearch.tt @@ -37,9 +37,9 @@ [% END %][% END %][% END %] -[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %][% IF ( using_https ) %] +[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %][% IF ( using_https ) %] [% ELSE %] - + [% END %][% END %][% END %][% END %] [% IF ( BakerTaylorEnabled ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]See Baker & Taylor[% END %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt index 2c097b5872..683a5bd125 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tt @@ -70,9 +70,9 @@ You have never borrowed anything from this library. [% IF ( BakerTaylorEnabled ) %][% IF ( READING_RECOR.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %] - + [% ELSE %] - [% END %][% END %][% END %] + [% END %][% END %][% END %] [% IF ( READING_RECOR.BiblioDefaultViewmarc ) %][% READING_RECOR.title |html %] [% IF ( READING_RECOR.subtitle ) %][% FOREACH subtitl IN READING_RECOR.subtitle %][% subtitl.subfield %][% END %][% END %][% ELSE %] [% IF ( READING_RECOR.BiblioDefaultViewisbd ) %][% READING_RECOR.title |html %] [% IF ( READING_RECOR.subtitle ) %][% FOREACH subtitl IN READING_RECOR.subtitle %][% subtitl.subfield %][% END %][% END %][% ELSE %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt index bdc4050a2e..7757d47032 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tt @@ -531,9 +531,9 @@ $(document).ready(function(){ [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %] - + [% ELSE %] - [% END %][% END %][% END %] + [% END %][% END %][% END %] [% IF ( GoogleJackets ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]
[% ELSE %]No cover image available[% END %][% END %] [% IF OpenLibraryCovers %][% IF SEARCH_RESULT.normalized_isbn %]
[% ELSE %]No cover image available[% END %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt index 344f822389..c50cfb162e 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt @@ -337,9 +337,9 @@ $(function() { [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( itemsloo.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %] - + [% ELSE %] - [% END %][% END %][% END %] + [% END %][% END %][% END %] [% IF ( GoogleJackets ) %][% IF ( itemsloo.normalized_isbn ) %]
[% ELSE %]No cover image available[% END %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt index 2c6e179710..9ddf1f41bb 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt @@ -13,9 +13,9 @@ [% END %][% END %][% END %] -[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %][% IF ( using_https ) %] +[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %][% IF ( using_https ) %] [% ELSE %] - + [% END %][% END %][% END %][% END %] [% IF ( BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %]See Baker & Taylor[% END %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt index a50d825b56..0885e2cc46 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tt @@ -69,9 +69,9 @@ $(document).ready(function(){ [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %] - + [% ELSE %] - [% END %][% END %][% END %] + [% END %][% END %][% END %] [% IF ( GoogleJackets ) %][% IF ( review.normalized_isbn ) %]
[% ELSE %]No cover image available[% END %][% END %] diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt index 9d7a2a7f6b..9ba6c05e69 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tt @@ -217,9 +217,9 @@ $.tablesorter.addParser({ [% IF ( BakerTaylorEnabled ) %][% IF ( ISSUE.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( using_https ) %] - + [% ELSE %] -[% END %][% END %][% END %] +[% END %][% END %][% END %] [% END %] @@ -306,9 +306,9 @@ $.tablesorter.addParser({ [% IF ( SyndeticsCoverImages ) %] [% IF ( using_https ) %] - + [% ELSE %] - + [% END %] [% END %] [% END %] -- 2.39.5