From 093cb03537de20a8b2d9814bb924e23c07ce4de7 Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 5 Apr 2011 16:45:16 +1200 Subject: [PATCH] Bug 5917 : Scoping issues --- .../opac-tmpl/prog/en/modules/opac-basket.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-detail.tt | 14 +++++------ .../prog/en/modules/opac-opensearch.tt | 6 ++--- .../prog/en/modules/opac-readingrecord.tt | 4 ++-- .../prog/en/modules/opac-results-grouped.tt | 10 ++++---- .../opac-tmpl/prog/en/modules/opac-results.tt | 4 ++-- .../opac-tmpl/prog/en/modules/opac-shelves.tt | 24 +++++++++---------- .../prog/en/modules/opac-showreviews-rss.tt | 4 ++-- .../prog/en/modules/opac-showreviews.tt | 4 ++-- .../prog/en/modules/opac-suggestions.tt | 2 +- .../prog/en/modules/opac-topissues.tt | 2 +- .../opac-tmpl/prog/en/modules/opac-user.tt | 4 ++-- 12 files changed, 40 insertions(+), 40 deletions(-) diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-basket.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-basket.tt index 3ba5dc4f04..6b6b9343a8 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-basket.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-basket.tt @@ -355,7 +355,7 @@ function tagAdded() { - [% IF ( BIBLIO_RESULT.opacuserlogin ) %][% IF ( BIBLIO_RESULT.loggedinusername ) %][% IF ( BIBLIO_RESULT.TagsEnabled ) %][% END %][% END %][% END %] + [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %][% END %][% END %][% END %] [% BIBLIO_RESULT.author %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt index bfc85bd2ae..b9ee90385d 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-detail.tt @@ -436,8 +436,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () { Previous [% FOREACH PREVIOUS_SHELF_BROWS IN PREVIOUS_SHELF_BROWSE %] - [% IF ( PREVIOUS_SHELF_BROWS.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( PREVIOUS_SHELF_BROWS.browser_normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] - [% IF ( SyndeticsEnabled ) %][% IF ( PREVIOUS_SHELF_BROWS.SyndeticsCoverImages ) %][% IF ( PREVIOUS_SHELF_BROWS.content_identifier_exists ) %] + [% 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 ( PREVIOUS_SHELF_BROWS.using_https ) %] [% ELSE %][% END %] @@ -452,10 +452,10 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% FOREACH NEXT_SHELF_BROWS IN NEXT_SHELF_BROWSE %] - [% IF ( NEXT_SHELF_BROWS.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( NEXT_SHELF_BROWS.browser_normalized_isbn ) %] + [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( NEXT_SHELF_BROWS.browser_normalized_isbn ) %] [% ELSE %]No cover image available[% END %][% END %][% END %] - [% IF ( SyndeticsEnabled ) %][% IF ( NEXT_SHELF_BROWS.SyndeticsCoverImages ) %][% IF ( NEXT_SHELF_BROWS.content_identifier_exists ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( NEXT_SHELF_BROWS.content_identifier_exists ) %] [% IF ( NEXT_SHELF_BROWS.using_https ) %] [% ELSE %][% END %] @@ -720,9 +720,9 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% FOREACH XISBN IN XISBNS %] -[% IF ( XISBN.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% END %][% END %] +[% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% END %][% END %] -[% IF ( SyndeticsEnabled ) %][% IF ( XISBN.SyndeticsCoverImages ) %][% IF ( XISBN.content_identifier_exists ) %] +[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( XISBN.content_identifier_exists ) %] [% IF ( XISBN.using_https ) %] [% ELSE %][% END %] @@ -747,7 +747,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () { [% FOREACH AMAZON_SIMILAR_PRODUCT IN AMAZON_SIMILAR_PRODUCTS %] [% FOREACH similar_biblionumber IN AMAZON_SIMILAR_PRODUCT.similar_biblionumbers %] [% IF ( OPACAmazonCoverImages ) %][% END %] - [% IF ( SyndeticsEnabled ) %][% IF ( similar_biblionumber.SyndeticsCoverImages ) %][% IF ( similar_biblionumber.content_identifier_exists ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( similar_biblionumber.content_identifier_exists ) %] [% IF ( similar_biblionumber.using_https ) %] [% ELSE %][% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-opensearch.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-opensearch.tt index 4849a173ff..5a18a55276 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-opensearch.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-opensearch.tt @@ -35,9 +35,9 @@ [% SEARCH_RESULT.isbn |html %] [% IF ( SEARCH_RESULT.BiblioDefaultViewmarc ) %][% SEARCH_RESULT.OPACBaseurl %]/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% ELSE %][% IF ( SEARCH_RESULT.BiblioDefaultViewisbd ) %][% SEARCH_RESULT.OPACBaseurl %]/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% ELSE %][% SEARCH_RESULT.OPACBaseurl %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% SEARCH_RESULT.biblionumber %][% END %][% END %] [% END %][% END %][% END %] +[% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %][% END %][% END %][% END %] -[% IF ( SyndeticsEnabled ) %][% IF ( SEARCH_RESULT.SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %][% IF ( SEARCH_RESULT.using_https ) %] +[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %][% IF ( SEARCH_RESULT.using_https ) %] [% ELSE %] [% END %][% END %][% END %][% END %] @@ -50,7 +50,7 @@ [% 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 ( SEARCH_RESULT.RequestOnOpac ) %] +[% IF ( RequestOnOpac ) %] Place Hold on [% SEARCH_RESULT.title |html %]

[% END %] ]]> diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-readingrecord.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-readingrecord.tt index 4ef4178b37..2fef7c800b 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-readingrecord.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-readingrecord.tt @@ -63,13 +63,13 @@ You have never borrowed anything from this library. [% UNLESS ( loop.odd ) %][% ELSE %][% END %] -[% IF ( READING_RECOR.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( READING_RECOR.normalized_isbn ) %]Cover Image[% ELSE %]No cover image available[% END %][% END %][% END %] +[% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( READING_RECOR.normalized_isbn ) %]Cover Image[% ELSE %]No cover image available[% END %][% END %][% END %] [% IF ( GoogleJackets ) %][% IF ( READING_RECOR.normalized_isbn ) %]
[% ELSE %]No cover image available[% END %][% END %] [% IF ( BakerTaylorEnabled ) %][% IF ( READING_RECOR.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] - [% IF ( SyndeticsEnabled ) %][% IF ( READING_RECOR.SyndeticsCoverImages ) %][% IF ( READING_RECOR.using_https ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( READING_RECOR.using_https ) %] [% ELSE %] [% END %][% END %][% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-results-grouped.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-results-grouped.tt index 32012aa7c1..e3621d9e3e 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-results-grouped.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-results-grouped.tt @@ -198,7 +198,7 @@ function highlightOn() { [% ELSE %] [% END %] - [% IF ( GROUP_RESULT.OPACAmazonEnabled ) %] + [% IF ( OPACAmazonEnabled ) %] [% IF ( GROUP_RESULT.isbn ) %][% ELSE %][% END %] [% ELSE %] @@ -236,7 +236,7 @@ function highlightOn() { Copies available at: [% FOREACH available_items_loo IN GROUP_RESULT.available_items_loop %] [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname %][% END %] - [% IF ( available_items_loo.OPACItemsResultsDisplay ) %] + [% IF ( OPACItemsResultsDisplay ) %] [% IF ( available_items_loo.location ) %][% available_items_loo.location %][% END %] [% IF ( available_items_loo.itemcallnumber ) %][[% available_items_loo.itemcallnumber %]][% END %] [% END %] @@ -257,10 +257,10 @@ function highlightOn() {

- [% IF ( GROUP_RESULT.RequestOnOpac ) %] + [% IF ( RequestOnOpac ) %] [% UNLESS ( GROUP_RESULT.norequests ) %] - [% IF ( GROUP_RESULT.opacuserlogin ) %] - [% IF ( GROUP_RESULT.AllowOnShelfHolds ) %] + [% IF ( opacuserlogin ) %] + [% IF ( AllowOnShelfHolds ) %] Place Hold [% ELSE %] [% IF ( GROUP_RESULT.itemsissued ) %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt index 7ad9872839..733a21d897 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt @@ -376,9 +376,9 @@ $(document).ready(function(){ [% END %] - [% IF ( SEARCH_RESULT.opacbookbag ) %] [% ELSE %] + [% IF ( opacbookbag ) %] [% ELSE %] [% IF ( virtualshelves ) %] [% ELSE %] -[% IF ( RequestOnOpac ) %][% UNLESS ( SEARCH_RESULT.norequests ) %][% IF ( SEARCH_RESULT.opacuserlogin ) %] [% END %][% END %][% END %][% END %][% END %] +[% IF ( RequestOnOpac ) %][% UNLESS ( SEARCH_RESULT.norequests ) %][% IF ( opacuserlogin ) %] [% END %][% END %][% END %][% END %][% END %] [% SEARCH_RESULT.result_number %]. [% UNLESS ( item_level_itypes ) %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt index 0d561d34c1..d08e71348b 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt @@ -277,8 +277,8 @@ $(function() { [% END %] [% END %][% ELSE %]This record has no items.[% END %] [% END %] - [% IF ( itemsloo.TagsEnabled ) %] - [% IF ( itemsloo.TagsShowOnList ) %] + [% IF ( TagsEnabled ) %] + [% IF ( TagsShowOnList ) %] [% IF ( itemsloo.TagLoop ) %]

Tags: @@ -286,8 +286,8 @@ $(function() { [% END %] [% END %] - [% IF ( itemsloo.TagsInputOnList ) %] - [% IF ( itemsloo.loggedinusername ) %] + [% IF ( TagsInputOnList ) %] + [% IF ( loggedinusername ) %]
@@ -305,10 +305,10 @@ $(function() { [% END %] Actions: - [% IF ( itemsloo.RequestOnOpac ) %] + [% IF ( RequestOnOpac ) %] [% UNLESS ( itemsloo.norequests ) %] - [% IF ( itemsloo.opacuserlogin ) %] - [% IF ( itemsloo.AllowOnShelfHolds ) %] + [% IF ( opacuserlogin ) %] + [% IF ( AllowOnShelfHolds ) %] Place Hold [% ELSE %] [% IF ( itemsloo.itemsissued ) %] @@ -319,24 +319,24 @@ $(function() { [% END %] [% END %] - [% IF ( itemsloo.opacuserlogin ) %][% IF ( itemsloo.loggedinusername ) %][% IF ( itemsloo.virtualshelves ) %]Save to another list + [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( virtualshelves ) %]Save to another list [% END %][% END %][% END %] - [% IF ( itemsloo.opacbookbag ) %]Add to Cart[% ELSE %]nocart[% END %] + [% IF ( opacbookbag ) %]Add to Cart[% ELSE %]nocart[% END %] - [% IF ( itemsloo.opacuserlogin ) %][% IF ( itemsloo.loggedinusername ) %][% IF ( itemsloo.TagsEnabled ) %]
+ [% IF ( opacuserlogin ) %][% IF ( loggedinusername ) %][% IF ( TagsEnabled ) %]
[% END %][% END %][% END %] - [% IF ( itemsloo.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( itemsloo.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] + [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( itemsloo.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] - [% IF ( SyndeticsEnabled ) %][% IF ( itemsloo.SyndeticsCoverImages ) %][% IF ( itemsloo.using_https ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( itemsloo.using_https ) %] [% ELSE %] [% END %][% END %][% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt index fa48879d13..f8a985df45 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt @@ -11,9 +11,9 @@ New comment on [% review.title |html %] [% FOREACH subtitl IN review.subtitle %], [% subtitl.subfield |html %][% END %] [% review.OPACBaseurl %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber %]#comments [% END %][% END %][% END %] +[% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %][% END %][% END %][% END %] -[% IF ( SyndeticsEnabled ) %][% IF ( review.SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %][% IF ( review.using_https ) %] +[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %][% IF ( review.using_https ) %] [% ELSE %] [% END %][% END %][% END %][% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews.tt index 485e29a450..e10c436d53 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews.tt @@ -60,9 +60,9 @@ $(document).ready(function(){ [% END %] - [% IF ( review.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] + [% IF ( OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] - [% IF ( SyndeticsEnabled ) %][% IF ( review.SyndeticsCoverImages ) %][% IF ( review.using_https ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( review.using_https ) %] [% ELSE %] [% END %][% END %][% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-suggestions.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-suggestions.tt index 426dadd75b..2b69612805 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-suggestions.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-suggestions.tt @@ -162,7 +162,7 @@ $.tablesorter.addParser({ [% FOREACH suggestions_loo IN suggestions_loop %] [% IF ( suggestions_loo.even ) %][% ELSE %][% END %] -[% IF ( suggestions_loo.loggedinusername ) %] +[% IF ( loggedinusername ) %] [% IF ( suggestions_loo.showcheckbox ) %] [% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-topissues.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-topissues.tt index 4604c53d29..dee3089e06 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-topissues.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-topissues.tt @@ -79,7 +79,7 @@ function Dopop(link) { [% results_loo.description %] [% results_loo.tot %] - [% IF ( results_loo.opacuserlogin ) %][% IF ( results_loo.RequestOnOpac ) %][% UNLESS ( results_loo.norequests ) %]Place Hold[% END %][% END %][% END %] + [% IF ( opacuserlogin ) %][% IF ( RequestOnOpac ) %][% UNLESS ( results_loo.norequests ) %]Place Hold[% END %][% END %][% END %] [% END %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-user.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-user.tt index ed4f5e46f4..ccaecebcb4 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-user.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-user.tt @@ -231,7 +231,7 @@ $.tablesorter.addParser({ [% IF ( BakerTaylorEnabled ) %][% IF ( ISSUE.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] -[% IF ( SyndeticsEnabled ) %][% IF ( ISSUE.SyndeticsCoverImages ) %][% IF ( ISSUE.using_https ) %] +[% IF ( SyndeticsEnabled ) %][% IF ( SyndeticsCoverImages ) %][% IF ( ISSUE.using_https ) %] [% ELSE %] [% END %][% END %][% END %] @@ -314,7 +314,7 @@ $.tablesorter.addParser({ [% IF ( BakerTaylorEnabled ) %][% IF ( OVERDUE.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] -[% IF ( OVERDUE.SyndeticsCoverImages ) %] +[% IF ( SyndeticsCoverImages ) %] [% IF ( OVERDUE.using_https ) %] [% ELSE %] -- 2.39.5