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

(-)a/C4/VirtualShelves/Page.pm (-2 / +7 lines)
Lines 35-40 use C4::Tags qw(get_tags); Link Here
35
use Exporter;
35
use Exporter;
36
use Data::Dumper;
36
use Data::Dumper;
37
use C4::Csv;
37
use C4::Csv;
38
use C4::XSLT;
38
39
39
use vars qw($debug @EXPORT @ISA $VERSION);
40
use vars qw($debug @EXPORT @ISA $VERSION);
40
41
Lines 201-207 sub shelfpage ($$$$$) { Link Here
201
                }
202
                }
202
                ( $items, $totitems ) = GetShelfContents( $shelfnumber, $shelflimit, $shelfoffset );
203
                ( $items, $totitems ) = GetShelfContents( $shelfnumber, $shelflimit, $shelfoffset );
203
                for my $this_item (@$items) {
204
                for my $this_item (@$items) {
204
                    my $record = GetMarcBiblio( $this_item->{'biblionumber'} );
205
                    my $biblionumber = $this_item->{'biblionumber'};
206
                    my $record = GetMarcBiblio($biblionumber);
207
                    $this_item->{XSLTResultsRecord} =
208
                        XSLTParse4Display($biblionumber, $record, 'Results', 'opac')
209
                            if C4::Context->preference("OPACXSLTResultsDisplay");
205
210
206
                    # the virtualshelfcontents table does not store these columns nor are they retrieved from the items
211
                    # the virtualshelfcontents table does not store these columns nor are they retrieved from the items
207
                    # and itemtypes tables, so I'm commenting them out for now to quiet the log -crn
212
                    # and itemtypes tables, so I'm commenting them out for now to quiet the log -crn
Lines 218-224 sub shelfpage ($$$$$) { Link Here
218
                    # Getting items infos for location display
223
                    # Getting items infos for location display
219
                    my @items_infos = &GetItemsInfo( $this_item->{'biblionumber'}, $type );
224
                    my @items_infos = &GetItemsInfo( $this_item->{'biblionumber'}, $type );
220
                    $this_item->{'itemsissued'} = CountItemsIssued( $this_item->{'biblionumber'} );
225
                    $this_item->{'itemsissued'} = CountItemsIssued( $this_item->{'biblionumber'} );
221
                    $this_item->{'ITEM_RESULTS'} = \@items_infos;
226
                    $this_item->{available_items_loop} = \@items_infos;
222
227
223
                    if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnList')) {
228
                    if (C4::Context->preference('TagsEnabled') and $tag_quantity = C4::Context->preference('TagsShowOnList')) {
224
                        $this_item->{'TagLoop'} = get_tags({
229
                        $this_item->{'TagLoop'} = get_tags({
(-)a/koha-tmpl/opac-tmpl/prog/en/includes/biblioresult.inc (+61 lines)
Line 0 Link Here
1
<!-- TMPL_IF NAME="OPACXSLTResultsDisplay" -->
2
<!-- TMPL_VAR NAME="XSLTResultsRecord" -->
3
<!-- TMPL_ELSE -->
4
<!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
5
<!-- TMPL_ELSE -->
6
<!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
7
<!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
8
<!-- /TMPL_IF -->
9
<!-- /TMPL_IF -->
10
								<!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" ESCAPE="html" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --> <!-- TMPL_LOOP NAME="subtitle"  --><!--TMPL_VAR Name="subfield"--><!--/TMPL_LOOP--></a>
11
<!-- TMPL_IF NAME="author" -->by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->" title="Search for works by this author" class="author"><!-- TMPL_VAR NAME="author" --></a>
12
<!-- TMPL_ELSE -->&nbsp;
13
<!-- /TMPL_IF -->
14
				<span class="results_summary"><span class="label">Publication:</span>
15
<!-- TMPL_IF name="place" --><!-- TMPL_VAR name="place" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> <!-- TMPL_VAR name="publicationyear" -->
16
<!-- TMPL_ELSE --><!-- TMPL_IF name="copyrightdate" --> <!-- TMPL_VAR name="copyrightdate" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
17
<!-- TMPL_IF name="pages" -->. <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
18
<!-- TMPL_IF name="notes" -->, <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
19
<!-- TMPL_IF name="size" --> <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
20
<!-- TMPL_IF name="timestamp" --> <i>(modified on <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF -->
21
</span>
22
<!-- TMPL_IF NAME="summary" -->
23
<span class="result_summary">
24
	<!-- TMPL_VAR name="summary" -->
25
</span>
26
<!-- /TMPL_IF -->
27
<!-- TMPL_IF NAME="copyrightdate" --><span class="results_summary"><span class="label">Date:</span><!-- TMPL_VAR NAME="copyrightdate" --></span><!-- /TMPL_IF -->
28
29
<span class="results_summary">
30
<span class="label">Availability:</span>
31
<!-- TMPL_IF NAME="available_items_loop" -->
32
<span class="available"><strong>Copies available:</strong>
33
<!-- TMPL_LOOP NAME="available_items_loop" -->
34
35
<!-- TMPL_IF NAME="singleBranchMode" -->
36
<!-- TMPL_VAR NAME="location" -->
37
<!-- TMPL_ELSE -->
38
<!-- TMPL_VAR NAME="branchname" -->
39
<!-- /TMPL_IF -->
40
41
<!-- TMPL_IF name="OPACItemsResultsDisplay" -->
42
					    <!-- TMPL_UNLESS NAME="singleBranchMode" --><!-- TMPL_VAR NAME="location" --><!-- /TMPL_UNLESS -->
43
<!-- TMPL_IF NAME="itemcallnumber" -->[<a href="/cgi-bin/koha/opac-search.pl?q=callnum:<!-- TMPL_VAR NAME="itemcallnumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="itemcallnumber" --></a>]<!-- /TMPL_IF -->
44
<!-- /TMPL_IF -->
45
(<!-- TMPL_VAR NAME="count" -->),
46
<!-- /TMPL_LOOP -->
47
</span>
48
<!-- TMPL_ELSE -->
49
<span class="unavailable">No items available:</span>
50
<!-- /TMPL_IF -->
51
<span class="unavailable">
52
<!-- TMPL_IF NAME="onloancount" --> Checked out (<!-- TMPL_VAR NAME="onloancount" -->), <!-- /TMPL_IF -->
53
<!-- TMPL_IF NAME="wthdrawncount" --> Withdrawn (<!-- TMPL_VAR NAME="wthdrawncount" -->), <!-- /TMPL_IF -->
54
<!-- TMPL_UNLESS NAME="hidelostitems" --><!-- TMPL_IF NAME="itemlostcount" --> Lost (<!-- TMPL_VAR NAME="itemlostcount" -->),<!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
55
<!-- TMPL_IF NAME="damagedcount" --> Damaged (<!-- TMPL_VAR NAME="damagedcount" -->),<!-- /TMPL_IF -->
56
<!-- TMPL_IF NAME="orderedcount" --> On order (<!-- TMPL_VAR NAME="orderedcount" -->),<!-- /TMPL_IF -->
57
<!-- TMPL_IF NAME="onholdcount" --> On hold (<!-- TMPL_VAR NAME="onholdcount" -->),<!-- /TMPL_IF -->
58
<!-- TMPL_IF NAME="intransitcount" --> In transit (<!-- TMPL_VAR NAME="intransitcount" -->),<!-- /TMPL_IF -->
59
</span>
60
</span>
61
<!-- /TMPL_IF -->
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl (-61 / +1 lines)
Lines 398-465 $(document).ready(function(){ Link Here
398
                    <!-- COinS / OpenURL --><span class="Z3988" title="<!-- TMPL_VAR NAME="coins" -->"></span>
398
                    <!-- COinS / OpenURL --><span class="Z3988" title="<!-- TMPL_VAR NAME="coins" -->"></span>
399
                <!-- /TMPL_IF -->
399
                <!-- /TMPL_IF -->
400
400
401
				<!-- TMPL_IF NAME="OPACXSLTResultsDisplay" -->
401
<!-- TMPL_INCLUDE NAME="biblioresult.inc" -->
402
                <!-- TMPL_VAR NAME="XSLTResultsRecord" -->
403
				<!-- TMPL_ELSE -->
404
				<!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
405
                                <!-- TMPL_ELSE -->
406
                                <!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
407
                                <!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
408
                                <!-- /TMPL_IF -->
409
                                <!-- /TMPL_IF -->
410
								<!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" ESCAPE="html" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --> <!-- TMPL_LOOP NAME="subtitle"  --><!--TMPL_VAR Name="subfield"--><!--/TMPL_LOOP--></a>
411
                                <!-- TMPL_IF NAME="author" -->by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->" title="Search for works by this author" class="author"><!-- TMPL_VAR NAME="author" --></a>
412
                                <!-- TMPL_ELSE -->&nbsp;
413
                                <!-- /TMPL_IF -->
414
				<span class="results_summary"><span class="label">Publication:</span>
415
                        <!-- TMPL_IF name="place" --><!-- TMPL_VAR name="place" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> <!-- TMPL_VAR name="publicationyear" -->
416
                    <!-- TMPL_ELSE --><!-- TMPL_IF name="copyrightdate" --> <!-- TMPL_VAR name="copyrightdate" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
417
                        <!-- TMPL_IF name="pages" -->. <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
418
                        <!-- TMPL_IF name="notes" -->, <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
419
                        <!-- TMPL_IF name="size" --> <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
420
                        <!-- TMPL_IF name="timestamp" --> <i>(modified on <!-- TMPL_VAR name="timestamp" -->)</i><!-- /TMPL_IF -->
421
                </span>
422
                <!-- TMPL_IF NAME="summary" -->
423
                <span class="result_summary">
424
                	<!-- TMPL_VAR name="summary" -->
425
                </span>
426
                <!-- /TMPL_IF -->
427
                <!-- TMPL_IF NAME="copyrightdate" --><span class="results_summary"><span class="label">Date:</span><!-- TMPL_VAR NAME="copyrightdate" --></span><!-- /TMPL_IF -->
428
429
				<span class="results_summary">
430
                <span class="label">Availability:</span>
431
                    <!-- TMPL_IF NAME="available_items_loop" -->
432
                    <span class="available"><strong>Copies available:</strong>
433
                    <!-- TMPL_LOOP NAME="available_items_loop" -->
434
435
                    <!-- TMPL_IF NAME="singleBranchMode" -->
436
                        <!-- TMPL_VAR NAME="location" -->
437
                    <!-- TMPL_ELSE -->
438
                        <!-- TMPL_VAR NAME="branchname" -->
439
                    <!-- /TMPL_IF -->
440
441
                    <!-- TMPL_IF name="OPACItemsResultsDisplay" -->
442
					    <!-- TMPL_UNLESS NAME="singleBranchMode" --><!-- TMPL_VAR NAME="location" --><!-- /TMPL_UNLESS -->
443
                        <!-- TMPL_IF NAME="itemcallnumber" -->[<a href="/cgi-bin/koha/opac-search.pl?q=callnum:<!-- TMPL_VAR NAME="itemcallnumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="itemcallnumber" --></a>]<!-- /TMPL_IF -->
444
                    <!-- /TMPL_IF -->
445
                    (<!-- TMPL_VAR NAME="count" -->),
446
                    <!-- /TMPL_LOOP -->
447
                    </span>
448
                    <!-- TMPL_ELSE -->
449
                    <span class="unavailable">No items available:</span>
450
                    <!-- /TMPL_IF -->
451
                    <span class="unavailable">
452
                    <!-- TMPL_IF NAME="onloancount" --> Checked out (<!-- TMPL_VAR NAME="onloancount" -->), <!-- /TMPL_IF -->
453
                    <!-- TMPL_IF NAME="wthdrawncount" --> Withdrawn (<!-- TMPL_VAR NAME="wthdrawncount" -->), <!-- /TMPL_IF -->
454
                    <!-- TMPL_UNLESS NAME="hidelostitems" --><!-- TMPL_IF NAME="itemlostcount" --> Lost (<!-- TMPL_VAR NAME="itemlostcount" -->),<!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
455
                    <!-- TMPL_IF NAME="damagedcount" --> Damaged (<!-- TMPL_VAR NAME="damagedcount" -->),<!-- /TMPL_IF -->
456
                    <!-- TMPL_IF NAME="orderedcount" --> On order (<!-- TMPL_VAR NAME="orderedcount" -->),<!-- /TMPL_IF -->
457
                    <!-- TMPL_IF NAME="onholdcount" --> On hold (<!-- TMPL_VAR NAME="onholdcount" -->),<!-- /TMPL_IF -->
458
                    <!-- TMPL_IF NAME="intransitcount" --> In transit (<!-- TMPL_VAR NAME="intransitcount" -->),<!-- /TMPL_IF -->
459
                    </span>
460
                </span>
461
402
462
				<!-- /TMPL_IF -->
463
				<!-- TMPL_IF NAME="LibraryThingForLibrariesID" --><div class="ltfl_reviews"></div><!-- /TMPL_IF -->
403
				<!-- TMPL_IF NAME="LibraryThingForLibrariesID" --><div class="ltfl_reviews"></div><!-- /TMPL_IF -->
464
				<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="TagsEnabled" -->
404
				<!-- TMPL_IF NAME="opacuserlogin" --><!-- TMPL_IF NAME="TagsEnabled" -->
465
                                <!-- TMPL_IF NAME="TagsShowOnList" -->
405
                                <!-- TMPL_IF NAME="TagsShowOnList" -->
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl (-24 / +1 lines)
Lines 249-277 $(function() { Link Here
249
                        </td>
249
                        </td>
250
                    <!-- /TMPL_UNLESS -->
250
                    <!-- /TMPL_UNLESS -->
251
                        <td>
251
                        <td>
252
                                <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
252
<!-- TMPL_INCLUDE NAME="biblioresult.inc" -->
253
                                <!-- TMPL_ELSE -->
254
                                <!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
255
                                <!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title">
256
                                <!-- /TMPL_IF -->
257
                                <!-- /TMPL_IF -->
258
                <!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" ESCAPE="html" --><!-- TMPL_ELSE -->No title<!-- /TMPL_IF --> <!-- TMPL_LOOP NAME="subtitle"  --><!--TMPL_VAR Name="subfield"--><!--/TMPL_LOOP--></a>
259
                                <!-- TMPL_IF NAME="author" -->by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->" title="Search for works by this author" class="author"><!-- TMPL_VAR NAME="author" --></a>
260
                                <!-- TMPL_ELSE -->&nbsp;
261
                                <!-- /TMPL_IF -->
262
        <span class="results_summary"><span class="label">Publication:</span>
263
                        <!-- TMPL_IF name="place" --><!-- TMPL_VAR name="place" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" --><!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> <!-- TMPL_VAR name="publicationyear" -->
264
                    <!-- TMPL_ELSE --><!-- TMPL_IF name="copyrightdate" --> <!-- TMPL_VAR name="copyrightdate" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
265
                        <!-- TMPL_IF name="pages" -->. <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
266
                        <!-- TMPL_IF name="notes" -->, <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
267
                        <!-- TMPL_IF name="size" --> <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
268
                </span>
269
                <span class="results_summary"><span class="label">Holdings:</span><!-- TMPL_IF NAME="ITEM_RESULTS" --><!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
270
          <!-- TMPL_VAR NAME="branchname" --><!-- TMPL_IF NAME="location" -->, <!-- TMPL_VAR NAME="location" --><!-- /TMPL_IF -->
271
          <!-- TMPL_IF name="itemcallnumber" -->
272
        (<!-- TMPL_VAR NAME="itemcallnumber" -->)<!-- TMPL_IF NAME="__LAST__" -->.<!-- TMPL_ELSE -->,<!-- /TMPL_IF -->
273
          <!-- /TMPL_IF -->
274
          <!-- /TMPL_LOOP --><!-- TMPL_ELSE -->This record has no items.<!-- /TMPL_IF --></span>
275
253
276
        <!-- TMPL_IF NAME="TagsEnabled" -->
254
        <!-- TMPL_IF NAME="TagsEnabled" -->
277
                <!-- TMPL_IF NAME="TagsShowOnList" -->
255
                <!-- TMPL_IF NAME="TagsShowOnList" -->
278
- 

Return to bug 5830