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

(-)a/C4/XSLT.pm (-1 / +2 lines)
Lines 189-195 sub XSLTParse4Display { Link Here
189
                              Display856uAsImage OPACDisplay856uAsImage 
189
                              Display856uAsImage OPACDisplay856uAsImage 
190
                              UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
190
                              UseControlNumber IntranetBiblioDefaultView BiblioDefaultView
191
                              singleBranchMode
191
                              singleBranchMode
192
                              AlternateHoldingsField AlternateHoldingsSeparator / )
192
                              AlternateHoldingsField AlternateHoldingsSeparator
193
                              TrackClicks / )
193
    {
194
    {
194
        my $sp = C4::Context->preference( $syspref );
195
        my $sp = C4::Context->preference( $syspref );
195
        next unless defined($sp);
196
        next unless defined($sp);
(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tt (-4 / +4 lines)
Lines 460-475 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
460
        <li>[% IF ( MARCurl.part ) %][% MARCurl.part %]
460
        <li>[% IF ( MARCurl.part ) %][% MARCurl.part %]
461
            <br />[% END %] 
461
            <br />[% END %] 
462
        <!-- here you might do a tmpl_if name="toc" and use greybox or equivalent for table of contents -->
462
        <!-- here you might do a tmpl_if name="toc" and use greybox or equivalent for table of contents -->
463
        
463
464
        [% IF ( MARCurl.OPACurlOpenInNewWindow ) %]
464
        [% IF ( MARCurl.OPACurlOpenInNewWindow ) %]
465
	  [% IF trackclicks == 'track' || trackclicks == 'anonymous' %]
465
	  [% IF trackclicks == 'track' || trackclicks == 'anonymous' %]
466
	    <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]" title="[% MARCurl.MARCURL %]" target="_blank">
466
	    <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]&biblionumber=[% biblionumber | url %]" title="[% MARCurl.MARCURL %]" target="_blank">
467
	  [% ELSE %]
467
	  [% ELSE %]
468
	    <a href="[% MARCurl.MARCURL %]" title="[% MARCurl.MARCURL %]" target="_blank">
468
	    <a href="[% MARCurl.MARCURL %]" title="[% MARCurl.MARCURL %]" target="_blank">
469
	  [% END %]
469
	  [% END %]
470
	[% ELSE %]
470
	[% ELSE %]
471
	  [% IF trackclicks == 'track' || trackclicks == 'anonymous' %]
471
	  [% IF trackclicks == 'track' || trackclicks == 'anonymous' %]
472
	    <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]" title="[% MARCurl.MARCURL %]">
472
	    <a href="/cgi-bin/koha/tracklinks.pl?uri=[% MARCurl.MARCURL |url%]&biblionumber=[% biblionumber | url %]" title="[% MARCurl.MARCURL %]">
473
	  [% ELSE %]
473
	  [% ELSE %]
474
	    <a href="[% MARCurl.MARCURL %]" title="[% MARCurl.MARCURL %]">
474
	    <a href="[% MARCurl.MARCURL %]" title="[% MARCurl.MARCURL %]">
475
	  [% END %]
475
	  [% END %]
