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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt (-5 / +7 lines)
Lines 1-7 Link Here
1
[% INCLUDE 'doc-head-open.inc' %]
1
[% INCLUDE 'doc-head-open.inc' %]
2
<title>Koha &rsaquo; Catalog &rsaquo; [% IF ( searchdesc ) %]Results of Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title>
2
<title>Koha &rsaquo; Catalog &rsaquo; [% IF ( searchdesc ) %]Results of Search [% IF ( query_desc ) %]for '[% query_desc | html %]'[% END %][% IF ( limit_desc ) %]&nbsp;with limit(s):&nbsp;'[% limit_desc | html %]'[% END %][% ELSE %]You did not specify any search criteria[% END %]</title>
3
[% INCLUDE 'doc-head-close.inc' %]
3
[% INCLUDE 'doc-head-close.inc' %]
4
<script type="text/javascript" src="/intranet-tmpl/prog/en/lib/jquery/plugins/jquery.highlight-3.js"></script>
5
<script type="text/javascript">
4
<script type="text/javascript">
6
//<![CDATA[
5
//<![CDATA[
7
var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
6
var MSG_NO_ITEM_SELECTED = _("Nothing is selected.");
Lines 86-91 $(".addtocart").show(); Link Here
86
    $("#selection_ops").show();
85
    $("#selection_ops").show();
87
    $(".selection").show();
86
    $(".selection").show();
88
    [% IF ( query_desc ) %]
87
    [% IF ( query_desc ) %]
88
    toHighlight = $("p,span.results_summary,a.title");
89
        var query_desc = "[% query_desc |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]";
89
        var query_desc = "[% query_desc |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]";
90
        q_array = query_desc.split(" ");
90
        q_array = query_desc.split(" ");
91
        highlightOn();
91
        highlightOn();
Lines 94-110 $(".addtocart").show(); Link Here
94
    [% END %]
94
    [% END %]
