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

(-)a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss (-10 / +6 lines)
Lines 1153-1171 div { Link Here
1153
    }
1153
    }
1154
}
1154
}
1155
1155
1156
.online_resources {
1156
.resource_list {
1157
    ul {
1157
    display: inline-block;
1158
        display: inline-block;
1158
    margin: 0 auto;
1159
        margin: 0 auto;
1159
    padding-left: 0;
1160
        padding-left: 0;
1161
    }
1162
1160
1163
    li {
1161
    li {
1164
        display: inline-block;
1162
        display: inline-block;
1165
        white-space: nowrap;
1166
1163
1167
        &::after {
1164
        &::after {
1168
            content: " | ";
1165
            content: "|";
1166
            padding: 0 .2em;
1169
        }
1167
        }
1170
1168
1171
        &:last-child {
1169
        &:last-child {
Lines 1173-1181 div { Link Here
1173
                content: "";
1171
                content: "";
1174
            }
1172
            }
1175
        }
1173
        }
1176
1177
    }
1174
    }
1178
1179
}
1175
}
1180
1176
1181
#views {
1177
#views {
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl (-461 / +513 lines)
Lines 438-474 Link Here
438
                <span class="results_summary" id="content_type">
438
                <span class="results_summary" id="content_type">
439
                    <xsl:if test="marc:datafield[@tag=336]">
439
                    <xsl:if test="marc:datafield[@tag=336]">
440
                        <span class="label">Content type: </span>
440
                        <span class="label">Content type: </span>
441
                        <xsl:for-each select="marc:datafield[@tag=336]">
441
                        <ul class="resource_list">
442
                            <xsl:call-template name="subfieldSelect">
442
                            <xsl:for-each select="marc:datafield[@tag=336]">
443
                                <xsl:with-param name="codes">a</xsl:with-param>
443
                                <li>
444
                                <xsl:with-param name="delimeter">, </xsl:with-param>
444
                                    <xsl:call-template name="subfieldSelect">
445
                            </xsl:call-template>
445
                                        <xsl:with-param name="codes">a</xsl:with-param>
446
                            <xsl:if test="position() != last()"><span class="separator"><xsl:text> | </xsl:text></span></xsl:if>
446
                                        <xsl:with-param name="delimeter">, </xsl:with-param>
447
                        </xsl:for-each>
447
                                    </xsl:call-template>
448
                                </li>
449
                            </xsl:for-each>
450
                        </ul>
448
                    </xsl:if>
451
                    </xsl:if>
449
                    <xsl:text> </xsl:text>
452
                    <xsl:text> </xsl:text>
450
                    <!-- Media Type -->
453
                    <!-- Media Type -->
451
                    <xsl:if test="marc:datafield[@tag=337]">
454
                    <xsl:if test="marc:datafield[@tag=337]">
452
                        <span class="label">Media type: </span>
455
                        <span class="label">Media type: </span>
453
                        <xsl:for-each select="marc:datafield[@tag=337]">
456
                        <ul class="resource_list">
454
                            <xsl:call-template name="subfieldSelect">
457
                            <xsl:for-each select="marc:datafield[@tag=337]">
455
                                <xsl:with-param name="codes">a</xsl:with-param>
458
                                <li>
456
                                <xsl:with-param name="delimeter">, </xsl:with-param>
459
                                    <xsl:call-template name="subfieldSelect">
457
                            </xsl:call-template>
460
                                        <xsl:with-param name="codes">a</xsl:with-param>
458
                            <xsl:if test="position() != last()"><span class="separator"><xsl:text> | </xsl:text></span></xsl:if>
461
                                        <xsl:with-param name="delimeter">, </xsl:with-param>
459
                        </xsl:for-each>
462
                                    </xsl:call-template>
463
                                </li>
464
                            </xsl:for-each>
465
                        </ul>
460
                    </xsl:if>
466
                    </xsl:if>
461
                    <xsl:text> </xsl:text>
467
                    <xsl:text> </xsl:text>
462
                    <!-- Media Type -->
468
                    <!-- Media Type -->
463
                    <xsl:if test="marc:datafield[@tag=338]">
469
                    <xsl:if test="marc:datafield[@tag=338]">
464
                        <span class="label">Carrier type: </span>
470
                        <span class="label">Carrier type: </span>
465
                        <xsl:for-each select="marc:datafield[@tag=338]">
471
                        <ul class="resource_list">
466
                            <xsl:call-template name="subfieldSelect">
472
                            <xsl:for-each select="marc:datafield[@tag=338]">
467
                                <xsl:with-param name="codes">a</xsl:with-param>
473
                                <li>
468
                                <xsl:with-param name="delimeter">, </xsl:with-param>
474
                                    <xsl:call-template name="subfieldSelect">
469
                            </xsl:call-template>
475
                                        <xsl:with-param name="codes">a</xsl:with-param>
470
                            <xsl:if test="position() != last()"><span class="separator"><xsl:text> | </xsl:text></span></xsl:if>
476
                                        <xsl:with-param name="delimeter">, </xsl:with-param>
471
                        </xsl:for-each>
477
                                    </xsl:call-template>
478
                                </li>
479
                            </xsl:for-each>
480
                        </ul>
472
                    </xsl:if>
481
                    </xsl:if>
473
                </span>
482
                </span>
474
            </xsl:if>
483
            </xsl:if>
Lines 477-527 Link Here
477
        <xsl:if test="marc:datafield[@tag=385]">
486
        <xsl:if test="marc:datafield[@tag=385]">
478
            <span class="results_summary audience">
487
            <span class="results_summary audience">
479
                <span class="label">Audience: </span>
488
                <span class="label">Audience: </span>
480
                <xsl:for-each select="marc:datafield[@tag=385]">
489
                <ul class="resource_list">
481
                    <xsl:if test="marc:subfield[@code='m']">
490
                    <xsl:for-each select="marc:datafield[@tag=385]">
482
                        <xsl:call-template name="chopPunctuation">
491
                        <li>
483
                            <xsl:with-param name="chopString">
492
                            <xsl:if test="marc:subfield[@code='m']">
484
                                <xsl:call-template name="subfieldSelect">
493
                                <xsl:call-template name="chopPunctuation">
485
                                    <xsl:with-param name="codes">m</xsl:with-param>
494
                                    <xsl:with-param name="chopString">
486
                                </xsl:call-template>
495
                                        <xsl:call-template name="subfieldSelect">
487
                            </xsl:with-param>
496
                                            <xsl:with-param name="codes">m</xsl:with-param>
488
                        </xsl:call-template>
497
                                        </xsl:call-template>
489
                        <xsl:text>: </xsl:text>
498
                                    </xsl:with-param>
490
                    </xsl:if>
491
                        <xsl:call-template name="chopPunctuation">
492
                            <xsl:with-param name="chopString">
493
                                <xsl:call-template name="subfieldSelect">
494
                                    <xsl:with-param name="codes">a</xsl:with-param>
495
                                    <xsl:with-param name="delimeter">, </xsl:with-param>
496
                                </xsl:call-template>
499
                                </xsl:call-template>
497
                            </xsl:with-param>
500
                                <xsl:text>: </xsl:text>
498
                        </xsl:call-template>
501
                            </xsl:if>
499
                    <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text> | </xsl:text></xsl:otherwise></xsl:choose>
502
                            <xsl:call-template name="chopPunctuation">
500
                </xsl:for-each>
503
                                <xsl:with-param name="chopString">
504
                                    <xsl:call-template name="subfieldSelect">
505
                                        <xsl:with-param name="codes">a</xsl:with-param>
506
                                        <xsl:with-param name="delimeter">, </xsl:with-param>
507
                                    </xsl:call-template>
508
                                </xsl:with-param>
509
                            </xsl:call-template>
510
                        </li>
511
                    </xsl:for-each>
512
                </ul>
501
            </span>
513
            </span>
502
        </xsl:if>
514
        </xsl:if>