Lines 785-791 YAHOO.util.Event.onContentReady("furtherm", function () { Link Here
785
            [% IF ( itemdata_enumchron ) %]<td class="vol_info">[% ITEM_RESULT.enumchron %]</td>[% END %]
785
            [% IF ( itemdata_enumchron ) %]<td class="vol_info">[% ITEM_RESULT.enumchron %]</td>[% END %]
786
          [% IF ( itemdata_uri ) %]<td class="url">
786
          [% IF ( itemdata_uri ) %]<td class="url">
787
	  [% IF trackclicks == 'track' || trackclicks == 'anonymous' %]
787
	  [% IF trackclicks == 'track' || trackclicks == 'anonymous' %]
788
	    <a href="/cgi-bin/koha/tracklinks.pl?uri=[% ITEM_RESULT.uri | url %]"> Link to resource </a>
788
	    <a href="/cgi-bin/koha/tracklinks.pl?uri=[% ITEM_RESULT.uri | url %]&biblionumber=[% biblionumber |url %]&itemnumber=[% ITEM_RESULT.itemnumber | url %]"> Link to resource </a>
789
	  [% ELSE %]
789
	  [% ELSE %]
790
	    <a href="[% ITEM_RESULT.uri %]">[% ITEM_RESULT.uri %]</a>
790
	    <a href="[% ITEM_RESULT.uri %]">[% ITEM_RESULT.uri %]</a>
791
	  [% END %]
791
	  [% END %]
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl (-1 / +14 lines)
Lines 26-31 Link Here
26
    <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
26
    <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/>
27
    <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
27
    <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/>
28
    <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
28
    <xsl:variable name="Show856uAsImage" select="marc:sysprefs/marc:syspref[@name='OPACDisplay856uAsImage']"/>
29
    <xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/>
30
    <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
29
    <xsl:variable name="TracingQuotesLeft">
31
    <xsl:variable name="TracingQuotesLeft">
30
      <xsl:choose>
32
      <xsl:choose>
31
        <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
33
        <xsl:when test="marc:sysprefs/marc:syspref[@name='UseICU']='1'">{</xsl:when>
Lines 525-531 Link Here
525
        <span class="results_summary online_resources"><span class="label">Online Resources: </span>
527
        <span class="results_summary online_resources"><span class="label">Online Resources: </span>
526
        <xsl:for-each select="marc:datafield[@tag=856]">
528
        <xsl:for-each select="marc:datafield[@tag=856]">
527
            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
529
            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
528
            <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
530
	    <a>
531
	    <xsl:choose>
532
	      <xsl:when test="$OPACTrackClicks='track'">
533
	        <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="marc:subfield[@code='u']"/>;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
534
	      </xsl:when>
535
	      <xsl:when test="$OPACTrackClicks='anonymous'">
536
	        <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="marc:subfield[@code='u']"/>;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
537
	      </xsl:when>
538
	      <xsl:otherwise>
539
                <xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
540
	      </xsl:otherwise>
541
	    </xsl:choose>
529
            <xsl:if test="$OPACURLOpenInNewWindow='1'">
542
            <xsl:if test="$OPACURLOpenInNewWindow='1'">
530
                <xsl:attribute name="target">_blank</xsl:attribute>
543
                <xsl:attribute name="target">_blank</xsl:attribute>
531
            </xsl:if>
544
            </xsl:if>
(-)a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl (-3 / +25 lines)
Lines 28-33 Link Here
28
    <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
28
    <xsl:variable name="AlternateHoldingsSubfields" select="substring(marc:sysprefs/marc:syspref[@name='AlternateHoldingsField'], 4)"/>
29
    <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
29
    <xsl:variable name="AlternateHoldingsSeparator" select="marc:sysprefs/marc:syspref[@name='AlternateHoldingsSeparator']"/>
30
    <xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>
30
    <xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/>
31
    <xsl:variable name="OPACTrackClicks" select="marc:sysprefs/marc:syspref[@name='TrackClicks']"/>
31
        <xsl:variable name="leader" select="marc:leader"/>
32
        <xsl:variable name="leader" select="marc:leader"/>
32
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
33
        <xsl:variable name="leader6" select="substring($leader,7,1)"/>
33
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
34
        <xsl:variable name="leader7" select="substring($leader,8,1)"/>
Lines 949-955 Link Here
949
                            <xsl:for-each select="marc:datafield[@tag=856]">
950
                            <xsl:for-each select="marc:datafield[@tag=856]">
950
                            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
951
                            <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
951
                            <xsl:if test="$OPACURLOpenInNewWindow='0'">
952
                            <xsl:if test="$OPACURLOpenInNewWindow='0'">
952
                                   <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
953
			      <a>
954
			      <xsl:choose>
955
			        <xsl:when test="$OPACTrackClicks='track'">
956
				  <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="marc:subfield[@code='u']"/>;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
957
				</xsl:when>
958
	                        <xsl:when test="$OPACTrackClicks='anonymous'">
959
		                  <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="marc:subfield[@code='u']"/>;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
960
				</xsl:when>
961
				<xsl:otherwise>
962
				  <xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
963
				</xsl:otherwise>
964
			      </xsl:choose>
953
                                    <xsl:choose>
965
                                    <xsl:choose>
954
                                     <xsl:when test="($Show856uAsImage='Results' 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')">
966
                                     <xsl:when test="($Show856uAsImage='Results' 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')">
955
                                        <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="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
967
                                        <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="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
Lines 973-979 Link Here
973
                                    </a>
985
                                    </a>
974
                              </xsl:if>
986
                              </xsl:if>
975
                            <xsl:if test="$OPACURLOpenInNewWindow='1'">
987
                            <xsl:if test="$OPACURLOpenInNewWindow='1'">
976
                                   <a target='_blank'><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
988
                                   <a target='_blank'>
989
				   <xsl:choose>
990
				     <xsl:when test="$OPACTrackClicks='track'">
991
				       <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="marc:subfield[@code='u']"/>;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
992
				     </xsl:when>
993
				     <xsl:when test="$OPACTrackClicks='anonymous'">
994
				       <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="marc:subfield[@code='u']"/>;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute>
995
				     </xsl:when>
996
				     <xsl:otherwise>
997
		                       <xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
998
				     </xsl:otherwise>
999
				   </xsl:choose>
977
                                    <xsl:choose>
1000
                                    <xsl:choose>
978
                                    <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and ($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')">
1001
                                    <xsl:when test="($Show856uAsImage='Results' or $Show856uAsImage='Both') and ($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')">
979
                                        <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="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
1002
                                        <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="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text>
980
- 

Return to bug 8917