From 0560aa768cc1b128891259982a25ee2450470e79 Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmcharlt@gmail.com>
Date: Wed, 15 Dec 2010 11:26:04 -0500
Subject: [PATCH] bug 5398: make additional pages in staff interface obey
 noItemTypeImages

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 .../intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl   | 2 ++
 koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl | 5 ++++-
 .../intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl | 1 -
 .../prog/en/modules/virtualshelves/shelves.tmpl              | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
index aeed108174..d2334e0b0e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
@@ -90,7 +90,9 @@
         <tr>
       <!--TMPL_LOOP Name="itemtypeloop"-->
         <td>
+        <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
         <!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->
+        <!-- /TMPL_UNLESS -->
 		<input type="checkbox" id="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->" name="limit" value="mc-<!-- TMPL_VAR NAME="ccl" -->:<!--TMPL_VAR Name="code" -->" />&nbsp;
         <label for="<!-- TMPL_VAR NAME="ccl" -->-<!--TMPL_VAR Name="number" -->"><!--TMPL_VAR Name="description" --></label></td>
         <!-- TMPL_UNLESS name="count5" --></tr><tr><!-- /TMPL_UNLESS -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index 53f9138768..225c4b3eb3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -405,7 +405,10 @@ function checkMultiHold() {
             </td>
             <!-- TMPL_IF NAME="item-level_itypes" -->
                 <td>
-                    <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR name="imageurl" -->" alt="" /> <br /> <!-- /TMPL_IF --><!-- TMPL_VAR NAME="itypename" -->
+                    <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
+                        <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR name="imageurl" -->" alt="" /> <br /> <!-- /TMPL_IF -->
+                    <!-- /TMPL_UNLESS -->
+                    <!-- TMPL_VAR NAME="itypename" -->
                 </td>
             <!-- /TMPL_IF -->
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
index 2e6459f1b0..0b4e3513de 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
@@ -112,7 +112,6 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di
             <select id="itemtype" name="itemtype" >
             <!--TMPL_LOOP Name="itemtypeloop"-->
                 <!--TMPL_IF Name="selected"--><option selected="selected" value="<!--TMPL_VAR Name="itemtype" -->"><!--TMPL_ELSE--><option value="<!--TMPL_VAR Name="itemtype" -->"><!--/TMPL_IF-->
-                <!-- TMPL_IF name="imageurl"--><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /><!-- /TMPL_IF -->
                 <!--TMPL_VAR Name="description" --></option>
             <!--/TMPL_LOOP-->
             </select>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
index ddd895cde5..827f5be04f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -193,7 +193,7 @@ function placeHold () {
 			</td>
 			<!-- /TMPL_IF -->
 			<!-- 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_INCLUDE NAME="biblio-default-view.inc" -->
-- 
2.20.1