From 39e659a11c1b2ea274b9cff41f2ec9ba3438f535 Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer@bsz-bw.de>
Date: Mon, 3 Jul 2023 16:19:28 +0000
Subject: [PATCH] Bug 26862: Improve MARC21 530 display on detail pages

This makes some changes to the way we display field 530 in OPAC
and staff interface:

* Adds missing spaces before $u and between repeated $u subfields
* Adds a description/label before the output of the subfields
* Adds display to the staff interface (was OPAC only)
* Adds separators between repeated 530 fields:
  * OPAC: updates mark-up to use the new CSS driven separators
  * Staff interface: adds | with separator class

To test:
* Find or create a records with multiple 530 entries
* Repeat $u with multiple URLs
* Verify display in staff (missing) and OPAC
* Apply patch
* Verify display is improved :D

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Heather Hernandez <heather_hernandez@nps.gov>
---
 .../en/xslt/MARC21slim2intranetDetail.xsl     | 22 +++++++++++
 .../en/xslt/MARC21slim2OPACDetail.xsl         | 39 ++++++++++++-------
 2 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 736ee197a9..c8dd79566d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -1052,6 +1052,28 @@
             </span>
         </xsl:if>
 
+        <!-- 530 -->
+        <xsl:if test="marc:datafield[@tag=530]">
+            <span class="results_summary additionalforms">
+                <span class="label">Available additional physical forms:</span>
+                <xsl:for-each select="marc:datafield[@tag=530]">
+                    <xsl:call-template name="subfieldSelect">
+                        <xsl:with-param name="codes">abcd</xsl:with-param>
+                    </xsl:call-template>
+                    <xsl:if test="marc:subfield[@code='u']">
+                        <xsl:for-each select="marc:subfield[@code='u']">
+                            <xsl:text> </xsl:text>
+                            <a>
+                                <xsl:attribute name="href"><xsl:value-of select="text()"/></xsl:attribute>
+                                <xsl:value-of select="text()"/>
+                            </a>
+                        </xsl:for-each>
+                    </xsl:if>
+                   <xsl:if test="position()!=last()"><span class="separator"><xsl:text> | </xsl:text></span></xsl:if>
+                </xsl:for-each>
+            </span>
+        </xsl:if>
+
         <!-- Content Warning -->
         <xsl:variable name="ContentWarningField" select="marc:sysprefs/marc:syspref[@name='ContentWarningField']"/>
         <xsl:if test="marc:datafield[@tag=$ContentWarningField]">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index bfd0f2565e..629b8e14cf 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -1138,21 +1138,30 @@
 
         <!-- 530 -->
         <xsl:if test="marc:datafield[@tag=530]">
-        <xsl:for-each select="marc:datafield[@tag=530]">
-        <span class="results_summary additionalforms">
-            <xsl:call-template name="subfieldSelect">
-                <xsl:with-param name="codes">abcd</xsl:with-param>
-            </xsl:call-template>
-            <xsl:for-each select="marc:subfield[@code='u']">
-                <a><xsl:attribute name="href"><xsl:value-of select="text()"/></xsl:attribute>
-                <xsl:if test="$OPACURLOpenInNewWindow='1'">
-                    <xsl:attribute name="target">_blank</xsl:attribute>
-                </xsl:if>
-                <xsl:value-of select="text()"/>
-                </a>
-            </xsl:for-each>
-        </span>
-        </xsl:for-each>
+            <span class="results_summary additionalforms">
+                <span class="label">Available additional physical forms:</span>
+                <ul class="resource_list">
+                    <xsl:for-each select="marc:datafield[@tag=530]">
+                        <li>
+                            <xsl:call-template name="subfieldSelect">
+                                <xsl:with-param name="codes">abcd</xsl:with-param>
+                            </xsl:call-template>
+                            <xsl:if test="marc:subfield[@code='u']">
+                                <xsl:for-each select="marc:subfield[@code='u']">
+                                    <xsl:text> </xsl:text>
+                                    <a>
+                                        <xsl:attribute name="href"><xsl:value-of select="text()"/></xsl:attribute>
+                                        <xsl:if test="$OPACURLOpenInNewWindow='1'">
+                                            <xsl:attribute name="target">_blank</xsl:attribute>
+                                        </xsl:if>
+                                        <xsl:value-of select="text()"/>
+                                    </a>
+                                </xsl:for-each>
+                            </xsl:if>
+                        </li>
+                    </xsl:for-each>
+                </ul>
+            </span>
         </xsl:if>
 
         <!-- 505 - Formatted contents note -->
-- 
2.30.2