503
515
504
        <xsl:if test="marc:datafield[@tag=020]/marc:subfield[@code='a']">
516
        <xsl:if test="marc:datafield[@tag=020]/marc:subfield[@code='a']">
505
          <span class="results_summary isbn"><span class="label">ISBN: </span>
517
            <span class="results_summary isbn"><span class="label">ISBN: </span>
506
            <xsl:for-each select="marc:datafield[@tag=020]/marc:subfield[@code='a']">
518
                <ul class="resource_list">
507
              <span property="isbn">
519
                    <xsl:for-each select="marc:datafield[@tag=020]/marc:subfield[@code='a']">
508
                <xsl:value-of select="."/>
520
                        <li>
509
                <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
521
                            <span property="isbn">
510
              </span>
522
                                <xsl:value-of select="."/>
511
            </xsl:for-each>
523
                            </span>
512
          </span>
524
                        </li>
525
                    </xsl:for-each>
526
                </ul>
527
            </span>
513
        </xsl:if>
528
        </xsl:if>
514
529
515
        <!-- Build ISSN -->
530
        <!-- Build ISSN -->
516
        <xsl:if test="marc:datafield[@tag=022]/marc:subfield[@code='a']">
531
        <xsl:if test="marc:datafield[@tag=022]/marc:subfield[@code='a']">
517
          <span class="results_summary issn"><span class="label">ISSN: </span>
532
            <span class="results_summary issn"><span class="label">ISSN: </span>
518
            <xsl:for-each select="marc:datafield[@tag=022]/marc:subfield[@code='a']">
533
                <ul class="resource_list">
519
              <span property="issn">
534
                    <xsl:for-each select="marc:datafield[@tag=022]/marc:subfield[@code='a']">
520
                <xsl:value-of select="."/>
535
                        <li>
521
                <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
536
                            <span property="issn">
522
              </span>
537
                                <xsl:value-of select="."/>
523
            </xsl:for-each>
538
                            </span>
524
          </span>
539
                        </li>
540
                    </xsl:for-each>
541
                </ul>
542
            </span>
525
        </xsl:if>
543
        </xsl:if>
526
544
527
        <xsl:if test="marc:datafield[@tag=013]">
545
        <xsl:if test="marc:datafield[@tag=013]">
Lines 559-600 Link Here
559
            </xsl:call-template>
577
            </xsl:call-template>
560
        </xsl:if>
578
        </xsl:if>
561
579
562
            <xsl:if test="marc:datafield[@tag=246]">
580
        <xsl:if test="marc:datafield[@tag=246]">
563
                <span class="results_summary other_title"><span class="label">Other title: </span>
581
            <span class="results_summary other_title">
582
                <span class="label">Other title: </span>
583
                <ul class="resource_list">
564
                    <xsl:for-each select="marc:datafield[@tag=246]">
584
                    <xsl:for-each select="marc:datafield[@tag=246]">
565
                        <span property="alternateName">
585
                        <li>
566
                            <xsl:call-template name="chopPunctuation">
586
                            <span property="alternateName">
567
                                <xsl:with-param name="chopString">
587
                                <xsl:call-template name="chopPunctuation">
568
                                    <xsl:if test="marc:subfield[@code='i']">
588
                                    <xsl:with-param name="chopString">
569
					    <xsl:call-template name="subfieldSelect">
589
                                        <xsl:if test="marc:subfield[@code='i']">
570
						    <xsl:with-param name="codes">i</xsl:with-param>
590
                                            <xsl:call-template name="subfieldSelect">
571
					    </xsl:call-template>
591
                                                <xsl:with-param name="codes">i</xsl:with-param>
572
                                    </xsl:if>
592
                                            </xsl:call-template>
573
				    <xsl:text> </xsl:text>
593
                                        </xsl:if>
574
                                    <xsl:call-template name="subfieldSelect">
594
                                        <xsl:text> </xsl:text>
575
                                        <xsl:with-param name="codes">abhfgnp</xsl:with-param>
595
                                        <xsl:call-template name="subfieldSelect">
576
                                    </xsl:call-template>
596
                                            <xsl:with-param name="codes">abhfgnp</xsl:with-param>
577
                                </xsl:with-param>
597
                                        </xsl:call-template>
578
                            </xsl:call-template>
598
                                    </xsl:with-param>
579
                            <xsl:if test="@ind1=1 and not(marc:subfield[@code='i'])">
599
                                </xsl:call-template>
580
                                <xsl:choose>
600
                                <xsl:if test="@ind1=1 and not(marc:subfield[@code='i'])">
581
                                    <xsl:when test="@ind2=0"> [Portion of title]</xsl:when>
601
                                    <xsl:choose>
582
                                    <xsl:when test="@ind2=1"> [Parallel title]</xsl:when>
602
                                        <xsl:when test="@ind2=0"> [Portion of title]</xsl:when>
583
                                    <xsl:when test="@ind2=2"> [Distinctive title]</xsl:when>
603
                                        <xsl:when test="@ind2=1"> [Parallel title]</xsl:when>
584
                                    <xsl:when test="@ind2=3"> [Other title]</xsl:when>
604
                                        <xsl:when test="@ind2=2"> [Distinctive title]</xsl:when>
585
                                    <xsl:when test="@ind2=4"> [Cover title]</xsl:when>
605
                                        <xsl:when test="@ind2=3"> [Other title]</xsl:when>
586
                                    <xsl:when test="@ind2=5"> [Added title page title]</xsl:when>
606
                                        <xsl:when test="@ind2=4"> [Cover title]</xsl:when>
587
                                    <xsl:when test="@ind2=6"> [Caption title]</xsl:when>
607
                                        <xsl:when test="@ind2=5"> [Added title page title]</xsl:when>
588
                                    <xsl:when test="@ind2=7"> [Running title]</xsl:when>
608
                                        <xsl:when test="@ind2=6"> [Caption title]</xsl:when>
589
                                    <xsl:when test="@ind2=8"> [Spine title]</xsl:when>
609
                                        <xsl:when test="@ind2=7"> [Running title]</xsl:when>
590
                                </xsl:choose>
610
                                        <xsl:when test="@ind2=8"> [Spine title]</xsl:when>
591
                            </xsl:if>
611
                                    </xsl:choose>
592
                        </span>
612
                                </xsl:if>
593
                        <!-- #13386 added separator | -->
613
                            </span>
594
                        <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise></xsl:choose>
614
                        </li>
595
                    </xsl:for-each>
615
                    </xsl:for-each>
596
                </span>
616
                </ul>
597
            </xsl:if>
617
            </span>
618
        </xsl:if>
598
619
599
620
600
        <xsl:if test="marc:datafield[@tag=242]">
621
        <xsl:if test="marc:datafield[@tag=242]">
Lines 626-836 Link Here
626
            </span>
647
            </span>
627
        </xsl:if>
648
        </xsl:if>
628
649
629
            <xsl:if test="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
650
        <xsl:if test="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
630
                <span class="results_summary uniform_titles"><span class="label">Uniform titles: </span>
651
            <span class="results_summary uniform_titles">
652
                <span class="label">Uniform titles: </span>
653
                <ul class="resource_list">
631
                    <xsl:for-each select="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
654
                    <xsl:for-each select="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]">
632
                        <span property="alternateName">
655
                        <li>
633
                            <xsl:if test="marc:subfield[@code='i']">
656
                            <span property="alternateName">
634
				    <xsl:call-template name="subfieldSelect">
657
                                <xsl:if test="marc:subfield[@code='i']">
635
					    <xsl:with-param name="codes">i</xsl:with-param>
658
                                    <xsl:call-template name="subfieldSelect">
636
				    </xsl:call-template>
659
                                        <xsl:with-param name="codes">i</xsl:with-param>
637
                            </xsl:if>
660
                                    </xsl:call-template>
638
			    <xsl:text> </xsl:text>
639
                            <xsl:for-each select="marc:subfield">
640
                                <xsl:if test="contains('adfghklmnoprst',@code)">
