Bugzilla – Attachment 7344 Details for
Bug 7140
Add item type description on the catalogue search and detail screens
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
0001-bug_7140-Added-item-description-to-complement-icon-t.patch (text/plain), 14.13 KB, created by
Srdjan Jankovic
on 2012-01-27 04:03:54 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Srdjan Jankovic
Created:
2012-01-27 04:03:54 UTC
Size:
14.13 KB
patch
obsolete
>From 18f7f7054a92372174357944ae46bba2532fa91e Mon Sep 17 00:00:00 2001 >From: Srdjan Jankovic <srdjan@catalyst.net.nz> >Date: Fri, 27 Jan 2012 16:59:27 +1300 >Subject: [PATCH] bug_7140: Added item description to complement icon to search result and > biblio detail pages > >--- > C4/Search.pm | 5 +- > .../prog/en/modules/catalogue/detail.tt | 14 ++--- > .../prog/en/modules/catalogue/results.tt | 69 +++++++++++++------- > 3 files changed, 54 insertions(+), 34 deletions(-) > >diff --git a/C4/Search.pm b/C4/Search.pm >index 4a8de5c..574dc94 100644 >--- a/C4/Search.pm >+++ b/C4/Search.pm >@@ -1622,6 +1622,7 @@ sub searchResults { > foreach my $code ( keys %subfieldstosearch ) { > $item->{$code} = $field->subfield( $subfieldstosearch{$code} ); > } >+ $item->{description} = $itemtypes{ $item->{itype} }{description}; > > # Hidden items > my @items = ($item); >@@ -1650,6 +1651,7 @@ sub searchResults { > $onloan_items->{$key}->{branchname} = $item->{branchname}; > $onloan_items->{$key}->{location} = $shelflocations->{ $item->{location} }; > $onloan_items->{$key}->{itemcallnumber} = $item->{itemcallnumber}; >+ $onloan_items->{$key}->{description} = $item->{description}; > $onloan_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} ); > # if something's checked out and lost, mark it as 'long overdue' > if ( $item->{itemlost} ) { >@@ -1733,6 +1735,7 @@ sub searchResults { > $other_items->{$key}->{notforloan} = GetAuthorisedValueDesc('','',$item->{notforloan},'','',$notforloan_authorised_value) if $notforloan_authorised_value; > $other_items->{$key}->{count}++ if $item->{$hbranch}; > $other_items->{$key}->{location} = $shelflocations->{ $item->{location} }; >+ $other_items->{$key}->{description} = $item->{description}; > $other_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} ); > } > # item is available >@@ -1740,7 +1743,7 @@ sub searchResults { > $can_place_holds = 1; > $available_count++; > $available_items->{$prefix}->{count}++ if $item->{$hbranch}; >- foreach (qw(branchname itemcallnumber hideatopac)) { >+ foreach (qw(branchname itemcallnumber hideatopac description)) { > $available_items->{$prefix}->{$_} = $item->{$_}; > } > $available_items->{$prefix}->{location} = $shelflocations->{ $item->{location} }; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index 38a26c9..494b764 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -261,16 +261,12 @@ function verify_images() { > [% FOREACH itemloo IN itemloop %] > <tr> > [% IF ( item_level_itypes ) %] >- <td class="itype"> >- [% IF ( noItemTypeImages ) %] >- [% itemloo.description %] >- [% ELSE %] >- [% IF ( itemloo.imageurl ) %] >+ <td class="itype"> >+ [% IF !noItemTypeImages && itemloo.imageurl %] > <img src="[% itemloo.imageurl %]" alt="[% itemloo.description %]" title="[% itemloo.description %]" /> >- [% ELSE %] >- [% itemloo.description %] >- [% END %] >- [% END %]</td> >+ [% END %] >+ [% itemloo.description %] >+ </td> > [% END %] > <td class="location">[% UNLESS ( singlebranchmode ) %][% itemloo.branchname %] [% END %]</td> > <td class="homebranch">[% itemloo.homebranch %]<span class="shelvingloc">[% itemloo.location %]</span> </td> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >index 18a992d..bf63b89 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt >@@ -470,17 +470,18 @@ YAHOO.util.Event.onContentReady("searchheader", function () { > [% END %] > <p> > [% UNLESS ( item_level_itypes ) %] >- [% UNLESS ( noItemTypeImages ) %][% IF ( SEARCH_RESULT.imageurl ) %] >- <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="" /> >- [% END %][% END %] >+ [% IF !noItemTypeImages && SEARCH_RESULT.imageurl %] >+ <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="[% SEARCH_RESULT.description %]" /> >+ [% END %] >+ [% SEARCH_RESULT.description %] > [% END %] > [% SEARCH_RESULT.summary %]</p> > [% ELSE %] > <p> > [% UNLESS ( item_level_itypes ) %] >- [% UNLESS ( noItemTypeImages ) %][% IF ( SEARCH_RESULT.imageurl ) %] >+ [% IF !noItemTypeImages && SEARCH_RESULT.imageurl %] > <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="" /> >- [% END %][% END %] >+ [% END %] > [% END %] > > [% IF ( SEARCH_RESULT.author ) %] >@@ -532,41 +533,56 @@ YAHOO.util.Event.onContentReady("searchheader", function () { > <ul> > [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %] > >- [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %][% IF ( available_items_loo.imageurl ) %]<li style="list-style: none; list-style-type: none;"><img src="[% available_items_loo.imageurl %]" title="[% available_items_loo.description %]" alt="[% available_items_loo.description %]" />[% ELSE %]<li>[% END %][% ELSE %]<li>[% END %][% END %] >+ [% IF item_level_itypes && !noItemTypeImages && available_items_loo.imageurl %] >+ <li style="list-style: none; list-style-type: none;"> >+ <img src="[% available_items_loo.imageurl %]" title="[% available_items_loo.description %]" alt="[% available_items_loo.description %]" /> >+ [% ELSE %] >+ <li> >+ [% END %] > [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname %][% END %] > [% IF ( available_items_loo.location ) %][% available_items_loo.location %][% END %] > [% IF ( available_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&q=[% available_items_loo.itemcallnumber |url %]">[% available_items_loo.itemcallnumber %]</a>][% END %] >- ([% available_items_loo.count %])</li> >- [% END %]</ul> >+ ([% available_items_loo.count %]) >+ [% IF item_level_itypes && available_items_loo.description %] >+ <br/>[% available_items_loo.description %] >+ [% END %] >+ </li> >+ [% END %] >+ </ul> > [% END %] > > [% IF ( SEARCH_RESULT.onloancount ) %] > <span class="status">[% SEARCH_RESULT.onloancount %] on loan:</span> > <ul> > [% FOREACH onloan_items_loo IN SEARCH_RESULT.onloan_items_loop %] >- [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %] >- [% IF ( onloan_items_loo.imageurl ) %] >- <li style="list-style: none; list-style-type: none;"><img src="[% onloan_items_loo.imageurl %]" title="[% onloan_items_loo.description %]" alt="[% onloan_items_loo.description %]" /> >- [% ELSE %]<li>[% END %] >- [% ELSE %]<li>[% END %][% END %] >- >+ [% IF item_level_itypes && !noItemTypeImages && onloan_items_loo.imageurl %] >+ <li style="list-style: none; list-style-type: none;"> >+ <img src="[% onloan_items_loo.imageurl %]" title="[% onloan_items_loo.description %]" alt="[% onloan_items_loo.description %]" /> >+ [% ELSE %] >+ <li> >+ [% END %] > [% IF ( onloan_items_loo.branchname ) %][% onloan_items_loo.branchname %][% END %] > [% IF ( onloan_items_loo.location ) %][% onloan_items_loo.location %][% END %] > [% IF ( onloan_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&q=[% onloan_items_loo.itemcallnumber |url %]">[% onloan_items_loo.itemcallnumber %]</a>][% END %] >- ([% onloan_items_loo.count %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue %] long overdue[% END %]) date due: [% onloan_items_loo.due_date %]</li> >- [% END %]</ul> >+ ([% onloan_items_loo.count %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue %] long overdue[% END %]) date due: [% onloan_items_loo.due_date %] >+ [% IF item_level_itypes && onloan_items_loo.description %] >+ <br/>[% onloan_items_loo.description %] >+ [% END %] >+ </li> >+ [% END %] >+ </ul> > [% END %] > > [% IF ( SEARCH_RESULT.othercount ) %] > <span class="unavailable">[% SEARCH_RESULT.othercount %] unavailable:</span> > <ul> > [% FOREACH other_items_loo IN SEARCH_RESULT.other_items_loop %] >- [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %] >- [% IF ( other_items_loo.imageurl ) %] >- <li style="list-style: none; list-style-type: none;"><img src="[% other_items_loo.imageurl %]" title="[% other_items_loo.description %]" alt="[% other_items_loo.description %]" /> >- [% ELSE %]<li>[% END %] >- [% ELSE %]<li>[% END %][% END %] >- >+ [% IF item_level_itypes && !noItemTypeImages && other_items_loo.imageurl %] >+ <li style="list-style: none; list-style-type: none;"> >+ <img src="[% other_items_loo.imageurl %]" title="[% other_items_loo.description %]" alt="[% other_items_loo.description %]" /> >+ [% ELSE %] >+ <li> >+ [% END %] > [% IF ( other_items_loo.branchname ) %][% other_items_loo.branchname %][% END %] > [% IF ( other_items_loo.location ) %][% other_items_loo.location %][% END %] > [% IF ( other_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&q=[% other_items_loo.itemcallnumber |url %]">[% other_items_loo.itemcallnumber %]</a>][% END %] >@@ -576,8 +592,13 @@ YAHOO.util.Event.onContentReady("searchheader", function () { > [% IF ( other_items_loo.intransit ) %](In transit)[% END %] > [% IF ( other_items_loo.onhold ) %](On hold)[% END %] > [% IF ( other_items_loo.notforloan ) %][% other_items_loo.notforloan %][% END %] >- ([% other_items_loo.count %])</li> >- [% END %]</ul> >+ ([% other_items_loo.count %]) >+ [% IF item_level_itypes && other_items_loo.description %] >+ <br/>[% other_items_loo.description %] >+ [% END %] >+ </li> >+ [% END %] >+ </ul> > [% END %] > [% ELSE %] > [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS.count ) %] >-- >1.6.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 7140
:
6145
|
6146
|
6441
|
6442
|
7344
|
7475