From 9377d9f4eeefcf05ac6db4ce9b599f99884190da Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Mon, 4 Apr 2011 17:00:06 +1200 Subject: [PATCH] Bug 5917 : Variable scoping --- .../prog/en/modules/catalogue/moredetail.tt | 4 ++-- .../prog/en/modules/circ/waitingreserves.tt | 2 +- .../intranet-tmpl/prog/en/modules/reserve/request.tt | 8 ++++---- koha-tt/opac-tmpl/prog/en/modules/opac-opensearch.tt | 6 +++--- .../opac-tmpl/prog/en/modules/opac-readingrecord.tt | 8 ++++---- koha-tt/opac-tmpl/prog/en/modules/opac-reserve.tt | 6 +++--- koha-tt/opac-tmpl/prog/en/modules/opac-results.tt | 10 +++++----- koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt | 10 +++++----- koha-tt/opac-tmpl/prog/en/modules/opac-showreviews.tt | 8 ++++---- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt index 927e39c453..d514924534 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/catalogue/moredetail.tt @@ -22,7 +22,7 @@

[% BIBITEM_DAT.title |html %] [% IF ( BIBITEM_DAT.author ) %], by [% BIBITEM_DAT.author %][% END %]

  1. Biblionumber: [% BIBITEM_DAT.biblionumber %] 
    2. - [% UNLESS ( BIBITEM_DAT.item_level_itypes ) %] + [% UNLESS ( item_level_itypes ) %]
  2. Item type: [% BIBITEM_DAT.itemtypename %] 
    3. [% END %] @@ -50,7 +50,7 @@ [% END %][% END %]
    1. Home Library: [% ITEM_DAT.homebranchname %] 
      2. - [% IF ( ITEM_DAT.item_level_itypes ) %] + [% IF ( item_level_itypes ) %]
    2. Item type: [% ITEM_DAT.itype %] 
      3. [% END %] [% IF ( ITEM_DAT.collection ) %]
    3. Collection: [% ITEM_DAT.collection %]
      4. [% END %] diff --git a/koha-tt/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt b/koha-tt/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt index dd445c3d8b..5c92d46942 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/circ/waitingreserves.tt @@ -131,7 +131,7 @@ $.tablesorter.addParser({

      [% overloo.waitingdate %]

      [% INCLUDE 'biblio-default-view.inc' %][% overloo.title |html %] [% overloo.subtitle |html %] - [% UNLESS ( overloo.item_level_itypes ) %][% IF ( overloo.itemtype ) %]  ([% overloo.itemtype %])[% END %][% END %] + [% UNLESS ( item_level_itypes ) %][% IF ( overloo.itemtype ) %]  ([% overloo.itemtype %])[% END %][% END %]
      Barcode: [% overloo.barcode %] [% overloo.borrowername %], [% overloo.borrowerfirstname %]
      [% overloo.borrowerphone %]
      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 e2bdb3c90e..4df00b5963 100644 --- a/koha-tt/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tt/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -369,7 +369,7 @@ function checkMultiHold() { [% FOREACH bibitemloo IN bibitemloop %]
        - [% UNLESS ( bibitemloo.item_level_itypes ) %] + [% UNLESS ( item_level_itypes ) %]
      1. Item type: [% bibitemloo.description %]
        2. [% END %] @@ -380,7 +380,7 @@ function checkMultiHold() { Place a hold on a specific copy Hold - [% IF ( bibitemloo.item_level_itypes ) %] + [% IF ( item_level_itypes ) %] Item type [% END %] Barcode @@ -404,7 +404,7 @@ function checkMultiHold() { Cannot be put on hold [% END %] - [% IF ( itemloo.item_level_itypes ) %] + [% IF ( item_level_itypes ) %] [% UNLESS ( itemloo.noItemTypeImages ) %] [% IF ( itemloo.imageurl ) %]
        [% END %] @@ -499,7 +499,7 @@ function checkMultiHold() { [% END %] - [% UNLESS ( biblioloo.item_level_itypes ) %] + [% UNLESS ( item_level_itypes ) %] [% biblioloo.itypename %] 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 d47921ef35..4849a173ff 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-opensearch.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-opensearch.tt @@ -35,14 +35,14 @@ [% 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 ( SEARCH_RESULT.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %][% END %][% END %][% END %] -[% IF ( SEARCH_RESULT.SyndeticsEnabled ) %][% IF ( SEARCH_RESULT.SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %][% IF ( SEARCH_RESULT.using_https ) %] +[% IF ( SyndeticsEnabled ) %][% IF ( SEARCH_RESULT.SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.content_identifier_exists ) %][% IF ( SEARCH_RESULT.using_https ) %] [% ELSE %] [% END %][% END %][% END %][% END %] -[% IF ( SEARCH_RESULT.BakerTaylorEnabled ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]See Baker & Taylor[% END %][% END %] +[% IF ( BakerTaylorEnabled ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]See Baker & Taylor[% 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 %] 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 dbcdf6f607..c5e42c5f70 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 ( READING_RECOR.OPACAmazonCoverImages ) %][% IF ( READING_RECOR.normalized_isbn ) %]Cover Image[% ELSE %]No cover image available[% END %][% END %][% END %] +[% IF ( READING_RECOR.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( READING_RECOR.normalized_isbn ) %]Cover Image[% ELSE %]No cover image available[% END %][% END %][% END %] - [% IF ( READING_RECOR.GoogleJackets ) %][% IF ( READING_RECOR.normalized_isbn ) %]

        [% ELSE %]No cover image available[% END %][% END %] + [% IF ( GoogleJackets ) %][% IF ( READING_RECOR.normalized_isbn ) %]
        [% ELSE %]No cover image available[% END %][% END %] - [% IF ( READING_RECOR.BakerTaylorEnabled ) %][% IF ( READING_RECOR.normalized_isbn ) %]See Baker & Taylor[% 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 ( READING_RECOR.SyndeticsEnabled ) %][% IF ( READING_RECOR.SyndeticsCoverImages ) %][% IF ( READING_RECOR.using_https ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( READING_RECOR.SyndeticsCoverImages ) %][% IF ( READING_RECOR.using_https ) %] [% ELSE %] [% END %][% END %][% END %] 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 a6a3151812..08430dd3a5 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-reserve.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-reserve.tt @@ -289,7 +289,7 @@ [% END %] - [% IF ( bibitemloo.holdable ) %][% UNLESS ( bibitemloo.item_level_itypes ) %] + [% IF ( bibitemloo.holdable ) %][% UNLESS ( item_level_itypes ) %] [% IF ( bibitemloo.imageurl ) %][% END %] [% bibitemloo.description %] @@ -447,7 +447,7 @@ Select a specific copy: Copy - [% IF ( bibitemloo.item_level_itypes ) %] + [% IF ( item_level_itypes ) %] Item Type [% END %] Barcode @@ -473,7 +473,7 @@ Cannot be put on hold [% END %] [% IF ( itemLoo.copynumber ) %][% itemLoo.copynumber %][% END %] - [% IF ( itemLoo.item_level_itypes ) %] + [% IF ( item_level_itypes ) %] [% UNLESS ( itemLoo.noItemTypeImages ) %] [% IF ( itemLoo.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 2079848a63..2970680959 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-results.tt @@ -381,7 +381,7 @@ $(document).ready(function(){ [% IF ( SEARCH_RESULT.RequestOnOpac ) %][% UNLESS ( SEARCH_RESULT.norequests ) %][% IF ( SEARCH_RESULT.opacuserlogin ) %] [% END %][% END %][% END %][% END %][% END %] [% SEARCH_RESULT.result_number %]. - [% UNLESS ( SEARCH_RESULT.item_level_itypes ) %] + [% UNLESS ( item_level_itypes ) %] [% UNLESS ( SEARCH_RESULT.noItemTypeImages ) %] @@ -526,16 +526,16 @@ $(document).ready(function(){ - [% IF ( SEARCH_RESULT.OPACAmazonEnabled ) %][% IF ( SEARCH_RESULT.OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] + [% IF ( SEARCH_RESULT.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] - [% IF ( SEARCH_RESULT.SyndeticsEnabled ) %][% IF ( SEARCH_RESULT.SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.using_https ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( SEARCH_RESULT.SyndeticsCoverImages ) %][% IF ( SEARCH_RESULT.using_https ) %] [% ELSE %] [% END %][% END %][% END %] - [% IF ( SEARCH_RESULT.GoogleJackets ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]
        [% ELSE %]No cover image available[% END %][% END %] + [% IF ( GoogleJackets ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]
        [% ELSE %]No cover image available[% END %][% END %]         - [% IF ( SEARCH_RESULT.BakerTaylorEnabled ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] + [% IF ( BakerTaylorEnabled ) %][% IF ( SEARCH_RESULT.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] [% END %] 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 0e68220c2b..fc17adc2b0 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-shelves.tt @@ -240,7 +240,7 @@ $(function() { [% END %] - [% UNLESS ( itemsloo.item_level_itypes ) %] + [% UNLESS ( item_level_itypes ) %] [% UNLESS ( itemsloo.noItemTypeImages ) %] [% itemsloo.description %] @@ -334,16 +334,16 @@ $(function() { - [% IF ( itemsloo.OPACAmazonEnabled ) %][% IF ( itemsloo.OPACAmazonCoverImages ) %][% IF ( itemsloo.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] + [% IF ( itemsloo.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( itemsloo.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] - [% IF ( itemsloo.SyndeticsEnabled ) %][% IF ( itemsloo.SyndeticsCoverImages ) %][% IF ( itemsloo.using_https ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( itemsloo.SyndeticsCoverImages ) %][% IF ( itemsloo.using_https ) %] [% ELSE %] [% END %][% END %][% END %] - [% IF ( itemsloo.GoogleJackets ) %][% IF ( itemsloo.normalized_isbn ) %]
        [% ELSE %]No cover image available[% END %][% END %] + [% IF ( GoogleJackets ) %][% IF ( itemsloo.normalized_isbn ) %]
        [% ELSE %]No cover image available[% END %][% END %]         - [% IF ( itemsloo.BakerTaylorEnabled ) %][% IF ( itemsloo.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] + [% IF ( BakerTaylorEnabled ) %][% IF ( itemsloo.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% 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 fc6a88adda..485e29a450 100644 --- a/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews.tt +++ b/koha-tt/opac-tmpl/prog/en/modules/opac-showreviews.tt @@ -60,16 +60,16 @@ $(document).ready(function(){ [% END %] - [% IF ( review.OPACAmazonEnabled ) %][% IF ( review.OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] + [% IF ( review.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %][% ELSE %]No cover image available[% END %][% END %][% END %] - [% IF ( review.SyndeticsEnabled ) %][% IF ( review.SyndeticsCoverImages ) %][% IF ( review.using_https ) %] + [% IF ( SyndeticsEnabled ) %][% IF ( review.SyndeticsCoverImages ) %][% IF ( review.using_https ) %] [% ELSE %] [% END %][% END %][% END %] - [% IF ( review.GoogleJackets ) %][% IF ( review.normalized_isbn ) %]
        [% ELSE %]No cover image available[% END %][% END %] + [% IF ( GoogleJackets ) %][% IF ( review.normalized_isbn ) %]
        [% ELSE %]No cover image available[% END %][% END %] - [% IF ( review.BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] + [% IF ( BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %]See Baker & Taylor[% ELSE %]No cover image available[% END %][% END %] [% END %] -- 2.39.5