641
                                    <xsl:value-of select="text()"/>
642
                                    <xsl:text> </xsl:text>
643
                                </xsl:if>
661
                                </xsl:if>
644
                            </xsl:for-each>
662
                                <xsl:text> </xsl:text>
645
                        </span>
663
                                <xsl:for-each select="marc:subfield">
646
                        <xsl:if test="position() != last()">
664
                                    <xsl:if test="contains('adfghklmnoprst',@code)">
647
                            <span class="separator"><xsl:text> | </xsl:text></span>
665
                                        <xsl:value-of select="text()"/>
648
                        </xsl:if>
666
                                        <xsl:text> </xsl:text>
667
                                    </xsl:if>
668
                                </xsl:for-each>
669
                            </span>
670
                        </li>
649
                    </xsl:for-each>
671
                    </xsl:for-each>
650
                </span>
672
                </ul>
651
            </xsl:if>
673
            </span>
674
        </xsl:if>
652
675
653
676
654
            <!-- #13382 Added Related works 700$i -->
677
        <!-- #13382 Added Related works 700$i -->
655
            <xsl:if test="marc:datafield[@tag=700][marc:subfield[@code='i']] or marc:datafield[@tag=710][marc:subfield[@code='i']] or marc:datafield[@tag=711][marc:subfield[@code='i']]">
678
        <xsl:if test="marc:datafield[@tag=700][marc:subfield[@code='i']] or marc:datafield[@tag=710][marc:subfield[@code='i']] or marc:datafield[@tag=711][marc:subfield[@code='i']]">
656
                <span class="results_summary related_works"><span class="label">Related works: </span>
679
            <span class="results_summary related_works">
680
                <span class="label">Related works: </span>
681
                <ul class="resource_list">
657
                    <xsl:for-each select="marc:datafield[@tag=700][marc:subfield[@code='i']] | marc:datafield[@tag=710][marc:subfield[@code='i']] | marc:datafield[@tag=711][marc:subfield[@code='i']]">
682
                    <xsl:for-each select="marc:datafield[@tag=700][marc:subfield[@code='i']] | marc:datafield[@tag=710][marc:subfield[@code='i']] | marc:datafield[@tag=711][marc:subfield[@code='i']]">
658
                        <xsl:variable name="str">
683
                        <li>
659
                            <xsl:call-template name="subfieldSelect">
684
                            <xsl:variable name="str">
660
                                <xsl:with-param name="codes">abcdfghiklmnporstux</xsl:with-param>
685
                                <xsl:call-template name="subfieldSelect">
686
                                    <xsl:with-param name="codes">abcdfghiklmnporstux</xsl:with-param>
687
                                </xsl:call-template>
688
                            </xsl:variable>
689
                            <xsl:call-template name="chopPunctuation">
690
                                <xsl:with-param name="chopString">
691
                                    <xsl:value-of select="$str"/>
692
                                </xsl:with-param>
661
                            </xsl:call-template>
693
                            </xsl:call-template>
662
                        </xsl:variable>
694
                            <!-- add relator code too between brackets-->
663
                        <xsl:call-template name="chopPunctuation">
695
                            <xsl:if test="marc:subfield[@code='4' or @code='e']">
664
                            <xsl:with-param name="chopString">
696
                                <span class="relatorcode">
665
                                <xsl:value-of select="$str"/>
697
                                    <xsl:text> [</xsl:text>
666
                            </xsl:with-param>
698
                                    <xsl:choose>
667
                        </xsl:call-template>
699
                                        <xsl:when test="marc:subfield[@code='e']">
668
                        <!-- add relator code too between brackets-->
700
                                            <xsl:for-each select="marc:subfield[@code='e']">
669
                        <xsl:if test="marc:subfield[@code='4' or @code='e']">
701
                                                <xsl:value-of select="."/>
670
                            <span class="relatorcode">
702
                                                <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
671
                                <xsl:text> [</xsl:text>
703
                                            </xsl:for-each>
672
                                <xsl:choose>
704
                                        </xsl:when>
673
                                    <xsl:when test="marc:subfield[@code='e']">
705
                                        <xsl:otherwise>
674
                                        <xsl:for-each select="marc:subfield[@code='e']">
706
                                            <xsl:for-each select="marc:subfield[@code='4']">
675
                                            <xsl:value-of select="."/>
707
                                                <xsl:value-of select="."/>
676
                                            <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
708
                                                <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
677
                                        </xsl:for-each>
709
                                            </xsl:for-each>
678
                                    </xsl:when>
710
                                        </xsl:otherwise>
679
                                    <xsl:otherwise>
711
                                    </xsl:choose>
680
                                        <xsl:for-each select="marc:subfield[@code='4']">
712
                                    <xsl:text>]</xsl:text>
681
                                            <xsl:value-of select="."/>
713
                                </span>
682
                                            <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
714
                            </xsl:if>
683
                                        </xsl:for-each>
715
                        </li>
684
                                    </xsl:otherwise>
685
                                </xsl:choose>
686
                                <xsl:text>]</xsl:text>
687
                            </span>
688
                        </xsl:if>
689
                        <xsl:choose>
690
                            <xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
691
                        </xsl:choose>
692
                    </xsl:for-each>
716
                    </xsl:for-each>
693
                </span>
717
                </ul>
694
            </xsl:if>
718
            </span>
719
        </xsl:if>
695
720
696
            <!-- #13382 Added Contained Works 7xx@ind2=2 -->
721
            <!-- #13382 Added Contained Works 7xx@ind2=2 -->
697
            <xsl:if test="marc:datafield[@tag=700][@ind2=2 and not(marc:subfield[@code='i'])] or marc:datafield[@tag=710][@ind2=2 and not(marc:subfield[@code='i'])] or marc:datafield[@tag=711][@ind2=2 and not(marc:subfield[@code='i'])]">
722
            <xsl:if test="marc:datafield[@tag=700][@ind2=2 and not(marc:subfield[@code='i'])] or marc:datafield[@tag=710][@ind2=2 and not(marc:subfield[@code='i'])] or marc:datafield[@tag=711][@ind2=2 and not(marc:subfield[@code='i'])]">
698
                <span class="results_summary contained_works"><span class="label">Contained works: </span>
723
                <span class="results_summary contained_works">
699
                    <xsl:for-each select="marc:datafield[@tag=700][@ind2=2][not(marc:subfield[@code='i'])] | marc:datafield[@tag=710][@ind2=2][not(marc:subfield[@code='i'])] | marc:datafield[@tag=711][@ind2=2][not(marc:subfield[@code='i'])]">
724
                    <span class="label">Contained works: </span>
700
                        <xsl:variable name="str">
725
                    <ul class="resource_list">
701
                            <xsl:call-template name="subfieldSelect">
726
                        <xsl:for-each select="marc:datafield[@tag=700][@ind2=2][not(marc:subfield[@code='i'])] | marc:datafield[@tag=710][@ind2=2][not(marc:subfield[@code='i'])] | marc:datafield[@tag=711][@ind2=2][not(marc:subfield[@code='i'])]">
702
                                <xsl:with-param name="codes">abcdfghiklmnporstux</xsl:with-param>
727
                            <li>
703
                            </xsl:call-template>
728
                                <xsl:variable name="str">
704
                        </xsl:variable>
729
                                    <xsl:call-template name="subfieldSelect">
705
                        <xsl:call-template name="chopPunctuation">
730
                                        <xsl:with-param name="codes">abcdfghiklmnporstux</xsl:with-param>
706
                            <xsl:with-param name="chopString">
731
                                    </xsl:call-template>
707
                                <xsl:value-of select="$str"/>
732
                                </xsl:variable>
708
                            </xsl:with-param>
733
                                <xsl:call-template name="chopPunctuation">
709
                        </xsl:call-template>
734
                                    <xsl:with-param name="chopString">
710
                        <!-- add relator code too between brackets-->
735
                                        <xsl:value-of select="$str"/>
711
                        <xsl:if test="marc:subfield[@code='4' or @code='e']">
