Attachment 79551 Details for Bug 20986 – Bug 20986: (follow-up) Avoid br tags, but allow for line breaks to be added easily with CSS

[patch] Bug 20986: (follow-up) Avoid br tags, but allow for line breaks to be added easily with CSS

Bug-20986-follow-up-Avoid-br-tags-but-allow-for-li.patch (text/plain), 8.66 KB, created by Katrin Fischer on 2018-09-27 20:39:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2018-09-27 20:39:37 UTC

Size: 8.66 KB

patch

obsolete

>From 02678af5eecf5b0ec3b6e48639cfbd6ca4dfde6a 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; }
>---
> .../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 c7c53e8e1a..88682d7b8b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>@@ -995,36 +995,42 @@
> 
> 
> <xsl:if test="marc:datafield[@tag=866]">
>- Holdings: 
>+ Holdings: 
> <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> </xsl:otherwise></xsl:choose>
>+ 
>+ <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>
>+ 
> </xsl:for-each>
> 
> </xsl:if>
> 
> 
> <xsl:if test="marc:datafield[@tag=867]">
>- Supplements: 
>+ Supplements: 
> <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> </xsl:otherwise></xsl:choose>
>+ 
>+ <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>
>+ 
> </xsl:for-each>
> 
> </xsl:if>
> 
> 
> <xsl:if test="marc:datafield[@tag=868]">
>- Indexes: 
>+ Indexes: 
> <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> </xsl:otherwise></xsl:choose>
>+ 
>+ <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>
>+ 
> </xsl:for-each>
> 
> </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 0080bf5009..13acb3ead0 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>@@ -1128,36 +1128,42 @@
> 
> 
> <xsl:if test="marc:datafield[@tag=866]">
>- Holdings: 
>+ Holdings: 
> <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> </xsl:otherwise></xsl:choose>
>+ 
>+ <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>
>+ 
> </xsl:for-each>
> 
> </xsl:if>
> 
> 
> <xsl:if test="marc:datafield[@tag=867]">
>- Supplements: 
>+ Supplements: 
> <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> </xsl:otherwise></xsl:choose>
>+ 
>+ <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>
>+ 
> </xsl:for-each>
> 
> </xsl:if>
> 
> 
> <xsl:if test="marc:datafield[@tag=868]">
>- Indexes: 
>+ Indexes: 
> <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> </xsl:otherwise></xsl:choose>
>+ 
>+ <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>
>+ 
> </xsl:for-each>
> 
> </xsl:if>
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 20986: 76316 | 78861 | 79550 | 79551 | 88095 | 88096 | 89605 | 89606