From 5bc5fcbbbb88392bb18dd530a48ec370d3350e1f Mon Sep 17 00:00:00 2001
From: Koha Production <koha-pro@koha-01.hclibrary.org>
Date: Sat, 17 May 2008 23:39:26 -0400
Subject: [PATCH] Fix links for web resources to display a 'Click here to
 access online' when no label is specified (XSLT only). Note that on the
 results screen, the links now show up in place of the Availability: section

Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         | 12 ++++++---
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        | 31 ++++++++++++++++++++--
 2 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index ef692a0445..189ee9c88d 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -237,12 +237,18 @@
         <xsl:if test="marc:datafield[@tag=856]">
         <span class="results_summary"><span class="label">Online Resources: </span>
         <xsl:for-each select="marc:datafield[@tag=856]">
-            <a><xsl:attribute name="href"> <xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
-            <xsl:if test="marc:subfield[@code='y' or @code='3' or @code='z']">
+            <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
+	    <xsl:choose>
+            <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
                     <xsl:call-template name="subfieldSelect">
                         <xsl:with-param name="codes">y3z</xsl:with-param>
                     </xsl:call-template>
-            </xsl:if></a>
+            </xsl:when>
+	    <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
+	    Click Here
+	    </xsl:when>
+	    </xsl:choose>
+	    </a>
             <xsl:choose>
             <xsl:when test="position()=last()"></xsl:when>
             <xsl:otherwise> | </xsl:otherwise>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index a261145f81..16362d4667 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -469,7 +469,7 @@
                 </xsl:when>
                 <xsl:when test="$leader6='t'"><img src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="book" title="book"/> Book</xsl:when>
                 <xsl:when test="$leader6='p'"><img src="/opac-tmpl/prog/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials"/>Mixed Materials</xsl:when>
-                <xsl:when test="$leader6='m'"><img src="/opac-tmpl/prog/famfamfam/silk/disk.png" alt="computer file" title="computer file"/> Computer File</xsl:when>
+                <xsl:when test="$leader6='m'"><img src="/opac-tmpl/prog/famfamfam/silk/computer_link.png" alt="computer file" title="computer file"/> Computer File</xsl:when>
                 <xsl:when test="$leader6='e' or $leader6='f'"><img src="/opac-tmpl/prog/famfamfam/silk/map.png" alt="map" title="map"/> Map</xsl:when>
                 <xsl:when test="$leader6='g' or $leader6='k' or $leader6='o' or $leader6='r'"><img src="/opac-tmpl/prog/famfamfam/silk/film.png" alt="visual material" title="visual material"/> Visual Material</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d' or $leader6='i' or $leader6='j'"><img src="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="sound" title="sound"/> Sound</xsl:when>
@@ -793,6 +793,7 @@
             </xsl:choose>
     </xsl:if>
 	</span>
+
     <xsl:if test="marc:datafield[@tag=260]">
 	<span class="results_summary">
     <span class="label">Publisher: </span> 
@@ -803,9 +804,35 @@
             </xsl:for-each>
 	</span>
     </xsl:if>
+
     <span class="results_summary">
 			   <span class="label">Availability: </span>
-			       <xsl:choose>
+			        <xsl:choose>
+                        <xsl:when test="marc:datafield[@tag=856]">
+                            <xsl:for-each select="marc:datafield[@tag=856]">
+                                <xsl:choose>
+                                    <xsl:when test="@ind2=0">
+                                    <a><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
+                                    <xsl:choose>
+                                    <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']">
+                                        <xsl:call-template name="subfieldSelect">                        
+                                        <xsl:with-param name="codes">y3z</xsl:with-param>                    
+                                        </xsl:call-template>
+                                    </xsl:when>
+                                    <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])">
+                                    Click here to access online
+                                    </xsl:when>
+                                    </xsl:choose>
+                                    </a>
+                                    <xsl:choose>
+                                    <xsl:when test="position()=last()"></xsl:when>
+                                    <xsl:otherwise> | </xsl:otherwise>
+                                    </xsl:choose>
+                                    </xsl:when> 
+                                </xsl:choose>
+                            </xsl:for-each>
+                        </xsl:when>
+
 				   <xsl:when test="count(key('item-by-status', 'available'))=0">No copies available
 				   </xsl:when>
                    <xsl:when test="count(key('item-by-status', 'available'))>0">
-- 
2.11.0