736
                                    </xsl:with-param>
712
                            <span class="relatorcode">
737
                                </xsl:call-template>
713
                                <xsl:text> [</xsl:text>
738
                                <!-- add relator code too between brackets-->
714
                                <xsl:choose>
739
                                <xsl:if test="marc:subfield[@code='4' or @code='e']">
715
                                    <xsl:when test="marc:subfield[@code='e']">
740
                                    <span class="relatorcode">
716
                                        <xsl:for-each select="marc:subfield[@code='e']">
741
                                        <xsl:text> [</xsl:text>
717
                                            <xsl:value-of select="."/>
742
                                        <xsl:choose>
718
                                            <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
743
                                            <xsl:when test="marc:subfield[@code='e']">
719
                                        </xsl:for-each>
744
                                                <xsl:for-each select="marc:subfield[@code='e']">
720
                                    </xsl:when>
745
                                                    <xsl:value-of select="."/>
721
                                    <xsl:otherwise>
746
                                                    <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
722
                                        <xsl:for-each select="marc:subfield[@code='4']">
747
                                                </xsl:for-each>
723
                                            <xsl:value-of select="."/>
748
                                            </xsl:when>
724
                                            <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
749
                                            <xsl:otherwise>
725
                                        </xsl:for-each>
750
                                                <xsl:for-each select="marc:subfield[@code='4']">
726
                                    </xsl:otherwise>
751
                                                    <xsl:value-of select="."/>
727
                                </xsl:choose>
752
                                                    <xsl:if test="position() != last()"><xsl:text>, </xsl:text></xsl:if>
728
                                <xsl:text>]</xsl:text>
753
                                                </xsl:for-each>
729
                            </span>
754
                                            </xsl:otherwise>
730
                        </xsl:if>
755
                                        </xsl:choose>
731
                        <xsl:choose>
756
                                        <xsl:text>]</xsl:text>
732
                            <xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
757
                                    </span>
733
                        </xsl:choose>
758
                                </xsl:if>
734
                    </xsl:for-each>
759
                            </li>
760
                        </xsl:for-each>
761
                    </ul>
735
                </span>
762
                </span>
736
            </xsl:if>
763
            </xsl:if>
737
764
738
            <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6' and not(@tag=655)]">
765
            <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6' and not(@tag=655)]">
739
            <span class="results_summary subjects"><span class="label">Subject(s): </span>
766
                <span class="results_summary subjects">
740
                <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6'][not(@tag=655)]">
767
                    <span class="label">Subject(s): </span>
741
            <span property="keywords">
768
                    <ul class="resource_list">
742
            <a>
769
                        <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6'][not(@tag=655)]">
743
            <xsl:attribute name="class">subject</xsl:attribute>
770
                            <li>
744
            <xsl:choose>
771
                                <span property="keywords">
745
            <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
772
                                    <a>
746
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/></xsl:attribute>
773
                                        <xsl:attribute name="class">subject</xsl:attribute>
747
            </xsl:when>
774
                                        <xsl:choose>
748
            <!-- #1807 Strip unwanted parenthesis from subjects for searching -->
775
                                            <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
749
            <xsl:when test="$TraceSubjectSubdivisions='1'">
776
                                                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/></xsl:attribute>
750
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:call-template name="subfieldSelectSubject">
777
                                            </xsl:when>
751
                        <xsl:with-param name="codes">abcdfgklmnopqrstvxyz</xsl:with-param>
778
                                            <!-- #1807 Strip unwanted parenthesis from subjects for searching -->
752
                        <xsl:with-param name="delimeter"> AND </xsl:with-param>
779
                                            <xsl:when test="$TraceSubjectSubdivisions='1'">
753
                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
780
                                                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:call-template name="subfieldSelectSubject">
754
                        <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
781
                                                        <xsl:with-param name="codes">abcdfgklmnopqrstvxyz</xsl:with-param>
755
                        <xsl:with-param name="urlencode">1</xsl:with-param>
782
                                                        <xsl:with-param name="delimeter"> AND </xsl:with-param>
756
                    </xsl:call-template>
783
                                                        <xsl:with-param name="prefix">(su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
757
                </xsl:attribute>
784
                                                        <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
758
            </xsl:when>
785
                                                        <xsl:with-param name="urlencode">1</xsl:with-param>
759
                <!-- #1807 Strip unwanted parenthesis from subjects for searching -->
786
                                                    </xsl:call-template>
760
            <xsl:otherwise>
787
                                                </xsl:attribute>
761
                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='a'],'()',''), true())"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
788
                                            </xsl:when>
762
            </xsl:otherwise>
789
                                            <!-- #1807 Strip unwanted parenthesis from subjects for searching -->
763
            </xsl:choose>
790
                                            <xsl:otherwise>
764
            <xsl:call-template name="chopPunctuation">
791
                                                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=su<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='a'],'()',''), true())"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
765
                <xsl:with-param name="chopString">
792
                                            </xsl:otherwise>
766
                    <xsl:call-template name="subfieldSelect">
793
                                        </xsl:choose>
767
                        <xsl:with-param name="codes">abcdfgklmnopqrstvxyz</xsl:with-param>
794
                                        <xsl:call-template name="chopPunctuation">
768
                        <xsl:with-param name="subdivCodes">vxyz</xsl:with-param>
795
                                            <xsl:with-param name="chopString">
769
                        <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
796
                                                <xsl:call-template name="subfieldSelect">
770
                    </xsl:call-template>
797
                                                    <xsl:with-param name="codes">abcdfgklmnopqrstvxyz</xsl:with-param>
771
                </xsl:with-param>
798
                                                    <xsl:with-param name="subdivCodes">vxyz</xsl:with-param>
772
            </xsl:call-template>
799
                                                    <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
773
            </a>
800
                                                </xsl:call-template>
774
            </span>
801
                                            </xsl:with-param>
775
            <xsl:if test="marc:subfield[@code=9]">
802
                                        </xsl:call-template>
776
                <a class='authlink'>
803
                                    </a>
777
                    <xsl:attribute name="href">/cgi-bin/koha/opac-authoritiesdetail.pl?authid=<xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/></xsl:attribute>
804
                                </span>
778
                    <xsl:element name="i">
805
                                <xsl:if test="marc:subfield[@code=9]">
779
                        <xsl:attribute name="class">fa fa-search</xsl:attribute>
806
                                    <a class='authlink'>
780
                    </xsl:element>
807
                                        <xsl:attribute name="href">/cgi-bin/koha/opac-authoritiesdetail.pl?authid=<xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/></xsl:attribute>
781
                </a>
808
                                        <xsl:element name="i">
809
                                            <xsl:attribute name="class">fa fa-search</xsl:attribute>
810
                                        </xsl:element>
811
                                    </a>
812
                                </xsl:if>
813
                            </li>
814
                        </xsl:for-each>
815
                    </ul>
816
                </span>
782
            </xsl:if>
817
            </xsl:if>
783
            <xsl:choose>
784
            <xsl:when test="position()=last()"></xsl:when>
785
            <xsl:otherwise> | </xsl:otherwise>
786
            </xsl:choose>
787
788
            </xsl:for-each>
789
            </span>
790
        </xsl:if>
791
818
792
            <!-- Genre/Form -->
819
        <!-- Genre/Form -->
793
            <xsl:if test="marc:datafield[@tag=655]">
820
        <xsl:if test="marc:datafield[@tag=655]">
794
                <span class="results_summary genre"><span class="label">Genre/Form: </span>
821
            <span class="results_summary genre">
822
                <span class="label">Genre/Form: </span>
823
                <ul class="resource_list">
795
                    <xsl:for-each select="marc:datafield[@tag=655]">
824
                    <xsl:for-each select="marc:datafield[@tag=655]">
796
                        <a>
825
                        <li>
797
                            <xsl:choose>
826
                            <a>
798
                                <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
827
                                <xsl:choose>
799
                                    <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/></xsl:attribute>
