View | Details | Raw Unified | Return to bug 7140
Collapse All | Expand All

(-)a/C4/Search.pm (-1 / +4 lines)
Lines 1622-1627 sub searchResults { Link Here
1622
            foreach my $code ( keys %subfieldstosearch ) {
1622
            foreach my $code ( keys %subfieldstosearch ) {
1623
                $item->{$code} = $field->subfield( $subfieldstosearch{$code} );
1623
                $item->{$code} = $field->subfield( $subfieldstosearch{$code} );
1624
            }
1624
            }
1625
            $item->{description} = $itemtypes{ $item->{itype} }{description};
1625
1626
1626
	        # Hidden items
1627
	        # Hidden items
1627
	        my @items = ($item);
1628
	        my @items = ($item);
Lines 1650-1655 sub searchResults { Link Here
1650
				$onloan_items->{$key}->{branchname} = $item->{branchname};
1651
				$onloan_items->{$key}->{branchname} = $item->{branchname};
1651
				$onloan_items->{$key}->{location} = $shelflocations->{ $item->{location} };
1652
				$onloan_items->{$key}->{location} = $shelflocations->{ $item->{location} };
1652
				$onloan_items->{$key}->{itemcallnumber} = $item->{itemcallnumber};
1653
				$onloan_items->{$key}->{itemcallnumber} = $item->{itemcallnumber};
1654
				$onloan_items->{$key}->{description} = $item->{description};
1653
				$onloan_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
1655
				$onloan_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
1654
                # if something's checked out and lost, mark it as 'long overdue'
1656
                # if something's checked out and lost, mark it as 'long overdue'
1655
                if ( $item->{itemlost} ) {
1657
                if ( $item->{itemlost} ) {
Lines 1733-1738 sub searchResults { Link Here
1733
					$other_items->{$key}->{notforloan} = GetAuthorisedValueDesc('','',$item->{notforloan},'','',$notforloan_authorised_value) if $notforloan_authorised_value;
1735
					$other_items->{$key}->{notforloan} = GetAuthorisedValueDesc('','',$item->{notforloan},'','',$notforloan_authorised_value) if $notforloan_authorised_value;
1734
					$other_items->{$key}->{count}++ if $item->{$hbranch};
1736
					$other_items->{$key}->{count}++ if $item->{$hbranch};
1735
					$other_items->{$key}->{location} = $shelflocations->{ $item->{location} };
1737
					$other_items->{$key}->{location} = $shelflocations->{ $item->{location} };
1738
					$other_items->{$key}->{description} = $item->{description};
1736
					$other_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
1739
					$other_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
1737
                }
1740
                }
1738
                # item is available
1741
                # item is available
Lines 1740-1746 sub searchResults { Link Here
1740
                    $can_place_holds = 1;
1743
                    $can_place_holds = 1;
1741
                    $available_count++;
1744
                    $available_count++;
1742
					$available_items->{$prefix}->{count}++ if $item->{$hbranch};
1745
					$available_items->{$prefix}->{count}++ if $item->{$hbranch};
1743
					foreach (qw(branchname itemcallnumber hideatopac)) {
1746
					foreach (qw(branchname itemcallnumber hideatopac description)) {
1744
                    	$available_items->{$prefix}->{$_} = $item->{$_};
1747
                    	$available_items->{$prefix}->{$_} = $item->{$_};
1745
					}
1748
					}
1746
					$available_items->{$prefix}->{location} = $shelflocations->{ $item->{location} };
1749
					$available_items->{$prefix}->{location} = $shelflocations->{ $item->{location} };
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-9 / +5 lines)
Lines 255-270 function verify_images() { Link Here
255
            [% FOREACH itemloo IN itemloop %]
255
            [% FOREACH itemloo IN itemloop %]
256
                <tr>
256
                <tr>
257
                    [% IF ( item_level_itypes ) %]
257
                    [% IF ( item_level_itypes ) %]
258
                      <td class="itype">
258
                    <td class="itype">
259
                        [% IF ( noItemTypeImages ) %]
259
                        [% IF !noItemTypeImages && itemloo.imageurl %]
260
                          [% itemloo.description %]
261
                        [% ELSE %]
262
                          [% IF ( itemloo.imageurl ) %]
263
                            <img src="[% itemloo.imageurl %]" alt="[% itemloo.description %]" title="[% itemloo.description %]" />
260
                            <img src="[% itemloo.imageurl %]" alt="[% itemloo.description %]" title="[% itemloo.description %]" />
264
                          [% ELSE %]
261
                        [% END %]
265
                            [% itemloo.description %]
262
                        [% itemloo.description %]
266
                          [% END %]
263
                    </td>
267
                        [% END %]</td>
268
                    [% END %]
264
                    [% END %]
269
                    <td class="location">[% UNLESS ( singlebranchmode ) %][% itemloo.branchname %] [% END %]</td>
265
                    <td class="location">[% UNLESS ( singlebranchmode ) %][% itemloo.branchname %] [% END %]</td>
270
                    <td class="homebranch">[% itemloo.homebranch %]<span class="shelvingloc">[% itemloo.location %]</span> </td>
266
                    <td class="homebranch">[% itemloo.homebranch %]<span class="shelvingloc">[% itemloo.location %]</span> </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-25 / +46 lines)
Lines 470-486 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
470
                                        [% END %]
470
                                        [% END %]
471
                                    <p>
471
                                    <p>
472
                                    [% UNLESS ( item_level_itypes ) %]
472
                                    [% UNLESS ( item_level_itypes ) %]
473
                                    [% UNLESS ( noItemTypeImages ) %][% IF ( SEARCH_RESULT.imageurl ) %]
473
                                    [% IF !noItemTypeImages && SEARCH_RESULT.imageurl %]
474
                                    <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="" />
474
                                    <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="[% SEARCH_RESULT.description %]" />
475
                                    [% END %][% END %]
475
                                    [% END %]
476
                                    [% SEARCH_RESULT.description %]
476
                                    [% END %]
477
                                    [% END %]
477
                                    [% SEARCH_RESULT.summary %]</p>
478
                                    [% SEARCH_RESULT.summary %]</p>
478
                                [% ELSE %]
479
                                [% ELSE %]
479
                                    <p>
480
                                    <p>
480
                                    [% UNLESS ( item_level_itypes ) %]
481
                                    [% UNLESS ( item_level_itypes ) %]
481
                                    [% UNLESS ( noItemTypeImages ) %][% IF ( SEARCH_RESULT.imageurl ) %]
482
                                    [% IF !noItemTypeImages && SEARCH_RESULT.imageurl %]
482
                                    <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="" />
483
                                    <img src="[% SEARCH_RESULT.imageurl %]" title="[% SEARCH_RESULT.description %]" style="float: left; margin: .1em;" alt="" />
483
                                    [% END %][% END %]
484
                                    [% END %]
485
                                    [% SEARCH_RESULT.description %]
484
                                    [% END %]
486
                                    [% END %]
485
487
486
                                        [% IF ( SEARCH_RESULT.author ) %]
488
                                        [% IF ( SEARCH_RESULT.author ) %]
Lines 532-572 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
532
                                    <ul>
534
                                    <ul>
533
                                    [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %]
535
                                    [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %]
534
536
535
                                        [% 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 %]
537
                                        [% IF item_level_itypes && !noItemTypeImages && available_items_loo.imageurl %]
538
                                        <li style="list-style: none; list-style-type: none;">
539
                                          <img src="[% available_items_loo.imageurl %]" title="[% available_items_loo.description %]" alt="[% available_items_loo.description %]" />
540
                                        [% ELSE %]
541
                                        <li>
542
                                        [% END %]
536
                                        [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname %][% END %]
543
                                        [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname %][% END %]
537
                                        [% IF ( available_items_loo.location ) %][% available_items_loo.location %][% END %]
544
                                        [% IF ( available_items_loo.location ) %][% available_items_loo.location %][% END %]
538
                                        [% IF ( available_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% available_items_loo.itemcallnumber |url %]">[% available_items_loo.itemcallnumber %]</a>][% END %]
545
                                        [% IF ( available_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% available_items_loo.itemcallnumber |url %]">[% available_items_loo.itemcallnumber %]</a>][% END %]
539
                                        ([% available_items_loo.count %])</li>
546
                                        ([% available_items_loo.count %])
540
                                    [% END %]</ul>
547
                                        [% IF item_level_itypes && available_items_loo.description %]
548
                                        <br/>[% available_items_loo.description %]
549
                                        [% END %]
550
                                        </li>
551
                                    [% END %]
552
                                    </ul>
541
                                    [% END %]
553
                                    [% END %]
542
554
543
                                   [% IF ( SEARCH_RESULT.onloancount ) %]
555
                                   [% IF ( SEARCH_RESULT.onloancount ) %]
544
                                   <span class="status">[% SEARCH_RESULT.onloancount %] on loan:</span>
556
                                   <span class="status">[% SEARCH_RESULT.onloancount %] on loan:</span>
545
                                    <ul>
557
                                    <ul>
546
                                    [% FOREACH onloan_items_loo IN SEARCH_RESULT.onloan_items_loop %]
558
                                    [% FOREACH onloan_items_loo IN SEARCH_RESULT.onloan_items_loop %]
547
                                       [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
559
                                        [% IF item_level_itypes && !noItemTypeImages && onloan_items_loo.imageurl %]
548
                                        [% IF ( onloan_items_loo.imageurl ) %]
560
                                        <li style="list-style: none; list-style-type: none;">
549
                                        <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 %]" />
561
                                          <img src="[% onloan_items_loo.imageurl %]" title="[% onloan_items_loo.description %]" alt="[% onloan_items_loo.description %]" />
550
                                        [% ELSE %]<li>[% END %]
562
                                        [% ELSE %]
551
                                        [% ELSE %]<li>[% END %][% END %]
563
                                        <li>
552
564
                                        [% END %]
553
                                        [% IF ( onloan_items_loo.branchname ) %][% onloan_items_loo.branchname %][% END %]
565
                                        [% IF ( onloan_items_loo.branchname ) %][% onloan_items_loo.branchname %][% END %]
554
                                        [% IF ( onloan_items_loo.location ) %][% onloan_items_loo.location %][% END %]
566
                                        [% IF ( onloan_items_loo.location ) %][% onloan_items_loo.location %][% END %]
555
                                        [% IF ( onloan_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% onloan_items_loo.itemcallnumber |url %]">[% onloan_items_loo.itemcallnumber %]</a>][% END %]
567
                                        [% IF ( onloan_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% onloan_items_loo.itemcallnumber |url %]">[% onloan_items_loo.itemcallnumber %]</a>][% END %]
556
                                        ([% onloan_items_loo.count %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue %] long overdue[% END %]) date due: [% onloan_items_loo.due_date %]</li>
568
                                        ([% onloan_items_loo.count %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue %] long overdue[% END %]) date due: [% onloan_items_loo.due_date %]
557
                                    [% END %]</ul>
569
                                        [% IF item_level_itypes && onloan_items_loo.description %]
570
                                        <br/>[% onloan_items_loo.description %]
571
                                        [% END %]
572
                                        </li>
573
                                    [% END %]
574
                                    </ul>
558
                                    [% END %]
575
                                    [% END %]
559
576
560
                                    [% IF ( SEARCH_RESULT.othercount ) %]
577
                                    [% IF ( SEARCH_RESULT.othercount ) %]
561
                                    <span class="unavailable">[% SEARCH_RESULT.othercount %] unavailable:</span>
578
                                    <span class="unavailable">[% SEARCH_RESULT.othercount %] unavailable:</span>
562
                                    <ul>
579
                                    <ul>
563
                                    [% FOREACH other_items_loo IN SEARCH_RESULT.other_items_loop %]
580
                                    [% FOREACH other_items_loo IN SEARCH_RESULT.other_items_loop %]
564
                                        [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
581
                                        [% IF item_level_itypes && !noItemTypeImages && other_items_loo.imageurl %]
565
                                        [% IF ( other_items_loo.imageurl ) %]
582
                                        <li style="list-style: none; list-style-type: none;">
566
                                        <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 %]" />
583
                                          <img src="[% other_items_loo.imageurl %]" title="[% other_items_loo.description %]" alt="[% other_items_loo.description %]" />
567
                                        [% ELSE %]<li>[% END %]
584
                                        [% ELSE %]
568
                                        [% ELSE %]<li>[% END %][% END %]
585
                                        <li>
569
586
                                        [% END %]
570
                                        [% IF ( other_items_loo.branchname ) %][% other_items_loo.branchname %][% END %]
587
                                        [% IF ( other_items_loo.branchname ) %][% other_items_loo.branchname %][% END %]
571
                                        [% IF ( other_items_loo.location ) %][% other_items_loo.location %][% END %]
588
                                        [% IF ( other_items_loo.location ) %][% other_items_loo.location %][% END %]
572
                                        [% IF ( other_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% other_items_loo.itemcallnumber |url %]">[% other_items_loo.itemcallnumber %]</a>][% END %]
589
                                        [% IF ( other_items_loo.itemcallnumber ) %][<a href="/cgi-bin/koha/catalogue/search.pl?idx=callnum&amp;q=[% other_items_loo.itemcallnumber |url %]">[% other_items_loo.itemcallnumber %]</a>][% END %]
Lines 576-583 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
576
                                        [% IF ( other_items_loo.intransit ) %](In transit)[% END %]
593
                                        [% IF ( other_items_loo.intransit ) %](In transit)[% END %]
577
                                        [% IF ( other_items_loo.onhold ) %](On hold)[% END %]
594
                                        [% IF ( other_items_loo.onhold ) %](On hold)[% END %]
578
                                        [% IF ( other_items_loo.notforloan ) %][% other_items_loo.notforloan %][% END %]
595
                                        [% IF ( other_items_loo.notforloan ) %][% other_items_loo.notforloan %][% END %]
579
                                        ([% other_items_loo.count %])</li>
596
                                        ([% other_items_loo.count %])
580
                                    [% END %]</ul>
597
                                        [% IF item_level_itypes && other_items_loo.description %]
598
                                        <br/>[% other_items_loo.description %]
599
                                        [% END %]
600
                                        </li>
601
                                    [% END %]
602
                                    </ul>
581
                                    [% END %]
603
                                    [% END %]
582
                                    [% ELSE %]
604
                                    [% ELSE %]
583
                                    [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS.count ) %]
605
                                    [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS.count ) %]
584
- 

Return to bug 7140