Bug 5917 : Yet more scoping

diff --git a/installer/html-template-to-template-toolkit.pl b/installer/html-template-to-template-toolkit.pl
index 00607f2..4a4a77a 100755 (executable)
--- 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 b9434dd..3d712c2 100644 (file)
--- 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 %]
   <tr>
     [% END %]
-   [% UNLESS ( loo.noItemTypeImages ) %] <td>[% IF ( loo.imageurl ) %]<img src="[% loo.imageurl %]" alt="" />[% ELSE %]&nbsp;[% END %]</td>[% END %]
+   [% UNLESS ( noItemTypeImages ) %] <td>[% IF ( loo.imageurl ) %]<img src="[% loo.imageurl %]" alt="" />[% ELSE %]&nbsp;[% END %]</td>[% END %]
     <td>
       <a href="[% loo.script_name %]?op=add_form&amp;itemtype=[% loo.itemtype |html %]">
         [% 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 3c87649..c7d34d5 100644 (file)
--- 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 @@
         <tr>
       [% FOREACH itemtypeloo IN itemtypeloop %]
         <td>
-        [% UNLESS ( itemtypeloo.noItemTypeImages ) %]
+        [% UNLESS ( noItemTypeImages ) %]
         [% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %]
         [% END %]
                <input type="checkbox" id="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]" />&nbsp;

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 c93212f..f383c21 100644 (file)
--- 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 <span class="ex">[% message %]</span>
         [% todayissue.dd %]
         </td>
         <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% todayissue.biblionumber %]&amp;type=intra"><strong>[% todayissue.title |html %]</strong></a>[% IF ( todayissue.author ) %], by [% todayissue.author %][% END %][% IF ( todayissue.itemnotes ) %]- <span class="circ-hlt">[% todayissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% todayissue.biblionumber %]&amp;itemnumber=[% todayissue.itemnumber %]#item[% todayissue.itemnumber %]">[% todayissue.barcode %]</a></td>
-        <td>[% UNLESS ( todayissue.noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
+        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( todayissue.itemtype_image ) %]<img src="[% todayissue.itemtype_image %]" alt="" />[% END %][% END %][% todayissue.itemtype %]</td>
         <td>[% todayissue.checkoutdate %]</td>
         [% IF ( todayissue.multiple_borrowers ) %]<td>[% todayissue.borrowername %]</td>[% END %]
         <td>[% todayissue.itemcallnumber %]</td>
@@ -855,7 +855,7 @@ No patron matched <span class="ex">[% message %]</span>
         [% IF ( relissue.overdue ) %]<td class="od">[% ELSE %]<td>[% END %]
             [% relissue.dd %]</td>
         <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% relissue.biblionumber %]&amp;type=intra"><strong>[% relissue.title |html %]</strong></a>[% IF ( relissue.author ) %], by [% relissue.author %][% END %][% IF ( relissue.itemnotes ) %]- <span class="circ-hlt">[% relissue.itemnotes %]</span>[% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissue.biblionumber %]&amp;itemnumber=[% relissue.itemnumber %]#item[% relissue.itemnumber %]">[% relissue.barcode %]</a></td>
-        <td>[% UNLESS ( relissue.noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
+        <td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissue.itemtype_image ) %]<img src="[% relissue.itemtype_image %]" alt="" />[% END %][% END %][% relissue.itemtype %]</td>
        <td>[% relissue.branchdisplay %]
         [% IF ( relissue.itemcallnumber ) %]([% relissue.itemcallnumber %])[% END %]</td>
         <td>[% relissue.displaydate %]</td>

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 a75a25c..f99b7bb 100644 (file)
--- 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 %]
 </td>
             <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% issueloo.biblionumber %]"><strong>[% issueloo.title |html %]</strong></a>[% IF ( issueloo.author ) %], by [% issueloo.author %][% END %] [% IF ( issueloo.publishercode ) %]; [% issueloo.publishercode %] [% END %] [% IF ( issueloo.publicationyear ) %], [% issueloo.publicationyear %][% END %] <a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% issueloo.biblionumber %]&amp;itemnumber=[% issueloo.itemnumber %]#item[% issueloo.itemnumber %]">[% issueloo.barcode %]</a></td>