828
                                    <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
800
                                </xsl:when>
829
                                        <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/></xsl:attribute>
801
                                <xsl:when test="$TraceSubjectSubdivisions='1'">
830
                                    </xsl:when>
802
                                    <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:call-template name="subfieldSelectSubject">
831
                                    <xsl:when test="$TraceSubjectSubdivisions='1'">
803
                                        <xsl:with-param name="codes">avxyz</xsl:with-param>
832
                                        <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:call-template name="subfieldSelectSubject">
804
                                        <xsl:with-param name="delimeter"> AND </xsl:with-param>
833
                                            <xsl:with-param name="codes">avxyz</xsl:with-param>
805
                                        <xsl:with-param name="prefix">(index-term-genre<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
834
                                            <xsl:with-param name="delimeter"> AND </xsl:with-param>
806
                                        <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
835
                                            <xsl:with-param name="prefix">(index-term-genre<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/></xsl:with-param>
807
                                        <xsl:with-param name="urlencode">1</xsl:with-param>
836
                                            <xsl:with-param name="suffix"><xsl:value-of select="$TracingQuotesRight"/>)</xsl:with-param>
808
                                    </xsl:call-template>
837
                                            <xsl:with-param name="urlencode">1</xsl:with-param>
809
                                    </xsl:attribute>
838
                                        </xsl:call-template>
810
                                </xsl:when>
839
                                        </xsl:attribute>
811
                                <xsl:otherwise>
840
                                    </xsl:when>
812
                                    <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=index-term-genre<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
841
                                    <xsl:otherwise>
813
                                </xsl:otherwise>
842
                                        <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=index-term-genre<xsl:value-of select="$SubjectModifier"/>:<xsl:value-of select="$TracingQuotesLeft"/><xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/><xsl:value-of select="$TracingQuotesRight"/></xsl:attribute>
814
                            </xsl:choose>
843
                                    </xsl:otherwise>
815
                        <xsl:call-template name="subfieldSelect">
844
                                </xsl:choose>
816
                            <xsl:with-param name="codes">avxyz</xsl:with-param>
845
                                <xsl:call-template name="subfieldSelect">
817
                            <xsl:with-param name="subdivCodes">vxyz</xsl:with-param>
846
                                    <xsl:with-param name="codes">avxyz</xsl:with-param>
818
                            <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
847
                                    <xsl:with-param name="subdivCodes">vxyz</xsl:with-param>
819
                        </xsl:call-template>
848
                                    <xsl:with-param name="subdivDelimiter">-- </xsl:with-param>
820
                        </a>
849
                                </xsl:call-template>
821
                        <xsl:if test="marc:subfield[@code=9]">
822
                            <xsl:text> </xsl:text>
823
                            <a class='authlink'>
824
                                <xsl:attribute name="href">/cgi-bin/koha/opac-authoritiesdetail.pl?authid=<xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/></xsl:attribute>
825
                                <xsl:element name="i">
826
                                    <xsl:attribute name="class">fa fa-search</xsl:attribute>
827
                                </xsl:element>
828
                            </a>
850
                            </a>
829
                        </xsl:if>
851
                            <xsl:if test="marc:subfield[@code=9]">
830
                        <xsl:if test="position()!=last()"><span class="separator"> | </span></xsl:if>
852
                                <xsl:text> </xsl:text>
853
                                <a class='authlink'>
854
                                    <xsl:attribute name="href">/cgi-bin/koha/opac-authoritiesdetail.pl?authid=<xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/></xsl:attribute>
855
                                    <xsl:element name="i">
856
                                        <xsl:attribute name="class">fa fa-search</xsl:attribute>
857
                                    </xsl:element>
858
                                </a>
859
                            </xsl:if>
860
                        </li>
831
                    </xsl:for-each>
861
                    </xsl:for-each>
832
                </span>
862
                </ul>
833
            </xsl:if>
863
            </span>
864
        </xsl:if>
834
865
835
<!-- MARC21 776 Additional Physical Form Entry -->
866
<!-- MARC21 776 Additional Physical Form Entry -->
836
    <xsl:if test="marc:datafield[@tag=776]">
867
    <xsl:if test="marc:datafield[@tag=776]">
Lines 933-948 Link Here
933
    <xsl:if test="marc:datafield[@tag=082]">
964
    <xsl:if test="marc:datafield[@tag=082]">
934
        <span class="results_summary ddc">
965
        <span class="results_summary ddc">
935
            <span class="label">DDC classification: </span>
966
            <span class="label">DDC classification: </span>
936
            <xsl:for-each select="marc:datafield[@tag=082]">
967
            <ul class="resource_list">
937
                <xsl:call-template name="subfieldSelect">
968
                <xsl:for-each select="marc:datafield[@tag=082]">
938
                    <xsl:with-param name="codes">a</xsl:with-param>
969
                    <li>
939
                    <xsl:with-param name="delimeter"><xsl:text> | </xsl:text></xsl:with-param>
970
                        <xsl:call-template name="subfieldSelect">
940
                </xsl:call-template>
971
                            <xsl:with-param name="codes">a2b</xsl:with-param>
941
                <xsl:choose>
972
                            <xsl:with-param name="delimeter"><xsl:text>&#160;</xsl:text></xsl:with-param>
942
                    <xsl:when test="position()=last()"><xsl:text>  </xsl:text></xsl:when>
973
                        </xsl:call-template>
943
                    <xsl:otherwise> | </xsl:otherwise>
974
                    </li>
944
                </xsl:choose>
975
                </xsl:for-each>
945
            </xsl:for-each>
976
            </ul>
946
        </span>
977
        </span>
947
    </xsl:if>
978
    </xsl:if>
948
979
Lines 950-961 Link Here
950
    <xsl:if test="marc:datafield[@tag=050]">
981
    <xsl:if test="marc:datafield[@tag=050]">
951
        <span class="results_summary loc">
982
        <span class="results_summary loc">
952
            <span class="label">LOC classification: </span>
983
            <span class="label">LOC classification: </span>
953
            <xsl:for-each select="marc:datafield[@tag=050]">
984
            <ul class="resource_list">
954
                <xsl:call-template name="subfieldSelect">
985
                <xsl:for-each select="marc:datafield[@tag=050]">
955
                    <xsl:with-param name="codes">ab</xsl:with-param>
986
                    <li>
956
                    <xsl:with-param name="delimeter"><xsl:text> | </xsl:text></xsl:with-param>
987
                        <xsl:call-template name="subfieldSelect">
957
                </xsl:call-template>
988
                            <xsl:with-param name="codes">ab</xsl:with-param>
958
            </xsl:for-each>
989
                            <xsl:with-param name="delimeter"><xsl:text>&#160;</xsl:text></xsl:with-param>
990
                        </xsl:call-template>
991
                    </li>
992
                </xsl:for-each>
993
            </ul>
959
        </span>
994
        </span>
960
    </xsl:if>
995
    </xsl:if>
961
996
Lines 963-1052 Link Here
963
    <xsl:if test="marc:datafield[@tag=060]">
998
    <xsl:if test="marc:datafield[@tag=060]">
964
        <span class="results_summary nlm">
999
        <span class="results_summary nlm">
965
            <span class="label">NLM classification: </span>
1000
            <span class="label">NLM classification: </span>
966
            <xsl:for-each select="marc:datafield[@tag=060]">
1001
            <ul class="resource_list">
967
                <xsl:call-template name="subfieldSelect">
1002
                <xsl:for-each select="marc:datafield[@tag=060]">
968
                    <xsl:with-param name="codes">a</xsl:with-param>
1003
                    <li>
969
                    <xsl:with-param name="delimeter"><xsl:text> | </xsl:text></xsl:with-param>
1004
                    <xsl:call-template name="subfieldSelect">
970
                </xsl:call-template>
1005
                        <xsl:with-param name="codes">a</xsl:with-param>
971
                <xsl:if test="not(position()=last())"><xsl:text> | </xsl:text></xsl:if>
1006
                        <xsl:with-param name="delimeter"><xsl:text> | </xsl:text></xsl:with-param>
972
            </xsl:for-each>
1007
                    </xsl:call-template>
1008
                    </li>
1009
                </xsl:for-each>
1010
            </ul>
973
        </span>
1011
        </span>
974
    </xsl:if>
1012
    </xsl:if>
975
1013
976
<!-- Other classification -->
1014
<!-- Other classification -->
977
    <xsl:if test="marc:datafield[@tag=084]">
1015
    <xsl:if test="marc:datafield[@tag=084]">
978
       <span class="results_summary oc">
1016
        <span class="results_summary oc">
979
           <span class="label">Other classification: </span>
1017
            <span class="label">Other classification: </span>
980
          <xsl:for-each select="marc:datafield[@tag=084]">
1018
            <ul class="resource_list">
981
                <xsl:call-template name="subfieldSelect">
1019
                <xsl:for-each select="marc:datafield[@tag=084]">
982
                   <xsl:with-param name="codes">a</xsl:with-param>
1020
                    <li>
983
                   <xsl:with-param name="delimeter"><xsl:text> | </xsl:text></xsl:with-param>
1021
                        <xsl:call-template name="subfieldSelect">
984
                </xsl:call-template>
1022
                        <xsl:with-param name="codes">a</xsl:with-param>
985
                <xsl:choose>
1023
                            <xsl:with-param name="delimeter"><xsl:text> | </xsl:text></xsl:with-param>
986
                   <xsl:when test="position()=last()"><xsl:text>  </xsl:text></xsl:when>
1024
                        </xsl:call-template>
987
                   <xsl:otherwise> | </xsl:otherwise>
1025
                    </li>
988
                </xsl:choose>
1026
                </xsl:for-each>
989
          </xsl:for-each>
1027
            </ul>
990
       </span>
1028
       </span>
991
    </xsl:if>
1029
    </xsl:if>
992
1030
993
1031
994
<!-- Image processing code added here, takes precedence over text links including y3z text   -->
1032
    <!-- Image processing code added here, takes precedence over text links including y3z text   -->
995
        <xsl:if test="marc:datafield[@tag=856]">
1033
    <xsl:if test="marc:datafield[@tag=856]">
996
        <span class="results_summary online_resources"><span class="label">Online resources: </span>
1034
        <span class="results_summary online_resources">
997
            <ul>
1035
            <span class="label">Online resources: </span>
998
            <xsl:for-each select="marc:datafield[@tag=856]">
1036
                <ul class="resource_list">
999
                <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
1037
                    <xsl:for-each select="marc:datafield[@tag=856]">
1000
            <li><a property="url">
1038
                        <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
1001
            <xsl:choose>
1039
                        <li>
1002
              <xsl:when test="$OPACTrackClicks='track'">
1040
                            <a property="url">
1003
                <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="str:encode-uri(marc:subfield[@code='u'], true())"/>&amp;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
1041
                                <xsl:choose>
1004
              </xsl:when>
1042
                                    <xsl:when test="$OPACTrackClicks='track'">
1005
              <xsl:when test="$OPACTrackClicks='anonymous'">
1043
                                        <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="str:encode-uri(marc:subfield[@code='u'], true())"/>&amp;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
1006
                <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="str:encode-uri(marc:subfield[@code='u'], true())"/>&amp;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
1044
                                    </xsl:when>
1007
              </xsl:when>
1045
                                    <xsl:when test="$OPACTrackClicks='anonymous'">
1008
              <xsl:otherwise>
1046
                                        <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="str:encode-uri(marc:subfield[@code='u'], true())"/>&amp;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
1009
                  <xsl:attribute name="href">
1047
                                    </xsl:when>
1010
                      <xsl:if test="not(contains(marc:subfield[@code='u'],'://'))">
1048
                                    <xsl:otherwise>
1011
                          <xsl:choose>
1049
                                        <xsl:attribute name="href">
1012
                              <xsl:when test="@ind1=7">
1050
                                            <xsl:if test="not(contains(marc:subfield[@code='u'],'://'))">
1013
                                  <xsl:value-of select="marc:subfield[@code='2']"/><xsl:text>://</xsl:text>
1051
                                                <xsl:choose>
1014
                              </xsl:when>
1052
                                                    <xsl:when test="@ind1=7">
1015
                              <xsl:when test="@ind1=1">
1053
                                                        <xsl:value-of select="marc:subfield[@code='2']"/><xsl:text>://</xsl:text>
1016
                                  <xsl:text>ftp://</xsl:text>
1054
                                                    </xsl:when>
1017
                              </xsl:when>
1055
                                                    <xsl:when test="@ind1=1">
1018
                              <xsl:otherwise>
1056
                                                        <xsl:text>ftp://</xsl:text>
1019
                                  <xsl:text>http://</xsl:text>
1057
                                                    </xsl:when>
1020
                              </xsl:otherwise>
1058
                                                    <xsl:otherwise>
1021
                          </xsl:choose>
1059
                                                        <xsl:text>http://</xsl:text>
1022
                      </xsl:if>
1060
                                                    </xsl:otherwise>
1023
                      <xsl:value-of select="marc:subfield[@code='u']"/>
1061
                                                </xsl:choose>
1024
                  </xsl:attribute>
1062
                                            </xsl:if>
1025
              </xsl:otherwise>
1063
                                            <xsl:value-of select="marc:subfield[@code='u']"/>
1026
            </xsl:choose>
1064
                                        </xsl:attribute>
1027
                <xsl:if test="$OPACURLOpenInNewWindow='1'">
1065
                                    </xsl:otherwise>
1028
                    <xsl:attribute name="target">_blank</xsl:attribute>
1066
                                </xsl:choose>
1029
                </xsl:if>
1067
                                <xsl:if test="$OPACURLOpenInNewWindow='1'">
1030
                <xsl:choose>
1068
                                    <xsl:attribute name="target">_blank</xsl:attribute>
1031
                <xsl:when test="($Show856uAsImage='Details' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
1069
                                </xsl:if>
1032
                    <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="style">height:100px</xsl:attribute></xsl:element><xsl:text></xsl:text>
1070
                                <xsl:choose>
1033
                </xsl:when>
1071
                                    <xsl:when test="($Show856uAsImage='Details' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')">
1034
                <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
1072
                                        <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="style">height:100px</xsl:attribute></xsl:element><xsl:text></xsl:text>
1035
                    <xsl:call-template name="subfieldSelect">
1073
                                    </xsl:when>
1036
                        <xsl:with-param name="codes">y3z</xsl:with-param>
1074
                                    <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
1037
                    </xsl:call-template>
1075
                                        <xsl:call-template name="subfieldSelect">
1038
                </xsl:when>
1076
                                            <xsl:with-param name="codes">y3z</xsl:with-param>
1039
                <xsl:when test="$URLLinkText!=''">
1077
                                        </xsl:call-template>
1040
                    <xsl:value-of select="$URLLinkText"/>
1078
                                    </xsl:when>
1041
                </xsl:when>
1079
                                    <xsl:when test="$URLLinkText!=''">
1042
                <xsl:otherwise>
1080
                                        <xsl:value-of select="$URLLinkText"/>
1043
                    <xsl:text>Click here to access online</xsl:text>
1081
                                    </xsl:when>
1044
                </xsl:otherwise>
1082
                                    <xsl:otherwise>
1045
                </xsl:choose>
1083
                                        <xsl:text>Click here to access online</xsl:text>
1046
                </a></li>
1084
                                    </xsl:otherwise>
1047
            </xsl:for-each>
1085
                                </xsl:choose>
1048
            </ul>
1086
                            </a>
1049
        </span>
1087
                        </li>
1088
                    </xsl:for-each>
1089
                </ul>
1090
            </span>
1050
        </xsl:if>
1091
        </xsl:if>
1051
1092
1052
        <!-- 530 -->
1093
        <!-- 530 -->
Lines 1109-1127 Link Here
1109
        <xsl:if test="marc:datafield[@tag=583 and not(@ind1=0)]">
1150
        <xsl:if test="marc:datafield[@tag=583 and not(@ind1=0)]">
1110
            <span class="results_summary actionnote">
1151
            <span class="results_summary actionnote">
1111
                <span class="label">Action note: </span>
1152
                <span class="label">Action note: </span>
1112
                <xsl:for-each select="marc:datafield[@tag=583 and not(@ind1=0)]">
1153
                <ul class="resource_list">
1113
                    <xsl:choose>
1154
                    <xsl:for-each select="marc:datafield[@tag=583 and not(@ind1=0)]">
1114
                    <xsl:when test="marc:subfield[@code='z']">
1155
                        <li>
1115
                        <xsl:value-of select="marc:subfield[@code='z']"/><xsl:text> </xsl:text>
1156
                            <xsl:choose>
1116
                    </xsl:when>
1157
                                <xsl:when test="marc:subfield[@code='z']">
1117
                    <xsl:otherwise>
1158
                                    <xsl:value-of select="marc:subfield[@code='z']"/><xsl:text> </xsl:text>
1118
                        <xsl:call-template name="subfieldSelect">
1159
                                </xsl:when>
1119
                            <xsl:with-param name="codes">abcdefgijklnou</xsl:with-param>
1160
                                <xsl:otherwise>
1120
                        </xsl:call-template>
1161
                                    <xsl:call-template name="subfieldSelect">
1121
                    </xsl:otherwise>
1162
                                        <xsl:with-param name="codes">abcdefgijklnou</xsl:with-param>
1122
                    </xsl:choose>
1163
                                    </xsl:call-template>
1123
                    <xsl:if test="position()!=last()"><span class="separator"><xsl:text> | </xsl:text></span></xsl:if>
1164
                                </xsl:otherwise>
1124
                </xsl:for-each>
1165
                            </xsl:choose>
1166
                        </li>
1167
                    </xsl:for-each>
1168
                </ul>
1125
            </span>
1169
            </span>
1126
        </xsl:if>
1170
        </xsl:if>
1127
1171
Lines 1129-1140 Link Here
1129
        <xsl:if test="marc:datafield[@tag=508]">
1173
        <xsl:if test="marc:datafield[@tag=508]">
1130
            <span class="results_summary prod_credits">
1174
            <span class="results_summary prod_credits">
1131
                <span class="label">Production credits: </span>
1175
                <span class="label">Production credits: </span>
1132
                <xsl:for-each select="marc:datafield[@tag=508]">
1176
                <ul class="resource_list">
1133
                    <xsl:call-template name="subfieldSelectSpan">
1177
                    <xsl:for-each select="marc:datafield[@tag=508]">
1134
                        <xsl:with-param name="codes">a</xsl:with-param>
1178
                        <li>
1135
                    </xsl:call-template>
1179
                            <xsl:call-template name="subfieldSelectSpan">
1136
                    <xsl:if test="position()!=last()"><span class="separator"><xsl:text> | </xsl:text></span></xsl:if>
1180
                                <xsl:with-param name="codes">a</xsl:with-param>
1137
                </xsl:for-each>
1181
                            </xsl:call-template>
1182
                        </li>
1183
                    </xsl:for-each>
1184
                </ul>
1138
            </span>
1185
            </span>
1139
        </xsl:if>
1186
        </xsl:if>
1140
1187
Lines 1144-1153 Link Here
1144
                <xsl:if test="marc:datafield[@tag=586]/@ind1=' '">
1191
                <xsl:if test="marc:datafield[@tag=586]/@ind1=' '">
1145
                    <span class="label">Awards: </span>
1192
                    <span class="label">Awards: </span>
1146
                </xsl:if>
1193
                </xsl:if>
1147
                <xsl:for-each select="marc:datafield[@tag=586]">
1194
                <ul class="resource_list">
1148
                    <xsl:value-of select="marc:subfield[@code='a']"/>
1195
                    <xsl:for-each select="marc:datafield[@tag=586]">
1149
                    <xsl:if test="position()!=last()"><span class="separator"><xsl:text> | </xsl:text></span></xsl:if>
1196
                        <li>
1150
                </xsl:for-each>
1197
                            <xsl:value-of select="marc:subfield[@code='a']"/>
1198
                        </li>
1199
                    </xsl:for-each>
1200
                </ul>
1151
            </span>
1201
            </span>
1152
        </xsl:if>
1202
        </xsl:if>
1153
1203
Lines 1291-1376 Link Here
1291
1341
1292
        <!-- 770 - Supplement/Special issue entry -->
1342
        <!-- 770 - Supplement/Special issue entry -->
1293
        <xsl:if test="marc:datafield[@tag=770]">
1343
        <xsl:if test="marc:datafield[@tag=770]">
1294
            <span class="results_summary supplement"><span class="label">Supplement: </span>
1344
            <span class="results_summary supplement">
1295
                <xsl:for-each select="marc:datafield[@tag=770]">
1345
                <span class="label">Supplement: </span>
1296
                    <xsl:if test="marc:subfield[@code='i']">
1346
                <ul class="resource_list">
1297
                        <span class="770_rel_info">
1347
                    <xsl:for-each select="marc:datafield[@tag=770]">
1348
                        <li>
1349
                            <xsl:if test="marc:subfield[@code='i']">
1350
                                <span class="770_rel_info">
1351
                                    <xsl:call-template name="subfieldSelect">
1352
                                        <xsl:with-param name="codes">i</xsl:with-param>
1353
                                    </xsl:call-template>
1354
                                    <xsl:text> </xsl:text>
1355
                                </span>
1356
                            </xsl:if>
1357
                            <a>
1358
                                <xsl:choose>
1359
                                    <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
1360
                                        <xsl:attribute name="href">
1361
                                            /cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template>
1362
                                        </xsl:attribute>
1363
                                    </xsl:when>
1364
                                    <xsl:otherwise>
1365
                                        <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='t'], '()', ''),true())"/></xsl:attribute>
