From 65de22a6ef928bd6074e9a4d6a1e1351d0e1de9b Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Thu, 27 Sep 2018 19:49:27 +0200
Subject: [PATCH] Bug 20986: (follow-up) Avoid br tags, but allow for line
 breaks to be added easily with CSS

This patch removes the br tags from the XSLT in favor of some more
spans and classes.

This will allow to add the line breaks with one line of CSS:
span.holdings_note_data { display:block; }

Signed-off-by: Liz Rea <wizzyrea@gmail.com>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 .../en/xslt/MARC21slim2intranetDetail.xsl     | 36 +++++++++++--------
 .../en/xslt/MARC21slim2OPACDetail.xsl         | 36 +++++++++++--------
 2 files changed, 42 insertions(+), 30 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 54f7124d6f..da88114133 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -1065,36 +1065,42 @@
 
         <!-- 866 textual holdings -->
         <xsl:if test="marc:datafield[@tag=866]">
-            <span class="results_summary holdings_note"><span class="label">Holdings: </span><br />
+            <span class="results_summary holdings_note basic_bibliographic_unit"><span class="label">Holdings: </span>
                 <xsl:for-each select="marc:datafield[@tag=866]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">axz</xsl:with-param>
-                    </xsl:call-template>
-                    <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text><br /></xsl:otherwise></xsl:choose>
+                    <span class="holdings_note_data">
+                        <xsl:call-template name="subfieldSelect">
+                            <xsl:with-param name="codes">axz</xsl:with-param>
+                        </xsl:call-template>
+                        <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+                    </span>
                 </xsl:for-each>
             </span>
         </xsl:if>
 
         <!-- 867 textual holdings -->
         <xsl:if test="marc:datafield[@tag=867]">
-            <span class="results_summary holdings_note"><span class="label">Supplements: </span><br />
+            <span class="results_summary holdings_note supplementary_material"><span class="label">Supplements: </span>
                 <xsl:for-each select="marc:datafield[@tag=867]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">axz</xsl:with-param>
-                    </xsl:call-template>
-                    <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text><br /></xsl:otherwise></xsl:choose>
+                    <span class="holdings_note_data">
+                        <xsl:call-template name="subfieldSelect">
+                            <xsl:with-param name="codes">axz</xsl:with-param>
+                        </xsl:call-template>
+                        <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+                    </span>
                 </xsl:for-each>
             </span>
         </xsl:if>
 
         <!-- 868 textual holdings -->
         <xsl:if test="marc:datafield[@tag=868]">
-            <span class="results_summary holdings_note"><span class="label">Indexes: </span><br />
+            <span class="results_summary holdings_note indexes"><span class="label">Indexes: </span>
                 <xsl:for-each select="marc:datafield[@tag=868]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">axz</xsl:with-param>
-                    </xsl:call-template>
-                    <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text><br /></xsl:otherwise></xsl:choose>
+                    <span class="holdings_note_data">
+                        <xsl:call-template name="subfieldSelect">
+                            <xsl:with-param name="codes">axz</xsl:with-param>
+                        </xsl:call-template>
+                        <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text><br /></xsl:otherwise></xsl:choose>
+                    </span>
                 </xsl:for-each>
             </span>
         </xsl:if>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index 741e4609fa..0fac4586a8 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -1201,36 +1201,42 @@
 
         <!-- 866 textual holdings -->
         <xsl:if test="marc:datafield[@tag=866]">
-            <span class="results_summary holdings_note"><span class="label">Holdings: </span> <br />
+            <span class="results_summary holdings_note basic_bibliographic_unit"><span class="label">Holdings: </span>
                 <xsl:for-each select="marc:datafield[@tag=866]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">az</xsl:with-param>
-                    </xsl:call-template>
-                    <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text><br /></xsl:otherwise></xsl:choose>
+                    <span class="holdings_note_data">
+                        <xsl:call-template name="subfieldSelect">
+                            <xsl:with-param name="codes">az</xsl:with-param>
+                        </xsl:call-template>
+                        <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+                    </span>
                 </xsl:for-each>
             </span>
         </xsl:if>
 
         <!-- 867 textual holdings -->
         <xsl:if test="marc:datafield[@tag=867]">
-            <span class="results_summary holdings_note"><span class="label">Supplements: </span> <br />
+            <span class="results_summary holdings_note supplementary_material"><span class="label">Supplements: </span>
                 <xsl:for-each select="marc:datafield[@tag=867]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">az</xsl:with-param>
-                    </xsl:call-template>
-                    <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text><br /></xsl:otherwise></xsl:choose>
+                    <span class="holdings_note_data">
+                        <xsl:call-template name="subfieldSelect">
+                            <xsl:with-param name="codes">az</xsl:with-param>
+                        </xsl:call-template>
+                        <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+                    </span>
                 </xsl:for-each>
             </span>
         </xsl:if>
 
         <!-- 868 textual holdings -->
         <xsl:if test="marc:datafield[@tag=868]">
-            <span class="results_summary holdings_note"><span class="label">Indexes: </span> <br />
+            <span class="results_summary holdings_note indexes"><span class="label">Indexes: </span>
                 <xsl:for-each select="marc:datafield[@tag=868]">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">az</xsl:with-param>
-                    </xsl:call-template>
-                    <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text><br /></xsl:otherwise></xsl:choose>
+                    <span class="holdings_note_data">
+                        <xsl:call-template name="subfieldSelect">
+                            <xsl:with-param name="codes">az</xsl:with-param>
+                        </xsl:call-template>
+                        <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text><br /></xsl:otherwise></xsl:choose>
+                    </span>
                 </xsl:for-each>
             </span>
         </xsl:if>
-- 
2.20.1