-<td>[% UNLESS ( issueloo.noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>
+<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( issueloo.itemtype_image ) %]<img src="[% issueloo.itemtype_image %]" alt="" />[% END %][% END %][% issueloo.itemtype_description %]</td>
             <td>[% issueloo.issuedate %]</td>
                <td>[% issueloo.itemcallnumber %]</td>
             <td>[% issueloo.charge %]</td>
@@ -552,7 +552,7 @@ function validate1(date) {
             <td>[% relissueloo.collection %]</td>
             <td>[% relissueloo.stocknumber %]</td>
             <td><a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% relissueloo.biblionumber %]&amp;itemnumber=[% relissueloo.itemnumber %]#item[% relissueloo.itemnumber %]">[% relissueloo.barcode %]</a></td>
-<td>[% UNLESS ( relissueloo.noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
+<td>[% UNLESS ( noItemTypeImages ) %] [% IF ( relissueloo.itemtype_image ) %]<img src="[% relissueloo.itemtype_image %]" alt="" />[% END %][% END %][% relissueloo.itemtype_description %]</td>
             <td>[% relissueloo.issuedate %]</td>
            <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% relissueloo.borrowernumber %]">[% relissueloo.borrowername %]</a></td>
            <td>[% relissueloo.itemcallnumber %]</td>

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 4df00b5..43b6cd1 100644 (file)
--- 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() {
             </td>
             [% IF ( item_level_itypes ) %]
                 <td>
-                    [% UNLESS ( itemloo.noItemTypeImages ) %]
+                    [% UNLESS ( noItemTypeImages ) %]
                         [% IF ( itemloo.imageurl ) %]<img src="[% itemloo.imageurl %]" alt="" /> <br /> [% 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 7d7d123..bcf94b8 100644 (file)
--- 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 %]
                        </td>
                        [% END %]
-                       [% UNLESS ( itemsloo.item_level_itypes ) %]<td>
-                [% UNLESS ( itemsloo.noItemTypeImages ) %]<img src="[% itemsloo.imageurl %]" alt="[% itemsloo.description %]" title="[% itemsloo.description %]" />[% END %][% itemsloo.description %]
+                       [% UNLESS ( item_level_itypes ) %]<td>
+                [% UNLESS ( noItemTypeImages ) %]<img src="[% itemsloo.imageurl %]" alt="[% itemsloo.description %]" title="[% itemsloo.description %]" />[% END %][% itemsloo.description %]
                        </td>[% END %]
                        <td>
                        [% 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 92eb8a5..4d55be7 100644 (file)
--- 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 @@
     <table>
         <tr>
     [% FOREACH itemtypeloo IN itemtypeloop %]
-        <td><input type="checkbox" id="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]">[% UNLESS ( itemtypeloo.noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %]&nbsp;[% END %]
+        <td><input type="checkbox" id="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]" name="limit" value="mc-[% itemtypeloo.ccl %]:[% itemtypeloo.code %]"/><label for="[% itemtypeloo.ccl %]-[% itemtypeloo.number %]">[% UNLESS ( noItemTypeImages ) %][% IF ( itemtypeloo.imageurl ) %]<img border="0" src="[% itemtypeloo.imageurl %]" alt="[% itemtypeloo.description %]" />[% END %]&nbsp;[% END %]
         [% itemtypeloo.description %]</label></td>
         [% UNLESS ( itemtypeloo.count5 ) %][% UNLESS ( loop.last ) %]</tr><tr>[% 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 c5e42c5..4ef4178 100644 (file)
--- 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.
                     <span class="item-details">
                         [% READING_RECOR.author %]
                     </span></td>
-<td>[% UNLESS ( READING_RECOR.noItemTypeImages ) %][% IF ( READING_RECOR.imageurl ) %]<img src="[% READING_RECOR.imageurl %]" alt="" />[% END %][% END %] [% READING_RECOR.description %]</td>
+<td>[% UNLESS ( noItemTypeImages ) %][% IF ( READING_RECOR.imageurl ) %]<img src="[% READING_RECOR.imageurl %]" alt="" />[% END %][% END %] [% READING_RECOR.description %]</td>
 <td>[% READING_RECOR.itemcallnumber %]</td>
 <td>[% IF ( READING_RECOR.returndate ) %][% READING_RECOR.returndate %][% ELSE %]<em>(Checked out)</em>[% END %]</td>
 </tr>

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 08430dd..742851d 100644 (file)
--- 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 @@
                               </td>
                               [% IF ( item_level_itypes ) %]
                                 <td>
-                                  [% UNLESS ( itemLoo.noItemTypeImages ) %]
+                                  [% UNLESS ( noItemTypeImages ) %]
                                   [% IF ( itemLoo.imageurl ) %]<img src="[% itemLoo.imageurl %]" alt="" />[% 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 8e3c032..32012aa 100644 (file)
--- 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() {
                         <a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=[% GROUP_RESULT.biblionumber |url %]">[% IF ( GROUP_RESULT.isbn ) %]<img src="http://images.amazon.com/images/P/[% GROUP_RESULT.isbn %].01.TZZZZZZZ.jpg" alt="" class="thumbnail" />[% ELSE %]<img src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="" class="thumbnail" />[% END %]
                         </a>
                         [% ELSE %]
-                        [% UNLESS ( GROUP_RESULT.noItemTypeImages ) %]
+                        [% UNLESS ( noItemTypeImages ) %]
                             [% IF ( GROUP_RESULT.imageurl ) %]
                                 <img src="[% GROUP_RESULT.imageurl %]" title="[% GROUP_RESULT.description %]" />
                             [% 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 2970680..5b64256 100644 (file)
--- 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(){
                 <td class="select selectcol">[% SEARCH_RESULT.result_number %].</td>
 
                                [% UNLESS ( item_level_itypes ) %]
-                [% UNLESS ( SEARCH_RESULT.noItemTypeImages ) %]
+                [% UNLESS ( noItemTypeImages ) %]
 
                                <td class="itypecol">
                 [% 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 fc17adc..0d561d3 100644 (file)
--- 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 %]" /></td>
                     [% UNLESS ( item_level_itypes ) %]
                         <td>
-                          [% UNLESS ( itemsloo.noItemTypeImages ) %]
+                          [% UNLESS ( noItemTypeImages ) %]
                           <img src="[% itemsloo.imageurl %]" alt="[% itemsloo.description %]" title="[% 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 e28d7ad..fa48879 100644 (file)
--- 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 @@
        <title>New comment on [% review.title |html %] [% FOREACH subtitl IN review.subtitle %], [% subtitl.subfield |html %][% END %]</title>
        <link>[% review.OPACBaseurl %]/cgi-bin/koha/opac-detail.pl?biblionumber=[% review.biblionumber %]#comments</link>
        <description><![CDATA[
-[% IF ( review.OPACAmazonEnabled ) %][% IF ( review.OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %]<img src="http://images.amazon.com/images/P/[% review.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" />[% END %][% END %][% END %]
+[% IF ( review.OPACAmazonEnabled ) %][% IF ( OPACAmazonCoverImages ) %][% IF ( review.normalized_isbn ) %]<img src="http://images.amazon.com/images/P/[% review.normalized_isbn %].01.TZZZZZZZ.jpg" alt="" />[% END %][% END %][% END %]
 
-[% IF ( review.SyndeticsEnabled ) %][% IF ( review.SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %][% IF ( review.using_https ) %]<img src="https://secure.syndetics.com/index.aspx?isbn=[% review.normalized_isbn %]/SC.GIF&amp;client=[% review.SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% review.normalized_upc %]&amp;oclc=[% review.normalized_oclc %]" alt="" />
+[% IF ( SyndeticsEnabled ) %][% IF ( review.SyndeticsCoverImages ) %][% IF ( review.content_identifier_exists ) %][% IF ( review.using_https ) %]<img src="https://secure.syndetics.com/index.aspx?isbn=[% review.normalized_isbn %]/SC.GIF&amp;client=[% review.SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% review.normalized_upc %]&amp;oclc=[% review.normalized_oclc %]" alt="" />
 [% ELSE %]
 <img src="http://www.syndetics.com/index.aspx?isbn=[% review.normalized_isbn %]/SC.GIF&amp;client=[% review.SyndeticsClientCode %]&amp;type=xw10&amp;upc=[% review.normalized_upc %]&amp;oclc=[% review.normalized_oclc %]" alt="" />
 [% END %][% END %][% END %][% END %]
 
-[% IF ( review.BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %]<a href="https://[% review.BakerTaylorBookstoreurl |html %][% review.normalized_isbn %]"><img alt="See Baker &amp; Taylor" src="[% review.BakerTaylorImageurl |html %][% review.normalized_isbn %]" /></a>[% END %][% END %]
+[% IF ( BakerTaylorEnabled ) %][% IF ( review.normalized_isbn ) %]<a href="https://[% review.BakerTaylorBookstoreurl |html %][% review.normalized_isbn %]"><img alt="See Baker &amp; Taylor" src="[% review.BakerTaylorImageurl |html %][% review.normalized_isbn %]" /></a>[% END %][% END %]
           [% IF ( review.author ) %]<p>By [% review.author |html %].</p> [% END %]
           <p>[% 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 %]