1366
                                    </xsl:otherwise>
1367
                                </xsl:choose>
1368
                                <xsl:choose>
1369
                                    <xsl:when test="marc:subfield[@code='a'] or marc:subfield[@code='t']">
1370
                                        <xsl:call-template name="subfieldSelect">
1371
                                            <xsl:with-param name="codes">a_t</xsl:with-param>
1372
                                        </xsl:call-template>
1373
                                    </xsl:when>
1374
                                </xsl:choose>
1375
                            </a>
1376
                            <xsl:text> </xsl:text>
1298
                            <xsl:call-template name="subfieldSelect">
1377
                            <xsl:call-template name="subfieldSelect">
1299
                                <xsl:with-param name="codes">i</xsl:with-param>
1378
                                <xsl:with-param name="codes">bdghkmnr9usxyz</xsl:with-param>
1300
                            </xsl:call-template>
1379
                            </xsl:call-template>
1301
                            <xsl:text> </xsl:text>
1380
                        </li>
1302
                        </span>
1381
                    </xsl:for-each>
1303
                    </xsl:if>
1382
                </ul>
1304
                    <a>
1305
                        <xsl:choose>
1306
                            <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
1307
                                <xsl:attribute name="href">
1308
                                    /cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template>
1309
                                </xsl:attribute>