95
});
95
});
96
96
97
function highlightOff() {
97
98
    $("p").removeHighlight();
98
[% IF ( query_desc ) %]function highlightOff() {
99
    toHighlight.removeHighlight();
99
    $(".highlight_toggle").toggle();
100
    $(".highlight_toggle").toggle();
100
}
101
}
101
function highlightOn() {
102
function highlightOn() {
102
    var x;
103
    var x;
103
    for (x in q_array) {
104
    for (x in q_array) {
104
        $("p").highlight(q_array[x]);
105
        toHighlight.highlight(q_array[x]);
105
    }
106
    }
106
    $(".highlight_toggle").toggle();
107
    $(".highlight_toggle").toggle();
107
}
108
}[% END %]
108
109
109
function selectAll () {
110
function selectAll () {
110
    $(".selection").attr("checked", "checked");
111
    $(".selection").attr("checked", "checked");
Lines 454-459 YAHOO.util.Event.onContentReady("searchheader", function () { Link Here
454
                            </td>
455
                            </td>
455
                            <td>
456
                            <td>
456
			    [% IF ( SEARCH_RESULT.XSLTResultsRecord ) %]
457
			    [% IF ( SEARCH_RESULT.XSLTResultsRecord ) %]
458
                [% SEARCH_RESULT.result_number %].
457
				[% SEARCH_RESULT.XSLTResultsRecord %]
459
				[% SEARCH_RESULT.XSLTResultsRecord %]
458
			    [% ELSE %]
460
			    [% ELSE %]
459
                                <p>[% SEARCH_RESULT.result_number %].
461
                                <p>[% SEARCH_RESULT.result_number %].
(-)a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl (-159 / +85 lines)
Lines 21-27 Link Here
21
21
22
    <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
22
    <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/>
23
    <xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/>
23
    <xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/>
24
    <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
24
    <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='Display856uAsImage']"/>
25
    <xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/>
25
    <xsl:variable name="AlternateHoldingsField" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 1, 3)"/>
26
    <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
26
    <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
27
    <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
27
    <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
Lines 30-36 Link Here
30
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
30
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
31
        <xsl:variable name="leader19" select="substring($leader,20,1)"/>
31
        <xsl:variable name="leader19" select="substring($leader,20,1)"/>
32
        <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
32
        <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
33
        <xsl:variable name="isbn" select="marc:datafield[@tag=020]/marc:subfield[@code='a']"/>
34
        <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
33
        <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
35
        <xsl:variable name="typeOf008">
34
        <xsl:variable name="typeOf008">
36
            <xsl:choose>
35
            <xsl:choose>
Lines 324-330 Link Here
324
        </xsl:for-each>
323
        </xsl:for-each>
325
        </xsl:if>
324
        </xsl:if>
326
    </a>
325
    </a>
327
    <p>
328
326
329
    <!-- Author Statement: Alternate Graphic Representation (MARC 880) -->
327
    <!-- Author Statement: Alternate Graphic Representation (MARC 880) -->
330
    <xsl:if test="$display880">
328
    <xsl:if test="$display880">
Lines 336-398 Link Here
336
334
337
    <xsl:choose>
335
    <xsl:choose>
338
    <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
336
    <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
337
    <p class="author">by
338
    <xsl:for-each select="marc:datafield[@tag=100 or @tag=700]">
339
    <a>
340
    <xsl:choose>
341
        <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
342
            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
343
        </xsl:when>
344
        <xsl:otherwise>
345
        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>
346
        </xsl:otherwise>
347
    </xsl:choose>
348
    <xsl:call-template name="nameABCDQ"/></a>
349
    <xsl:choose>
350
    <xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
351
    </xsl:for-each>
339
352
340
    by <span class="author">
353
    <xsl:for-each select="marc:datafield[@tag=110 or @tag=710]">
341
        <xsl:for-each select="marc:datafield[@tag=100 or @tag=700]">
354
    <a>
342
            <xsl:choose>
355
    <xsl:choose>
343
            <xsl:when test="position()=last()">
356
        <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
344
                <xsl:call-template name="nameABCDQ"/>.
357
            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
345
            </xsl:when>
358
        </xsl:when>
346
            <xsl:otherwise>
359
        <xsl:otherwise>
347
                <xsl:call-template name="nameABCDQ"/>;
360
        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>
348
            </xsl:otherwise>
361
        </xsl:otherwise>
349
            </xsl:choose>
362
    </xsl:choose>
350
        </xsl:for-each>
363
    <xsl:call-template name="nameABCDN"/></a>
364
    <xsl:choose><xsl:when test="position()=last()"><xsl:text> </xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
365
    </xsl:for-each>
351
366
352
        <xsl:for-each select="marc:datafield[@tag=110 or @tag=710]">
367
    <xsl:for-each select="marc:datafield[@tag=111 or @tag=711]">
353
            <xsl:choose>
368
        <xsl:choose>
354
            <xsl:when test="position()=1">
369
        <xsl:when test="marc:subfield[@code='n']">
355
		<xsl:text> -- </xsl:text>
370
           <xsl:text> </xsl:text>
356
            </xsl:when>
371
           <xsl:call-template name="subfieldSelect">
357
            </xsl:choose>
372
              <xsl:with-param name="codes">n</xsl:with-param>                              </xsl:call-template>
358
            <xsl:choose>
373
           <xsl:text> </xsl:text>
359
            <xsl:when test="position()=last()">
374
        </xsl:when>
360
                <xsl:call-template name="nameABCDN"/>
375
        </xsl:choose>
361
            </xsl:when>
376
    <a>
362
            <xsl:otherwise>
377
    <xsl:choose>
363
                <xsl:call-template name="nameABCDN"/>;
378
        <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'">
364
            </xsl:otherwise>
379
            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
365
            </xsl:choose>
380
        </xsl:when>
366
        </xsl:for-each>
381
        <xsl:otherwise>
382
        <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute>
383
        </xsl:otherwise>
384
    </xsl:choose>
385
    <xsl:call-template name="nameACDEQ"/></a>
386
    <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
367
387
368
        <xsl:for-each select="marc:datafield[@tag=111 or @tag=711]">
388
    </xsl:for-each>
369
            <xsl:choose>
389
    </p>
370
            <xsl:when test="position()=1">
371
		<xsl:text> -- </xsl:text>
372
            </xsl:when>
373
            </xsl:choose>
374
            <xsl:choose>
375
            <xsl:when test="marc:subfield[@code='n']">
376
               <xsl:text> </xsl:text>
377
               <xsl:call-template name="subfieldSelect">
378
                  <xsl:with-param name="codes">n</xsl:with-param>
379
               </xsl:call-template>
380
               <xsl:text> </xsl:text>
381
            </xsl:when>
382
            </xsl:choose>
383
            <xsl:choose>
384
            <xsl:when test="position()=last()">
385
                <xsl:call-template name="nameACDEQ"/>.
386
            </xsl:when>
387
            <xsl:otherwise>
388
                <xsl:call-template name="nameACDEQ"/>;
389
            </xsl:otherwise>
390
            </xsl:choose>
391
        </xsl:for-each>
392
    </span>
393
    </xsl:when>
390
    </xsl:when>
394
    </xsl:choose>
391
    </xsl:choose>
395
    </p>
392
393
    <xsl:if test="marc:datafield[@tag=300]">
394
    <span class="results_summary description"><span class="label">Description: </span>
395
        <xsl:for-each select="marc:datafield[@tag=300]">
396
            <xsl:call-template name="chopPunctuation">
397
              <xsl:with-param name="chopString">
398
                <xsl:call-template name="subfieldSelect">
399
                    <xsl:with-param name="codes">abceg</xsl:with-param>
400
                </xsl:call-template>
401
               </xsl:with-param>
402
           </xsl:call-template>
403
                <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
404
        </xsl:for-each>
405
    </span>
406
   </xsl:if>
407
408
    <xsl:if test="marc:datafield[@tag=020]">
409
    <span class="results_summary isbn"><span class="label">ISBN: </span>
410
    <xsl:for-each select="marc:datafield[@tag=020]">
411
    <xsl:variable name="isbn" select="marc:subfield[@code='a']"/>
412
            <xsl:value-of select="marc:subfield[@code='a']"/>
413
            <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
414
    </xsl:for-each>
415
    </span>
416
    </xsl:if>
417
418
    <xsl:if test="marc:datafield[@tag=022]">
419
    <span class="results_summary issn"><span class="label">ISSN: </span>
420
    <xsl:for-each select="marc:datafield[@tag=022]">
421
            <xsl:value-of select="marc:subfield[@code='a']"/>
422
            <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
423
    </xsl:for-each>
424
    </span>
425
    </xsl:if>
396
426
397
    <xsl:if test="marc:datafield[@tag=250]">
427
    <xsl:if test="marc:datafield[@tag=250]">
398
	<span class="results_summary">
428
	<span class="results_summary">
Lines 803-911 Link Here
803
                            </xsl:for-each>
833
                            </xsl:for-each>
804
                            </span>
834
                            </span>
805
                        </xsl:if>
835
                        </xsl:if>
806
                        <span class="results_summary" id="availability">
807
                        <span class="label">Availability: </span>
808
                        <xsl:choose>
809
				   <xsl:when test="count(key('item-by-status', 'available'))=0 and count(key('item-by-status', 'reference'))=0">
810
                        <xsl:choose>
811
                            <xsl:when test="string-length($AlternateHoldingsField)=3 and marc:datafield[@tag=$AlternateHoldingsField]">
812
                            <xsl:variable name="AlternateHoldingsCount" select="count(marc:datafield[@tag=$AlternateHoldingsField])"/>
813
                            <xsl:for-each select="marc:datafield[@tag=$AlternateHoldingsField][1]">
814
                                <xsl:call-template select="marc:datafield[@tag=$AlternateHoldingsField]" name="subfieldSelect">
815
                                    <xsl:with-param name="codes"><xsl:value-of select="$AlternateHoldingsSubfields"/></xsl:with-param>
816
                                    <xsl:with-param name="delimeter"><xsl:value-of select="$AlternateHoldingsSeparator"/></xsl:with-param>
817
                                </xsl:call-template>
818
                            </xsl:for-each>
819
                            (<xsl:value-of select="$AlternateHoldingsCount"/>)
820
                            </xsl:when>
821
                            <xsl:otherwise>No copies available </xsl:otherwise>
822
                        </xsl:choose>
823
				   </xsl:when>
824
                   <xsl:when test="count(key('item-by-status', 'available'))>0">
825
                   <span class="available">
826
                       <b><xsl:text>Copies available for loan: </xsl:text></b>
827
                       <xsl:variable name="available_items"
828
                           select="key('item-by-status', 'available')"/>
829
                       <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
830
                           <xsl:value-of select="items:homebranch"/>
831
						   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
832
                           <xsl:text> (</xsl:text>
833
                           <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/>
834
                           <xsl:text>)</xsl:text>
835
<xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
836
                       </xsl:for-each>
837
                   </span>
838
                   </xsl:when>
839
				   </xsl:choose>
840
841
                   <xsl:choose> <xsl:when test="count(key('item-by-status', 'available'))>0">
842
                       <xsl:choose><xsl:when test="count(key('item-by-status', 'reference'))>0">
843
                            <br/>
844
                       </xsl:when></xsl:choose>
845
                   </xsl:when> </xsl:choose>
846
847
                   <xsl:choose>
848
                   <xsl:when test="count(key('item-by-status', 'reference'))>0">
849
                   <span class="available">
850
                       <b><xsl:text>Copies available for reference: </xsl:text></b>
851
                       <xsl:variable name="reference_items"
852
                           select="key('item-by-status', 'reference')"/>
853
                       <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]">
854
                           <xsl:value-of select="items:homebranch"/>
855
						   <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if>
856
                           <xsl:text> (</xsl:text>
857
                           <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/>
858
                           <xsl:text>)</xsl:text>
859
                   <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose>
860
                       </xsl:for-each>
861
                   </span>
862
                   </xsl:when>
863
                   </xsl:choose>
864
865
                   <xsl:if test="count(key('item-by-status', 'Checked out'))>0">
866
                   <span class="unavailable">
867
                       <xsl:text>Checked out (</xsl:text>
868
                       <xsl:value-of select="count(key('item-by-status', 'Checked out'))"/>
869
                       <xsl:text>). </xsl:text>
870
				   </span>
871
                   </xsl:if>
872
                   <xsl:if test="count(key('item-by-status', 'Withdrawn'))>0">
873
                   <span class="unavailable">
874
                       <xsl:text>Withdrawn (</xsl:text>
875
                       <xsl:value-of select="count(key('item-by-status', 'Withdrawn'))"/>
876
                       <xsl:text>). </xsl:text>                   </span>
877
				   </xsl:if>
878
                    <xsl:if test="$hidelostitems='0' and count(key('item-by-status', 'Lost'))>0">
879
                   <span class="unavailable">
880
                       <xsl:text>Lost (</xsl:text>
881
                       <xsl:value-of select="count(key('item-by-status', 'Lost'))"/>
882
                       <xsl:text>). </xsl:text>                   </span>
883
				   </xsl:if>
884
                    <xsl:if test="count(key('item-by-status', 'Damaged'))>0">
885
                   <span class="unavailable">
886
                       <xsl:text>Damaged (</xsl:text>
887
                       <xsl:value-of select="count(key('item-by-status', 'Damaged'))"/>
888
                       <xsl:text>). </xsl:text>                   </span>
889
                   </xsl:if>
890
                    <xsl:if test="count(key('item-by-status', 'On order'))>0">
891
                   <span class="unavailable">
892
                       <xsl:text>On order (</xsl:text>
893
                       <xsl:value-of select="count(key('item-by-status', 'On order'))"/>
894
                       <xsl:text>). </xsl:text>                   </span>
895
                   </xsl:if>
896
                    <xsl:if test="count(key('item-by-status', 'In transit'))>0">
897
                   <span class="unavailable">
898
                       <xsl:text>In transit (</xsl:text>
899
                       <xsl:value-of select="count(key('item-by-status', 'In transit'))"/>
900
                       <xsl:text>). </xsl:text>                   </span>
901
                   </xsl:if>
902
                    <xsl:if test="count(key('item-by-status', 'Waiting'))>0">
903
                   <span class="unavailable">
904
                       <xsl:text>On hold (</xsl:text>
905
                       <xsl:value-of select="count(key('item-by-status', 'Waiting'))"/>
906
                       <xsl:text>). </xsl:text>                   </span>
907
                   </xsl:if>
908
               </span>
909
    </xsl:template>
836
    </xsl:template>
910
837
911
    <xsl:template name="nameABCDQ">
838
    <xsl:template name="nameABCDQ">
912
- 

Return to bug 6919