From ee138c16b44b0b5546df4c8d18342c349580be87 Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Mon, 4 Apr 2011 17:07:07 +1200 Subject: [PATCH] Bug 5917 : Yet more scoping --- installer/html-template-to-template-toolkit.pl | 2 +- koha-tt/intranet-tmpl/prog/en/modules/admin/itemtypes.tt | 2 +- .../intranet-tmpl/prog/en/modules/catalogue/advsearch.tt | 2 +- koha-tt/intranet-tmpl/prog/en/modules/circ/circulation.tt | 4 ++-- koha-tt/intranet-tmpl/prog/en/modules/members/moremember.tt | 4 ++-- koha-tt/intranet-tmpl/prog/en/modules/reserve/request.tt | 2 +- .../intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt | 4 ++-- koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt | 2 +- koha-tt/opac-tmpl/prog/en/modules/opac-readingrecord.tt | 2 +- koha-tt/opac-tmpl/prog/en/modules/opac-reserve.tt | 2 +- koha-tt/opac-tmpl/prog/en/modules/opac-results-grouped.tt | 2 +- koha-tt/opac-tmpl/prog/en/modules/opac-results.tt | 2 +- koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt | 2 +- koha-tt/opac-tmpl/prog/en/modules/opac-showreviews-rss.tt | 6 +++--- 14 files changed, 19 insertions(+), 19 deletions(-) diff --git a/installer/html-template-to-template-toolkit.pl b/installer/html-template-to-template-toolkit.pl index 00607f2b65..4a4a77ad2c 100755 --- a/installer/html-template-to-template-toolkit.pl +++ b/installer/html-template-to-template-toolkit.pl @@ -29,7 +29,7 @@ my $tmpl_out_dir = 'koha-tt'; # template toolkit variables NOT to scope, in other words, variables that need to remain global (case sensitive) my @globals = ("themelang","JacketImages","OPACAmazonCoverImages","GoogleJackets","BakerTaylorEnabled", -"SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes"); +"SyndeticsEnabled", "OpacRenewalAllowed", "item_level_itypes","noItemTypeImages"); # Arguments: my $KOHA_ROOT; diff --git a/koha-tt/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tt/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index b9434dd357..3d712c25fa 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -318,7 +318,7 @@ Item Types Administration [% ELSE %] [% END %] - [% UNLESS ( loo.noItemTypeImages ) %] [% IF ( loo.imageurl ) %][% ELSE %] [% END %][% END %] + [% UNLESS ( noItemTypeImages ) %] [% IF ( loo.imageurl ) %][% ELSE %] [% END %][% END %] [% loo.itemtype %] diff --git a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index 3c87649725..c7d34d5c56 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -101,7 +101,7 @@ [% FOREACH itemtypeloo IN itemtypeloop %] - [% UNLESS ( itemtypeloo.noItemTypeImages ) %] + [% UNLESS ( noItemTypeImages ) %] [% IF ( itemtypeloo.imageurl ) %][% itemtypeloo.description %][% END %] [% END %]   diff --git a/koha-tt/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tt/intranet-tmpl/prog/en/modules/circ/circulation.tt index c93212fbc4..f383c21d67 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -689,7 +689,7 @@ No patron matched [% message %] [% todayissue.dd %] [% todayissue.title |html %][% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- [% todayissue.itemnotes %][% END %] [% todayissue.barcode %] - [% UNLESS ( todayissue.noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %][% END %][% END %][% todayissue.itemtype %] + [% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %][% END %][% END %][% todayissue.itemtype %] [% todayissue.checkoutdate %] [% IF ( todayissue.multiple_borrowers ) %][% todayissue.borrowername %][% END %] [% todayissue.itemcallnumber %] @@ -855,7 +855,7 @@ No patron matched [% message %] [% IF ( relissue.overdue ) %][% ELSE %][% END %] [% relissue.dd %] [% relissue.title |html %][% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- [% relissue.itemnotes %][% END %] [% relissue.barcode %] - [% UNLESS ( relissue.noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %][% END %][% END %][% relissue.itemtype %] + [% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %][% END %][% END %][% relissue.itemtype %] [% relissue.branchdisplay %] [% IF ( relissue.itemcallnumber ) %]([% relissue.itemcallnumber %])[% END %] [% relissue.displaydate %] diff --git a/koha-tt/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tt/intranet-tmpl/prog/en/modules/members/moremember.tt index a75a25cc81..f99b7bbf92 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -448,7 +448,7 @@ function validate1(date) { [% END %] [% issueloo.title |html %][% IF ( issueloo.author ) %], by [% issueloo.author %][% END %] [% IF ( issueloo.publishercode ) %]; [% issueloo.publishercode %] [% END %] [% IF ( issueloo.publicationyear ) %], [% issueloo.publicationyear %][% END %] [% issueloo.barcode %] -[% UNLESS ( issueloo.noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %][% END %][% END %][% issueloo.itemtype_description %] +[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %][% END %][% END %][% issueloo.itemtype_description %] [% issueloo.issuedate %] [% issueloo.itemcallnumber %] [% issueloo.charge %] @@ -552,7 +552,7 @@ function validate1(date) { [% relissueloo.collection %] [% relissueloo.stocknumber %] [% relissueloo.barcode %] -[% UNLESS ( relissueloo.noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %][% END %][% END %][% relissueloo.itemtype_description %] +[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %][% END %][% END %][% relissueloo.itemtype_description %] [% relissueloo.issuedate %] [% relissueloo.borrowername %] [% relissueloo.itemcallnumber %] diff --git a/koha-tt/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tt/intranet-tmpl/prog/en/modules/reserve/request.tt index 4df00b5963..43b6cd1ff9 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -406,7 +406,7 @@ function checkMultiHold() { [% IF ( item_level_itypes ) %] - [% UNLESS ( itemloo.noItemTypeImages ) %] + [% UNLESS ( noItemTypeImages ) %] [% IF ( itemloo.imageurl ) %]
[% END %] [% END %] [% itemloo.itypename %] diff --git a/koha-tt/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt b/koha-tt/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt index 7d7d1237cf..bcf94b8f6e 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tt @@ -192,8 +192,8 @@ function placeHold () { [% END %] [% END %] - [% UNLESS ( itemsloo.item_level_itypes ) %] - [% UNLESS ( itemsloo.noItemTypeImages ) %][% itemsloo.description %][% END %][% itemsloo.description %] + [% UNLESS ( item_level_itypes ) %] + [% UNLESS ( noItemTypeImages ) %][% itemsloo.description %][% END %][% itemsloo.description %] [% END %] [% INCLUDE 'biblio-default-view.inc' %] diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt index 92eb8a5dd5..4d55be740c 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-advsearch.tt @@ -136,7 +136,7 @@ [% FOREACH itemtypeloo IN itemtypeloop %] - [% UNLESS ( itemtypeloo.count5 ) %][% UNLESS ( loop.last ) %][% END %][% END %] [% 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 c5e42c5f70..4ef4178b37 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-readingrecord.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-readingrecord.tt @@ -80,7 +80,7 @@ You have never borrowed anything from this library. [% READING_RECOR.author %] - + diff --git a/koha-tt/opac-tmpl/prog/en/modules/opac-reserve.tt b/koha-tt/opac-tmpl/prog/en/modules/opac-reserve.tt index 08430dd3a5..742851d576 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-reserve.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-reserve.tt @@ -475,7 +475,7 @@ [% IF ( item_level_itypes ) %] [% UNLESS ( item_level_itypes ) %] - [% UNLESS ( SEARCH_RESULT.noItemTypeImages ) %] + [% UNLESS ( noItemTypeImages ) %] [% UNLESS ( item_level_itypes ) %]
[% UNLESS ( READING_RECOR.noItemTypeImages ) %][% IF ( READING_RECOR.imageurl ) %][% END %][% END %] [% READING_RECOR.description %][% UNLESS ( noItemTypeImages ) %][% IF ( READING_RECOR.imageurl ) %][% END %][% END %] [% READING_RECOR.description %] [% READING_RECOR.itemcallnumber %] [% IF ( READING_RECOR.returndate ) %][% READING_RECOR.returndate %][% ELSE %](Checked out)[% END %]
- [% UNLESS ( itemLoo.noItemTypeImages ) %] + [% UNLESS ( noItemTypeImages ) %] [% IF ( itemLoo.imageurl ) %][% END %] [% END %] [% itemLoo.description %] 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 8e3c03225b..32012aa7c1 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 @@ -202,7 +202,7 @@ function highlightOn() { [% IF ( GROUP_RESULT.isbn ) %][% ELSE %][% END %] [% ELSE %] - [% UNLESS ( GROUP_RESULT.noItemTypeImages ) %] + [% UNLESS ( noItemTypeImages ) %] [% IF ( GROUP_RESULT.imageurl ) %] [% END %] 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 2970680959..5b64256ded 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt @@ -382,7 +382,7 @@ $(document).ready(function(){ [% SEARCH_RESULT.result_number %]. [% IF ( SEARCH_RESULT.imageurl ) %] 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 fc17adc2b0..0d561d34c1 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt @@ -242,7 +242,7 @@ $(function() { value="[% itemsloo.biblionumber %]" /> - [% UNLESS ( itemsloo.noItemTypeImages ) %] + [% UNLESS ( noItemTypeImages ) %] [% itemsloo.description %] [% END %] [% itemsloo.description %] 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 e28d7ad6f2..fa48879d13 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,14 +11,14 @@ 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 ( review.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %][% END %][% END %][% END %] -[% IF ( review.SyndeticsEnabled ) %][% IF ( review.SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %][% IF ( review.using_https ) %] +[% IF ( SyndeticsEnabled ) %][% IF ( review.SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %][% IF ( review.using_https ) %] [% ELSE %] [% END %][% END %][% END %][% END %] -[% IF ( review.BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %]See Baker & Taylor[% END %][% END %] +[% IF ( BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %]See Baker & Taylor[% END %][% END %] [% IF ( review.author ) %]

By [% review.author |html %].

[% END %]

[% IF ( review.place ) %][% review.place |html %] [% END %][% IF ( review.publishercode ) %][% review.publishercode |html %][% END %][% IF ( review.publicationyear ) %] [% review.publicationyear |html %] [% ELSE %][% IF ( review.copyrightdate ) %] [% review.copyrightdate |html %][% END %][% END %] -- 2.39.5