1310
                            </xsl:when>
1311
                            <xsl:otherwise>
1312
                                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='t'], '()', ''),true())"/></xsl:attribute>
1313
                            </xsl:otherwise>
1314
                        </xsl:choose>
1315
                        <xsl:choose>
1316
                            <xsl:when test="marc:subfield[@code='a'] or marc:subfield[@code='t']">
1317
                                <xsl:call-template name="subfieldSelect">
1318
                                    <xsl:with-param name="codes">a_t</xsl:with-param>
1319
                                </xsl:call-template>
1320
                            </xsl:when>
1321
                        </xsl:choose>
1322
                    </a>
1323
                    <xsl:text> </xsl:text>
1324
                    <xsl:call-template name="subfieldSelect">
1325
                        <xsl:with-param name="codes">bdghkmnr9usxyz</xsl:with-param>
1326
                    </xsl:call-template>
1327
                    <xsl:choose>
1328
                        <xsl:when test="position()=last()"></xsl:when>
1329
                        <xsl:otherwise><span class="separator"> | </span></xsl:otherwise>
1330
                    </xsl:choose>
1331
                </xsl:for-each>
1332
            </span>
1383
            </span>
1333
        </xsl:if>
1384
        </xsl:if>
1334
1385
1335
        <!-- 772 - Supplement parent entry -->
