From f44d2cccc75c614ec6f030c465d9f1d8800317d5 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer@bsz-bw.de>
Date: Wed, 21 Aug 2024 17:16:27 +0000
Subject: [PATCH] Revert "Bug 36111: 856$h should not appear as a link in
 detailed record"

This reverts commit 24e1e2de243c89b0a274a0158dcdc2c8328ef6af.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 .../en/xslt/MARC21slim2intranetDetail.xsl     |  8 ++---
 .../en/xslt/MARC21slim2intranetResults.xsl    |  6 ++--
 .../en/xslt/MARC21slim2OPACDetail.xsl         | 20 ++++-------
 .../en/xslt/MARC21slim2OPACResults.xsl        | 35 ++++++++-----------
 4 files changed, 26 insertions(+), 43 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index d6f5fb1964..36b01059b0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -921,10 +921,8 @@
     </xsl:if>
 
     <xsl:if test="marc:datafield[@tag=856]">
-        <xsl:if test="marc:datafield[@tag=856]/marc:subfield[@code='u']">
-        <span class="results_summary online_resources">
-                <span class="label">Online resources: </span>
-        <xsl:for-each select="marc:datafield[@tag=856 and marc:subfield[@code='u']]">
+        <span class="results_summary online_resources"><span class="label">Online resources: </span>
+        <xsl:for-each select="marc:datafield[@tag=856]">
             <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
             <a>
                 <xsl:attribute name="href">
@@ -960,9 +958,9 @@
                 <xsl:when test="position()=last()"><xsl:text>  </xsl:text></xsl:when>
                 <xsl:otherwise> | </xsl:otherwise>
             </xsl:choose>
+
         </xsl:for-each>
         </span>
-        </xsl:if>
     </xsl:if>
 
         <!-- 505 - Formatted contents note -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
index 5dbecdd6bc..16a423e421 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl
@@ -978,10 +978,9 @@
     </xsl:call-template>
 
     <xsl:if test="marc:datafield[@tag=856]">
-        <xsl:if test="marc:datafield[@tag=856]/marc:subfield[@code='u']">
         <span class="results_summary online_resources">
-                <span class="label">Online resources: </span>
-            <xsl:for-each select="marc:datafield[@tag=856 and marc:subfield[@code='u']]">
+            <span class="label">Online resources: </span>
+            <xsl:for-each select="marc:datafield[@tag=856]">
                 <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
                 <a>
                     <xsl:attribute name="href">
@@ -1019,7 +1018,6 @@
                 </xsl:choose>
             </xsl:for-each>
         </span>
-        </xsl:if>
     </xsl:if>
 
     <!-- Content Warning -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index a6527ec2ad..515f954345 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -1038,11 +1038,10 @@
 
     <!-- Image processing code added here, takes precedence over text links including y3z text   -->
     <xsl:if test="marc:datafield[@tag=856]">
-        <xsl:if test="marc:datafield[@tag=856]/marc:subfield[@code='u']">
         <span class="results_summary online_resources">
-                <span class="label">Online resources: </span>
+            <span class="label">Online resources: </span>
                 <ul class="resource_list">
-                    <xsl:for-each select="marc:datafield[@tag=856 and marc:subfield[@code='u']]">
+                    <xsl:for-each select="marc:datafield[@tag=856]">
                         <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
                         <li>
                             <a property="url">
@@ -1076,23 +1075,18 @@
                                             <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'])">
-                                        <xsl:choose>
-                                            <xsl:when test="$URLLinkText!=''">
-                                                <xsl:value-of select="$URLLinkText"/>
-                                            </xsl:when>
-                                            <xsl:otherwise>
-                                                <xsl:text>Click here to access online</xsl:text>
-                                            </xsl:otherwise>
-                                        </xsl:choose>
+                                    <xsl:when test="$URLLinkText!=''">
+                                        <xsl:value-of select="$URLLinkText"/>
                                     </xsl:when>
+                                    <xsl:otherwise>
+                                        <xsl:text>Click here to access online</xsl:text>
+                                    </xsl:otherwise>
                                 </xsl:choose>
                             </a>
                         </li>
                     </xsl:for-each>
                 </ul>
             </span>
-            </xsl:if>
         </xsl:if>
 
         <!--  787 Other Relationship Entry  -->
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
index 0bca5fc0e8..c2ebe9c7d9 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
@@ -1216,13 +1216,13 @@
     </xsl:if>
 
     <xsl:if test="marc:datafield[@tag=856]">
-        <xsl:if test="marc:datafield[@tag=856]/marc:subfield[@code='u']">
          <div class="results_summary online_resources">
                <span class="label">Online resources: </span>
-                            <xsl:for-each select="marc:datafield[@tag=856 and marc:subfield[@code='u']]">
+                    <ul class="resource_list">
+                            <xsl:for-each select="marc:datafield[@tag=856]">
                             <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
                             <xsl:if test="$OPACURLOpenInNewWindow='0'">
-                  <a>
+			      <li><a>
 			      <xsl:choose>
 			        <xsl:when test="$OPACTrackClicks='track'">
                       <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>
@@ -1255,16 +1255,16 @@
 					<xsl:when test="$URLLinkText!=''">
 						<xsl:value-of select="$URLLinkText"/>
 					</xsl:when>
-                    <xsl:otherwise>
-                        <xsl:text>Click here to access online</xsl:text>
-                    </xsl:otherwise>
+					<xsl:otherwise>
+						<xsl:text>Click here to access online</xsl:text>
+					</xsl:otherwise>
 					</xsl:choose>
                                     </xsl:when>
                                     </xsl:choose>
-                                    </a>
+                                    </a></li>
                               </xsl:if>
                             <xsl:if test="$OPACURLOpenInNewWindow='1'">
-                                   <a target='_blank'>
+                                   <li><a target='_blank'>
 				   <xsl:choose>
 				     <xsl:when test="$OPACTrackClicks='track'">
                       <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>
@@ -1274,10 +1274,7 @@
 				     </xsl:when>
 				     <xsl:otherwise>
 		                       <xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute>
-                                <xsl:if test="not(marc:subfield[@code='u'])">
-                                    <xsl:attribute name="style">pointer-events: none; color: #202020;</xsl:attribute>
-                                </xsl:if>
-                     </xsl:otherwise>
+				     </xsl:otherwise>
 				   </xsl:choose>
                                     <xsl:choose>
                                     <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')">
@@ -1293,22 +1290,18 @@
 					<xsl:when test="$URLLinkText!=''">
 						<xsl:value-of select="$URLLinkText"/>
 					</xsl:when>
-                    <xsl:otherwise>
-                        <xsl:text>Click here to access online</xsl:text>
-                    </xsl:otherwise>
+					<xsl:otherwise>
+						<xsl:text>Click here to access online</xsl:text>
+					</xsl:otherwise>
 					</xsl:choose>
                                     </xsl:when>
                                     </xsl:choose>
-                                    </a>
+                                    </a></li>
                               </xsl:if>
-                    <xsl:choose>
-                        <xsl:when test="position()=last()"><xsl:text>  </xsl:text></xsl:when>
-                        <xsl:otherwise> | </xsl:otherwise>
-                    </xsl:choose>
                             </xsl:for-each>
+                            </ul>
                             </div>
                         </xsl:if>
-        </xsl:if>
 
         <!-- Availability line -->
         <div class="results_summary availability">
-- 
2.39.5