From 39eba725d8e4ea27ffa7f054fd196a311ceb1d92 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Sat, 1 Mar 2008 09:28:31 +1300 Subject: [PATCH] Fixing some call number and item type display issues. Still need item type images in search results and reading record page. Signed-off-by: Chris Cormack Signed-off-by: Joshua Ferraro --- .../opac-tmpl/prog/en/modules/opac-detail.tmpl | 5 ++--- .../prog/en/modules/opac-readingrecord.tmpl | 18 ++++++++++++------ .../prog/en/modules/opac-results.tmpl | 6 ++---- .../prog/en/modules/opac-shelves.tmpl | 2 -- .../prog/en/modules/opac-topissues.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-user.tmpl | 17 ++++++++--------- opac/opac-detail.pl | 9 +++++++++ opac/opac-readingrecord.pl | 3 ++- 8 files changed, 36 insertions(+), 26 deletions(-) diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl index 23b626f54a..d6461b87da 100755 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl @@ -224,7 +224,6 @@ - @@ -234,8 +233,8 @@ - - + - + diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl index 4852eff03e..c73c8d3c56 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl @@ -129,7 +129,9 @@
Item typeCollection Location Status Date Due
" title="" alt="" /> + Not for loan diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl index a085e7aa62..bad859f0f3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl @@ -29,20 +29,26 @@ You have never borrowed anything from this library.
- + - + + - - + + + + 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 7bb9dadac9..19f5b93179 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl @@ -215,10 +215,8 @@ $(document).ready(function(){

-

">Place Hold " name="biblionumber" value="" title="Click to add to cart" /> - "> - - +

">Place Hold " name="biblionumber" value="" title="Click to add to cart" /> + ">

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 8232d05feb..2b8f04f5a7 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl @@ -59,7 +59,6 @@ - @@ -88,7 +87,6 @@ -
+ TitleTitleAuthorAuthorItem TypeCall No. DateDate
">">.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" />"> + + + (Checked out)
Title Author CopyrightDate Added
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl index 951170e213..ed19e7cb58 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl @@ -77,7 +77,7 @@ function Dopop(link) {
Title ItemtypeIssuesCheckouts
- + + + @@ -155,20 +157,17 @@ + - - + + diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl index 2dcb22b6c6..773d5e9a58 100755 --- a/opac/opac-detail.pl +++ b/opac/opac-detail.pl @@ -85,6 +85,8 @@ if (C4::Context->preference("RequestOnOpac")) { } my $norequests = 1; +my $imgdir = getitemtypeimagesrc(); +my $itemtypes = GetItemTypes(); foreach my $itm (@items) { $norequests = 0 && $norequests if ( (not $itm->{'wthdrawn'} ) @@ -93,6 +95,13 @@ foreach my $itm (@items) { || ($itm->{'itemnumber'} ) ); $itm->{ $itm->{'publictype'} } = 1; + # imageurl: + my $itemtype = $itm->{'itemtype'}; + if ( $itemtype ) { + $itm->{'imageurl'} = $imgdir."/".$itemtypes->{$itemtype}->{'imageurl'}; + $itm->{'description'} = $itemtypes->{$itemtype}->{'description'}; + } + #get collection code description, too $itm->{'ccode'} = GetAuthorisedValueDesc('','', $itm->{'ccode'} ,'','','CCODE'); } diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl index a52170e6f9..a63e4ab0bc 100755 --- a/opac/opac-readingrecord.pl +++ b/opac/opac-readingrecord.pl @@ -89,7 +89,8 @@ for ( my $i = 0 ; $i < $count ; $i++ ) { $line{biblionumber} = $issues->[$i]->{'biblionumber'}; $line{title} = $issues->[$i]->{'title'}; $line{author} = $issues->[$i]->{'author'}; - $line{classification} = $issues->[$i]->{'classification'}; + $line{isbn} = $issues->[$i]->{'isbn'}; + $line{itemcallnumber} = $issues->[$i]->{'itemcallnumber'}; $line{date_due} = format_date( $issues->[$i]->{'date_due'} ); $line{returndate} = format_date( $issues->[$i]->{'returndate'} ); $line{volumeddesc} = $issues->[$i]->{'volumeddesc'}; -- 2.20.1
Items
Title TitleItem Type Call No. Due ">.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" /> - - .gif" title="" alt="" /> - - - - ">.01.THUMBZZZ.jpg" alt="Book Cover Image" class="thumbnail" /> "> + " title="" alt="" /> +