1386
        <!-- 772 - Supplement parent entry -->
1336
        <xsl:if test="marc:datafield[@tag=772]">
1387
        <xsl:if test="marc:datafield[@tag=772]">
1337
            <span class="results_summary supplement_parent"><span class="label">Supplement to: </span>
1388
            <span class="results_summary supplement_parent">
1338
                <xsl:for-each select="marc:datafield[@tag=772]">
1389
                <span class="label">Supplement to: </span>
1339
                    <xsl:if test="marc:subfield[@code='i']">
1390
                <ul class="resource_list">
1340
                        <span class="772_rel_info">
1391
                    <xsl:for-each select="marc:datafield[@tag=772]">
1392
                        <li>
1393
                            <xsl:if test="marc:subfield[@code='i']">
1394
                                <span class="772_rel_info">
1395
                                    <xsl:call-template name="subfieldSelect">
1396
                                        <xsl:with-param name="codes">i</xsl:with-param>
1397
                                    </xsl:call-template>
1398
                                    <xsl:text> </xsl:text>
1399
                                </span>
1400
                            </xsl:if>
1401
                            <a>
1402
                                <xsl:choose>
1403
                                    <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
1404
                                        <xsl:attribute name="href">
1405
                                            /cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template>
1406
                                        </xsl:attribute>
1407
                                    </xsl:when>
1408
                                    <xsl:otherwise>
1409
                                        <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='t'], '()', ''),true())"/></xsl:attribute>
1410
                                    </xsl:otherwise>
1411
                                </xsl:choose>
1412
                                <xsl:choose>
1413
                                    <xsl:when test="marc:subfield[@code='a'] or marc:subfield[@code='t']">
1414
                                        <xsl:call-template name="subfieldSelect">
1415
                                            <xsl:with-param name="codes">a_t</xsl:with-param>
1416
                                        </xsl:call-template>
1417
                                    </xsl:when>
1418
                                </xsl:choose>
1419
                            </a>
1341
                            <xsl:call-template name="subfieldSelect">
1420
                            <xsl:call-template name="subfieldSelect">
1342
                                <xsl:with-param name="codes">i</xsl:with-param>
1421
                                <xsl:with-param name="codes">bdghkmnr9usxyz</xsl:with-param>
1343
                            </xsl:call-template>
1422
                            </xsl:call-template>
1344
                            <xsl:text> </xsl:text>
1423
                        </li>
1345
                        </span>
1424
                    </xsl:for-each>
1346
                    </xsl:if>
1425
                </ul>
1347
                    <a>
1348
                        <xsl:choose>
1349
                            <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
1350
                                <xsl:attribute name="href">
1351
                                    /cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template>
1352
                                </xsl:attribute>
1353
                            </xsl:when>
1354
                            <xsl:otherwise>
1355
                                <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate(marc:subfield[@code='t'], '()', ''),true())"/></xsl:attribute>
1356
                            </xsl:otherwise>
1357
                        </xsl:choose>
1358
                        <xsl:choose>
1359
                            <xsl:when test="marc:subfield[@code='a'] or marc:subfield[@code='t']">
1360
                                <xsl:call-template name="subfieldSelect">
1361
                                    <xsl:with-param name="codes">a_t</xsl:with-param>
1362
                                </xsl:call-template>
1363
                            </xsl:when>
1364
                        </xsl:choose>
1365
                    </a>
1366
                    <xsl:call-template name="subfieldSelect">
1367
                        <xsl:with-param name="codes">bdghkmnr9usxyz</xsl:with-param>
1368
                    </xsl:call-template>
1369
                    <xsl:choose>
1370
                        <xsl:when test="position()=last()"></xsl:when>
1371
                        <xsl:otherwise><span class="separator"> | </span></xsl:otherwise>
1372
                    </xsl:choose>
1373
                </xsl:for-each>
1374
            </span>
1426
            </span>
1375
        </xsl:if>
1427
        </xsl:if>
1376
1428
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl (-10 / +14 lines)
Lines 1052-1063 Link Here
1052
    <xsl:if test="marc:datafield[@tag=028]">
1052
    <xsl:if test="marc:datafield[@tag=028]">
1053
         <span class="results_summary publisher_number ">
1053
         <span class="results_summary publisher_number ">
1054
            <span class="label">Publisher number: </span>
1054
            <span class="label">Publisher number: </span>
1055
            <xsl:for-each select="marc:datafield[@tag=028]">
1055
            <ul class="resource_list">
1056
                <xsl:call-template name="subfieldSelect">
1056
                <xsl:for-each select="marc:datafield[@tag=028]">
1057
                    <xsl:with-param name="codes">abq</xsl:with-param>
1057
                    <li>
1058
                    <xsl:with-param name="delimeter"><xsl:text> | </xsl:text></xsl:with-param>
1058
                        <xsl:call-template name="subfieldSelect">
1059
                </xsl:call-template>
1059
                            <xsl:with-param name="codes">abq</xsl:with-param>
1060
            </xsl:for-each>
1060
                        </xsl:call-template>
1061
                    </li>
1062
                </xsl:for-each>
1063
            </ul>
1061
        </span>
1064
        </span>
1062
    </xsl:if>
1065
    </xsl:if>
1063
1066
Lines 1130-1142 Link Here
1130
    <xsl:if test="marc:datafield[@tag=246]">
1133
    <xsl:if test="marc:datafield[@tag=246]">
1131
    <span class="results_summary other_title">
1134
    <span class="results_summary other_title">
1132
    <span class="label">Other title: </span>
1135
    <span class="label">Other title: </span>
1136
        <ul class="resource_list">
1133
            <xsl:for-each select="marc:datafield[@tag=246]">
1137
            <xsl:for-each select="marc:datafield[@tag=246]">
1138
                <li>
1134
                    <xsl:call-template name="subfieldSelect">
1139
                    <xsl:call-template name="subfieldSelect">
1135
                        <xsl:with-param name="codes">ab</xsl:with-param>
1140
                        <xsl:with-param name="codes">ab</xsl:with-param>
1136
                    </xsl:call-template>
1141
                    </xsl:call-template>
1137
                <!-- #13386 added separator | -->
1142
                </li>
1138
                <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise></xsl:choose>
1139
            </xsl:for-each>
1143
            </xsl:for-each>
1144
        </ul>
1140
	</span>
1145
	</span>
1141
    </xsl:if>
1146
    </xsl:if>
1142
    <xsl:if test="marc:datafield[@tag=242]">
1147
    <xsl:if test="marc:datafield[@tag=242]">
Lines 1153-1159 Link Here
1153
    <xsl:if test="marc:datafield[@tag=856]">
1158
    <xsl:if test="marc:datafield[@tag=856]">
1154
         <span class="results_summary online_resources">
1159
         <span class="results_summary online_resources">
1155
			   <span class="label">Online access: </span>
1160
			   <span class="label">Online access: </span>
1156
                    <ul>
1161
                    <ul class="resource_list">
1157
                            <xsl:for-each select="marc:datafield[@tag=856]">
1162
                            <xsl:for-each select="marc:datafield[@tag=856]">
1158
                            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
1163
                            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
1159
                            <xsl:if test="$OPACURLOpenInNewWindow='0'">
1164
                            <xsl:if test="$OPACURLOpenInNewWindow='0'">
1160
- 

Return to bug 27613