fixing display of itemtypes and itemtype icons in virtual shelves

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/C4/VirtualShelves/Page.pm b/C4/VirtualShelves/Page.pm
index fbfb4bf..a855086 100755 (executable)
--- a/C4/VirtualShelves/Page.pm
+++ b/C4/VirtualShelves/Page.pm
@@ -26,6 +26,7 @@ use CGI;
 use C4::VirtualShelves qw/:DEFAULT GetShelvesSummary/;
 use C4::Biblio;
 use C4::Items;
+use C4::Koha;
 use C4::Auth qw/get_session/;
 use C4::Members;
 use C4::Output;
@@ -59,7 +60,9 @@ sub shelfpage ($$$$$) {
        # getting the Shelves list
        my $shelflist = GetShelves( $loggedinuser, 2 );
        my $op = $query->param('op');
-
+    my $imgdir = getitemtypeimagesrc();
+    my $itemtypes = GetItemTypes();
+    
 # the format of this is unindented for ease of diff comparison to the old script
 # Note: do not mistake the assignment statements below for comparisons!
 
@@ -138,6 +141,10 @@ SWITCH: {
         #check that the user can view the shelf
         if ( ShelfPossibleAction( $loggedinuser, $shelfnumber, 'view' ) ) {
             my $items = GetShelfContents($shelfnumber);
+            for my $this_item (@$items) {
+                $this_item->{imageurl} = $imgdir."/".$itemtypes->{ $this_item->{itemtype}  }->{'imageurl'};
+                $this_item->{'description'} = $itemtypes->{ $this_item->{itemtype} }->{'description'};
+            }
                        $showadd = 1;
                        my $i = 0;
                        foreach (grep {$i++ % 2} @$items) {     # every other item

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 7259088..6610ba2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
@@ -118,7 +118,7 @@ $(document).ready(function(){
     <table>
             <tr>
                 <th class="checkall">&nbsp;</th>
-                <th>Item Type</th>
+                <!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th><!-- /TMPL_UNLESS -->
                 <th>Title</th>
                 <th>Author</th>
                 <th>Date Added</th>
@@ -138,13 +138,9 @@ $(document).ready(function(){
                                <input type="checkbox" name="REM-<!-- TMPL_VAR NAME="biblionumber" -->" />
                                <!-- /TMPL_IF -->
                        </td>
-                       <td>
-                               <!-- 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="description" -->" title="<!-- TMPL_VAR NAME="description" -->" />
-                               <!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="itemtype" --><!-- /TMPL_UNLESS -->
-                       </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 --></td>
                        <td>
                        <!-- TMPL_IF name="BiblioDefaultViewmarc" -->
                                <a class="title" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->">

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 7923d0d..75a0dfb 100644 (file)
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -87,7 +87,7 @@ $.tablesorter.addParser({
                <span class="clearall"></span><!-- /TMPL_IF --><table id="listcontents">
         <thead><tr>
             <!-- TMPL_IF NAME="manageshelf" --><th>&nbsp;</th><!-- /TMPL_IF -->
-            <th>&nbsp;</th>
+            <!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th><!-- /TMPL_UNLESS -->
             <th>Title</th>
             <th>Author</th>
             <th>Copyright</th>
@@ -103,9 +103,10 @@ $.tablesorter.addParser({
                 <input type="checkbox" name="REM-<!-- TMPL_VAR NAME="biblionumber" -->" />
             </td>
                 <!-- /TMPL_IF -->
-            <td>
-                <img src="<!-- TMPL_VAR NAME="themelang" -->/../itemtypeimg/<!-- TMPL_VAR NAME="itemtype" -->.gif" alt="<!-- TMPL_VAR NAME="itemtype" -->" title="<!-- TMPL_VAR NAME="itemtype" -->" />
-            </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" -->
+            </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" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><!-- TMPL_IF NAME="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a><!-- /TMPL_IF --><!-- /TMPL_IF --></td>
             <td><!-- TMPL_VAR NAME="author" --></td>
             <td><!-- TMPL_VAR NAME="copyrightdate" --></td>