From 7a945dbc284a9fc98fda06a49bbac0712bce4fea Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmcharlt@gmail.com>
Date: Fri, 12 Nov 2010 22:41:32 -0500
Subject: [PATCH] bug 4359: make other pages in the OPAC respect
 noItemTypeImages

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl    | 4 ++++
 .../opac-tmpl/prog/en/modules/opac-results-grouped.tmpl  | 9 +++++----
 koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl    | 2 ++
 koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl    | 5 ++++-
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index 812c91b133..52ff4cdae4 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -296,7 +296,9 @@
                     </td>
                     <!-- TMPL_UNLESS NAME="item-level_itypes" -->
                       <td>
+                        <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
                         <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF -->
+                        <!-- /TMPL_UNLESS -->
 						<!-- TMPL_VAR NAME="description" -->
                       </td>
                     <!-- /TMPL_UNLESS -->
@@ -472,7 +474,9 @@
                               </td>
                               <!-- TMPL_IF NAME="item-level_itypes" -->
                                 <td>
+                                  <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
                                   <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF -->
+                                  <!-- /TMPL_UNLESS -->
 								<!-- TMPL_VAR NAME="description" -->
                                 </td>
                               <!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
index 1d5e8f1913..288392fb20 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
@@ -200,12 +200,13 @@ function highlightOn() {
                         <a class="p1" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_IF NAME="isbn" --><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR name="isbn" -->.01.TZZZZZZZ.jpg" alt="" class="thumbnail" /><!-- TMPL_ELSE --><img src="http://g-images.amazon.com/images/G/01/x-site/icons/no-img-sm.gif" alt="" class="thumbnail" /><!-- /TMPL_IF -->
                         </a>
                         <!-- TMPL_ELSE -->
-                        <!-- TMPL_IF name="imageurl" -->
-                        <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" />
-                        <!-- TMPL_ELSE -->
+                        <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
+                            <!-- TMPL_IF name="imageurl" -->
+                                <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" />
+                            <!-- /TMPL_IF -->
+                        <!-- /TMPL_UNLESS -->
                         <!-- TMPL_VAR name="description" -->
                         <!-- /TMPL_IF -->
-                        <!-- /TMPL_IF -->
                     </td>
                     <td><!-- TMPL_VAR NAME="result_number" -->. <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a>
                       <!-- TMPL_ELSE -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 3d59dd13f1..aa39b9a92a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -373,11 +373,13 @@ $(document).ready(function(){
                 <td class="select selectcol"><!-- TMPL_VAR NAME="result_number" -->.</td>
 
 				<!-- TMPL_UNLESS NAME="item-level_itypes" -->
+                <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
 				<td class="itypecol">
                 <!-- TMPL_IF name="imageurl" -->
 				<img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR name="description" -->" />
                 <!-- /TMPL_IF -->
 				</td>
+                <!-- /TMPL_UNLESS-->
                 <!-- /TMPL_UNLESS-->
 
 				<!-- TMPL_IF NAME="AuthorisedValueImages" -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index b79ddab612..8e846324f7 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -248,7 +248,10 @@ $(function() {
                                    value="<!-- TMPL_VAR NAME="biblionumber">" /></td>
                     <!-- TMPL_UNLESS NAME="item-level_itypes" -->
                         <td>
-                          <img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /><!-- TMPL_VAR NAME="description" -->
+                          <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
+                          <img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" />
+                          <!-- /TMPL_UNLESS -->
+                          <!-- TMPL_VAR NAME="description" -->
                         </td>
                     <!-- /TMPL_UNLESS -->
                         <td><!-- TMPL_IF NAME="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_LOOP NAME="subtitle" --><!-- TMPL_VAR NAME="subfield" --><!-- /TMPL_LOOP --><!-- /TMPL_IF --></a><!-- TMPL_ELSE -->
-- 
2.20.1