Correction to results.tmpl, enabling noItemTypeImages preference in Lists (Bug 1780).

Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
index cdb77fe..df83fd7 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
@@ -352,9 +352,9 @@ $(window).load(function() {
                                     <!-- TMPL_LOOP NAME="other_items_loop" -->
                                         <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item-level_itypes" -->
                                         <!-- TMPL_IF name="imageurl" -->
-                                        <li style="list-style: none; list-style-type: none; background-image: url(<!-- TMPL_VAR name=imageurl -->); background-repeat: no-repeat; background-position: 0 50%; padding: 3px 0 3px 30px; margin: .4em 0;" title="<!-- TMPL_VAR name="description" -->">
+                                        <li style="list-style: none; list-style-type: none; background-image: url(<!-- TMPL_VAR name="imageurl" -->); background-repeat: no-repeat; background-position: 0 50%; padding: 3px 0 3px 30px; margin: .4em 0;" title="<!-- TMPL_VAR name="description" -->">
                                         <!-- TMPL_ELSE --><li><!-- /TMPL_IF -->
-                                        <!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF -->                                       >
+                                        <!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
                                         <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF NAME="location" --><!-- TMPL_VAR NAME="location" --><!-- /TMPL_IF -->

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 9ef3bc0..4d1ae60 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -121,8 +121,7 @@ $(document).ready(function(){
     <table>
             <tr>
                 <th class="checkall">&nbsp;</th>
-                <th>Type</th>
-                <th>Icon</th>
+                <th>Item Type</th>
                 <th>Title</th>
                 <th>Author</th>
                 <th>Date Added</th>
@@ -143,14 +142,11 @@ $(document).ready(function(){
                                <!-- /TMPL_IF -->
                        </td>
                        <td>
-                               <!-- TMPL_VAR NAME="itemtype" -->
-                       </td>
-                       <td>
-                               <!-- TMPL_IF NAME="imageurl" -->
-                               <img src="<!-- TMPL_VAR NAME="themelang" -->/../img/itemtypeimg/<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
+                               <!-- TMPL_UNLESS NAME="noItemTypeImages" --><!-- TMPL_IF NAME="imageurl" -->
+                               <img src="<!-- TMPL_VAR NAME="themelang" -->/../img/itemtypeimg/<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" />
                                <!-- TMPL_ELSE -->
-                               <img src="<!-- TMPL_VAR NAME="themelang" -->/../img/itemtypeimg/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
-                               <!-- /TMPL_IF -->
+                               <img src="<!-- TMPL_VAR NAME="themelang" -->/../img/itemtypeimg/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" />
+                               <!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="itemtype" --><!-- /TMPL_UNLESS -->
                        </td>
                        <td>
                        <!-- TMPL_IF name="BiblioDefaultViewmarc" -->