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

(-)a/C4/Search.pm (-1 / +4 lines)
Lines 1628-1633 sub searchResults { Link Here
1628
            foreach my $code ( keys %subfieldstosearch ) {
1628
            foreach my $code ( keys %subfieldstosearch ) {
1629
                $item->{$code} = $field->subfield( $subfieldstosearch{$code} );
1629
                $item->{$code} = $field->subfield( $subfieldstosearch{$code} );
1630
            }
1630
            }
1631
            $item->{description} = $itemtypes{ $item->{itype} }{description};
1631
1632
1632
	        # Hidden items
1633
	        # Hidden items
1633
            if ($is_opac) {
1634
            if ($is_opac) {
Lines 1658-1663 sub searchResults { Link Here
1658
				$onloan_items->{$key}->{branchname} = $item->{branchname};
1659
				$onloan_items->{$key}->{branchname} = $item->{branchname};
1659
				$onloan_items->{$key}->{location} = $shelflocations->{ $item->{location} };
1660
				$onloan_items->{$key}->{location} = $shelflocations->{ $item->{location} };
1660
				$onloan_items->{$key}->{itemcallnumber} = $item->{itemcallnumber};
1661
				$onloan_items->{$key}->{itemcallnumber} = $item->{itemcallnumber};
1662
				$onloan_items->{$key}->{description} = $item->{description};
1661
				$onloan_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
1663
				$onloan_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
1662
                # if something's checked out and lost, mark it as 'long overdue'
1664
                # if something's checked out and lost, mark it as 'long overdue'
1663
                if ( $item->{itemlost} ) {
1665
                if ( $item->{itemlost} ) {
Lines 1742-1747 sub searchResults { Link Here
1742
					$other_items->{$key}->{notforloan} = GetAuthorisedValueDesc('','',$item->{notforloan},'','',$notforloan_authorised_value) if $notforloan_authorised_value;
1744
					$other_items->{$key}->{notforloan} = GetAuthorisedValueDesc('','',$item->{notforloan},'','',$notforloan_authorised_value) if $notforloan_authorised_value;
1743
					$other_items->{$key}->{count}++ if $item->{$hbranch};
1745
					$other_items->{$key}->{count}++ if $item->{$hbranch};
1744
					$other_items->{$key}->{location} = $shelflocations->{ $item->{location} };
1746
					$other_items->{$key}->{location} = $shelflocations->{ $item->{location} };
1747
					$other_items->{$key}->{description} = $item->{description};
1745
					$other_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
1748
					$other_items->{$key}->{imageurl} = getitemtypeimagelocation( $search_context, $itemtypes{ $item->{itype} }->{imageurl} );
1746
                }
1749
                }
1747
                # item is available
1750
                # item is available
Lines 1749-1755 sub searchResults { Link Here
1749
                    $can_place_holds = 1;
1752
                    $can_place_holds = 1;
1750
                    $available_count++;
1753
                    $available_count++;
1751
					$available_items->{$prefix}->{count}++ if $item->{$hbranch};
1754
					$available_items->{$prefix}->{count}++ if $item->{$hbranch};
1752
					foreach (qw(branchname itemcallnumber hideatopac)) {
1755
					foreach (qw(branchname itemcallnumber hideatopac description)) {
1753
                    	$available_items->{$prefix}->{$_} = $item->{$_};
1756
                    	$available_items->{$prefix}->{$_} = $item->{$_};
1754
					}
1757
					}
1755
					$available_items->{$prefix}->{location} = $shelflocations->{ $item->{location} };
1758
					$available_items->{$prefix}->{location} = $shelflocations->{ $item->{location} };
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt (-9 / +5 lines)
Lines 288-303 function verify_images() { Link Here
288
            [% FOREACH itemloo IN itemloop %]
288
            [% FOREACH itemloo IN itemloop %]
289
                <tr>
289
                <tr>
290
                    [% IF ( item_level_itypes ) %]
290
                    [% IF ( item_level_itypes ) %]
291
                      <td class="itype">
291
                    <td class="itype">
292
                        [% IF ( noItemTypeImages ) %]
292
                        [% IF !noItemTypeImages && itemloo.imageurl %]
293
                          [% itemloo.description %]
294
                        [% ELSE %]
295
                          [% IF ( itemloo.imageurl ) %]
296
                            <img src="[% itemloo.imageurl %]" alt="[% itemloo.description %]" title="[% itemloo.description %]" />
293
                            <img src="[% itemloo.imageurl %]" alt="[% itemloo.description %]" title="[% itemloo.description %]" />
297
                          [% ELSE %]
294
                        [% END %]
298
                            [% itemloo.description %]
295
                        [% itemloo.description %]
299
                          [% END %]
296
                    </td>
300
                        [% END %]</td>
301
                    [% END %]
297
                    [% END %]
302
                    <td class="location">[% UNLESS ( singlebranchmode ) %][% itemloo.branchname %] [% END %]</td>
298
                    <td class="location">[% UNLESS ( singlebranchmode ) %][% itemloo.branchname %] [% END %]</td>
303
                    <td class="homebranch">[% itemloo.homebranch %]<span class="shelvingloc">[% itemloo.location %]</span> </td>
299
                    <td class="homebranch">[% itemloo.homebranch %]<span class="shelvingloc">[% itemloo.location %]</span> </td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-25 / +45 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 %]
484
                                    [% END %]
485
                                    [% END %]
485
486
486
                                        [% IF ( SEARCH_RESULT.author ) %]
487
                                        [% IF ( SEARCH_RESULT.author ) %]
Lines 531-571 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
531
                                    <ul>
532
                                    <ul>
532
                                    [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %]
533
                                    [% FOREACH available_items_loo IN SEARCH_RESULT.available_items_loop %]
533
534
534
                                        [% 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 %]
535
                                        [% IF item_level_itypes && !noItemTypeImages && available_items_loo.imageurl %]
536
                                        <li style="list-style: none; list-style-type: none;">
537
                                          <img src="[% available_items_loo.imageurl %]" title="[% available_items_loo.description %]" alt="[% available_items_loo.description %]" />
538
                                        [% ELSE %]
539
                                        <li>
540
                                        [% END %]
535
                                        [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname %][% END %]
541
                                        [% IF ( available_items_loo.branchname ) %][% available_items_loo.branchname %][% END %]
536
                                        [% IF ( available_items_loo.location ) %][% available_items_loo.location %][% END %]
542
                                        [% IF ( available_items_loo.location ) %][% available_items_loo.location %][% END %]
537
                                        [% 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 %]
543
                                        [% 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 %]
538
                                        ([% available_items_loo.count %])</li>
544
                                        ([% available_items_loo.count %])
539
                                    [% END %]</ul>
545
                                        [% IF item_level_itypes && available_items_loo.description %]
546
                                        <br/>[% available_items_loo.description %]
547
                                        [% END %]
548
                                        </li>
549
                                    [% END %]
550
                                    </ul>
540
                                    [% END %]
551
                                    [% END %]
541
552
542
                                   [% IF ( SEARCH_RESULT.onloancount ) %]
553
                                   [% IF ( SEARCH_RESULT.onloancount ) %]
543
                                   <span class="status">[% SEARCH_RESULT.onloancount %] on loan:</span>
554
                                   <span class="status">[% SEARCH_RESULT.onloancount %] on loan:</span>
544
                                    <ul>
555
                                    <ul>
545
                                    [% FOREACH onloan_items_loo IN SEARCH_RESULT.onloan_items_loop %]
556
                                    [% FOREACH onloan_items_loo IN SEARCH_RESULT.onloan_items_loop %]
546
                                       [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
557
                                        [% IF item_level_itypes && !noItemTypeImages && onloan_items_loo.imageurl %]
547
                                        [% IF ( onloan_items_loo.imageurl ) %]
558
                                        <li style="list-style: none; list-style-type: none;">
548
                                        <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 %]" />
559
                                          <img src="[% onloan_items_loo.imageurl %]" title="[% onloan_items_loo.description %]" alt="[% onloan_items_loo.description %]" />
549
                                        [% ELSE %]<li>[% END %]
560
                                        [% ELSE %]
550
                                        [% ELSE %]<li>[% END %][% END %]
561
                                        <li>
551
562
                                        [% END %]
552
                                        [% IF ( onloan_items_loo.branchname ) %][% onloan_items_loo.branchname %][% END %]
563
                                        [% IF ( onloan_items_loo.branchname ) %][% onloan_items_loo.branchname %][% END %]
553
                                        [% IF ( onloan_items_loo.location ) %][% onloan_items_loo.location %][% END %]
564
                                        [% IF ( onloan_items_loo.location ) %][% onloan_items_loo.location %][% END %]
554
                                        [% 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 %]
565
                                        [% 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 %]
555
                                        ([% onloan_items_loo.count %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue %] long overdue[% END %]) date due: [% onloan_items_loo.due_date %]</li>
566
                                        ([% onloan_items_loo.count %][% IF ( onloan_items_loo.longoverdue ) %], [% onloan_items_loo.longoverdue %] long overdue[% END %]) date due: [% onloan_items_loo.due_date %]
556
                                    [% END %]</ul>
567
                                        [% IF item_level_itypes && onloan_items_loo.description %]
568
                                        <br/>[% onloan_items_loo.description %]
569
                                        [% END %]
570
                                        </li>
571
                                    [% END %]
572
                                    </ul>
557
                                    [% END %]
573
                                    [% END %]
558
574
559
                                    [% IF ( SEARCH_RESULT.othercount ) %]
575
                                    [% IF ( SEARCH_RESULT.othercount ) %]
560
                                    <span class="unavailable">[% SEARCH_RESULT.othercount %] unavailable:</span>
576
                                    <span class="unavailable">[% SEARCH_RESULT.othercount %] unavailable:</span>
561
                                    <ul>
577
                                    <ul>
562
                                    [% FOREACH other_items_loo IN SEARCH_RESULT.other_items_loop %]
578
                                    [% FOREACH other_items_loo IN SEARCH_RESULT.other_items_loop %]
563
                                        [% IF ( noItemTypeImages ) %]<li>[% ELSE %][% IF ( item_level_itypes ) %]
579
                                        [% IF item_level_itypes && !noItemTypeImages && other_items_loo.imageurl %]
564
                                        [% IF ( other_items_loo.imageurl ) %]
580
                                        <li style="list-style: none; list-style-type: none;">
565
                                        <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 %]" />
581
                                          <img src="[% other_items_loo.imageurl %]" title="[% other_items_loo.description %]" alt="[% other_items_loo.description %]" />
566
                                        [% ELSE %]<li>[% END %]
582
                                        [% ELSE %]
567
                                        [% ELSE %]<li>[% END %][% END %]
583
                                        <li>
568
584
                                        [% END %]
569
                                        [% IF ( other_items_loo.branchname ) %][% other_items_loo.branchname %][% END %]
585
                                        [% IF ( other_items_loo.branchname ) %][% other_items_loo.branchname %][% END %]
570
                                        [% IF ( other_items_loo.location ) %][% other_items_loo.location %][% END %]
586
                                        [% IF ( other_items_loo.location ) %][% other_items_loo.location %][% END %]
571
                                        [% 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 %]
587
                                        [% 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 575-582 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
575
                                        [% IF ( other_items_loo.intransit ) %](In transit)[% END %]
591
                                        [% IF ( other_items_loo.intransit ) %](In transit)[% END %]
576
                                        [% IF ( other_items_loo.onhold ) %](On hold)[% END %]
592
                                        [% IF ( other_items_loo.onhold ) %](On hold)[% END %]
577
                                        [% IF ( other_items_loo.notforloan ) %][% other_items_loo.notforloan %][% END %]
593
                                        [% IF ( other_items_loo.notforloan ) %][% other_items_loo.notforloan %][% END %]
578
                                        ([% other_items_loo.count %])</li>
594
                                        ([% other_items_loo.count %])
579
                                    [% END %]</ul>
595
                                        [% IF item_level_itypes && other_items_loo.description %]
596
                                        <br/>[% other_items_loo.description %]
597
                                        [% END %]
598
                                        </li>
599
                                    [% END %]
600
                                    </ul>
580
                                    [% END %]
601
                                    [% END %]
581
                                    [% ELSE %]
602
                                    [% ELSE %]
582
                                    [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS.count ) %]
603
                                    [% IF ( SEARCH_RESULT.ALTERNATEHOLDINGS.count ) %]
583
- 

Return to bug 7140