Attachment 110248 Details for Bug 26049 – Bug 26049: Replace li with span class results_summary in UNIMARC intranet XSLT

[patch] Bug 26049: Replace li with span class results_summary in UNIMARC intranet XSLT

Bug-26049-Replace-li-with-span-class-resultssummar.patch (text/plain), 20.23 KB, created by Martin Renvoize (ashimema) on 2020-09-17 08:18:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-09-17 08:18:35 UTC

Size: 20.23 KB

patch

obsolete

>From d1ac0865323cd65794576a3873f8bf03e86c6a79 Mon Sep 17 00:00:00 2001
>From: Fridolin Somers <fridolin.somers@biblibre.com>
>Date: Thu, 23 Jul 2020 10:21:36 +0200
>Subject: [PATCH] Bug 26049: Replace li with span class results_summary in
> UNIMARC intranet XSLT
>
>In all XSLT for record display, fields are created with except in UNIMARC intranet where there is just <li>.
>
>This allows a better CSS customisation and closer code in files for OPAC and intranet.
>
>Actually li gets diplayed with a dot at each line, we don't want this.
>
>Test plan :
>1) For each modified file run 'xsltproc file.xsl' and see there is no
> error
>2) Use default XSLT in all system preferences
>3) Perform a search and check display with and without patch
>4) Click on a record to see details and check display with and without patch
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../en/xslt/UNIMARCslim2intranetDetail.xsl | 99 ++++++++++---------
> .../prog/en/xslt/UNIMARCslimUtils.xsl | 80 +++++++++------
> .../en/xslt/UNIMARCslim2OPACDetail.xsl | 12 ++-
> .../bootstrap/en/xslt/UNIMARCslimUtils.xsl | 6 +-
> 4 files changed, 114 insertions(+), 83 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
>index 5f6e2b1782..45561123a9 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslim2intranetDetail.xsl
>@@ -57,36 +57,42 @@
> <xsl:call-template name="tag_7xx">
> <xsl:with-param name="tag">700</xsl:with-param>
> <xsl:with-param name="label">Main Author</xsl:with-param>
>+ <xsl:with-param name="spanclass">main_author</xsl:with-param>
> </xsl:call-template>
> 
> <xsl:call-template name="tag_7xx">
> <xsl:with-param name="tag">710</xsl:with-param>
> <xsl:with-param name="label">Corporate Author (Main)</xsl:with-param>
>+ <xsl:with-param name="spanclass">corporate_main_author</xsl:with-param>
> </xsl:call-template>
> 
> <xsl:call-template name="tag_7xx">
> <xsl:with-param name="tag">701</xsl:with-param>
> <xsl:with-param name="label">Coauthor</xsl:with-param>
>+ <xsl:with-param name="spanclass">coauthor</xsl:with-param>
> </xsl:call-template>
> 
> <xsl:call-template name="tag_7xx">
> <xsl:with-param name="tag">702</xsl:with-param>
> <xsl:with-param name="label">Secondary Author</xsl:with-param>
>+ <xsl:with-param name="spanclass">secondary_author</xsl:with-param>
> </xsl:call-template>
> 
> <xsl:call-template name="tag_7xx">
> <xsl:with-param name="tag">711</xsl:with-param>
> <xsl:with-param name="label">Corporate Author (Coauthor)</xsl:with-param>
>+ <xsl:with-param name="spanclass">corporate_coauthor</xsl:with-param>
> </xsl:call-template>
> 
> <xsl:call-template name="tag_7xx">
> <xsl:with-param name="tag">712</xsl:with-param>
> <xsl:with-param name="label">Corporate Author (Secondary)</xsl:with-param>
>+ <xsl:with-param name="spanclass">corporate_secondary_author</xsl:with-param>
> </xsl:call-template>
> 
> <xsl:if test="marc:datafield[@tag=101]">
>- <li>
>- Language: 
>+ 
>+ Language: 
> <xsl:for-each select="marc:datafield[@tag=101]">
> <xsl:for-each select="marc:subfield">
> <xsl:choose>
>@@ -98,7 +104,7 @@
> <xsl:when test="@code='g'">of title proper, </xsl:when>
> <xsl:when test="@code='h'">of libretto, </xsl:when>
> <xsl:when test="@code='i'">of accompanying material, </xsl:when>
>- <xsl:when test="@code='j'">of subtitles, </xsl:when>n>
>+ <xsl:when test="@code='j'">of subtitles, </xsl:when>
> </xsl:choose>
> <xsl:value-of select="text()"/>
> <xsl:choose>
>@@ -111,12 +117,12 @@
> </xsl:choose>
> </xsl:for-each>
> </xsl:for-each>
>- </li>
>+ 
> </xsl:if>
> 
> <xsl:if test="marc:datafield[@tag=102]">
>- <li>
>- Country: 
>+ 
>+ Country: 
> <xsl:for-each select="marc:datafield[@tag=102]">
> <xsl:for-each select="marc:subfield">
> <xsl:value-of select="text()"/>
>@@ -129,22 +135,24 @@
> </xsl:choose>
> </xsl:for-each>
> </xsl:for-each>
>- </li>
>+ 
> </xsl:if>
> 
> <xsl:call-template name="tag_210" />
> 
> <xsl:call-template name="tag_215" />
> 
>-<xsl:if test="marc:controlfield[@tag=009]">
>- <li>Tag 009: 
>+ <xsl:if test="marc:controlfield[@tag=009]">
>+ 
>+ Tag 009: 
> <xsl:value-of select="marc:controlfield[@tag=009]"/>
>- </li>
>+ 
> </xsl:if>
> 
> 
> <xsl:if test="marc:datafield[@tag=010]/marc:subfield[@code='a']">
>- <li>ISBN: 
>+ 
>+ ISBN: 
> <xsl:for-each select="marc:datafield[@tag=010]/marc:subfield[@code='a']">
> 
> <xsl:value-of select="."/>
>@@ -158,13 +166,13 @@
> </xsl:choose>
> 
> </xsl:for-each>
>- </li>
>+ 
> </xsl:if>
> 
> 
> <xsl:if test="marc:datafield[@tag=011]/marc:subfield[@code='a']">
>- <li>
>- ISSN: 
>+ 
>+ ISSN: 
> <xsl:for-each select="marc:datafield[@tag=011]/marc:subfield[@code='a']">
> 
> <xsl:value-of select="."/>
>@@ -178,17 +186,18 @@
> </xsl:choose>
> 
> </xsl:for-each>
>- </li>
>+ 
> </xsl:if>
> 
> <xsl:call-template name="tag_title">
> <xsl:with-param name="tag">225</xsl:with-param>
> <xsl:with-param name="label">Series</xsl:with-param>
>+ <xsl:with-param name="spanclass">series</xsl:with-param>
> </xsl:call-template>
> 
> <xsl:if test="marc:datafield[@tag=676]">
>- <li>
>- Dewey: 
>+ 
>+ Dewey: 
> <xsl:for-each select="marc:datafield[@tag=676]">
> <xsl:value-of select="marc:subfield[@code='a']"/>
> <xsl:if test="marc:subfield[@code='v']">
>@@ -203,12 +212,12 @@
> <xsl:text> ; </xsl:text>
> </xsl:if>
> </xsl:for-each>
>- </li>
>+ 
> </xsl:if>
> 
> <xsl:if test="marc:datafield[@tag=686]">
>- <li>
>- Classification: 
>+ 
>+ Classification: 
> <xsl:for-each select="marc:datafield[@tag=686]">
> <xsl:value-of select="marc:subfield[@code='a']"/>
> <xsl:if test="marc:subfield[@code='b']">
>@@ -221,12 +230,12 @@
> </xsl:if>
> <xsl:if test="not (position()=last())"><xsl:text> ; </xsl:text></xsl:if>
> </xsl:for-each>
>- </li>
>+ 
> </xsl:if>
> 
> <xsl:if test="marc:datafield[@tag=327]">
>- <li>
>- Contents note: 
>+ 
>+ Contents note: 
> <xsl:for-each select="marc:datafield[@tag=327]">
> <xsl:call-template name="chopPunctuation">
> <xsl:with-param name="chopString">
>@@ -238,12 +247,12 @@
> </xsl:with-param>
> </xsl:call-template>
> </xsl:for-each>
>- </li>
>+ 
> </xsl:if>
> 
> <xsl:if test="marc:datafield[@tag=330]">
>- <li>
>- Abstract: 
>+ 
>+ Abstract: 
> <xsl:for-each select="marc:datafield[@tag=330]">
> <xsl:value-of select="marc:subfield[@code='a']"/>
> <xsl:choose>
>@@ -255,57 +264,57 @@
> </xsl:otherwise>
> </xsl:choose>
> </xsl:for-each>
>- </li>
>+ 
> </xsl:if>
> 
> <xsl:if test="marc:datafield[@tag=317]">
>- <li>
>- Provenance note: 
>+ 
>+ Provenance note: 
> <xsl:for-each select="marc:datafield[@tag=317]">
> <xsl:value-of select="marc:subfield[@code='a']"/>
> </xsl:for-each>
>- </li>
>+ 
> </xsl:if>
> 
> <xsl:if test="marc:datafield[@tag=320]">
>- <li>
>- Bibliography: 
>+ 
>+ Bibliography: 
> <xsl:for-each select="marc:datafield[@tag=320]">
> <xsl:value-of select="marc:subfield[@code='a']"/>
> <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>
>- </li>
>+ 
> </xsl:if>
> 
> <xsl:if test="marc:datafield[@tag=328]">
>- <li>
>- Thesis: 
>+ 
>+ Thesis: 
> <xsl:for-each select="marc:datafield[@tag=328]">
> <xsl:value-of select="marc:subfield[@code='a']"/>
> <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>
>- </li>
>+ 
> </xsl:if>
> 
> <xsl:if test="marc:datafield[@tag=333]">
>- <li>
>- Audience: 
>+ 
>+ Audience: 
> <xsl:for-each select="marc:datafield[@tag=333]">
> <xsl:value-of select="marc:subfield[@code='a']"/>
> <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>
>- </li>
>+ 
> </xsl:if>
> 
> <xsl:if test="marc:datafield[@tag=955]">
>- <li>
>- SUDOC serial history: 
>+ 
>+ SUDOC serial history: 
> <xsl:for-each select="marc:datafield[@tag=955]">
> <xsl:value-of select="marc:subfield[@code='9']"/>:
> <xsl:value-of select="marc:subfield[@code='r']"/>
> <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>
>- </li>
>+ 
> </xsl:if>
> 
> <xsl:call-template name="tag_subject">
>@@ -359,8 +368,8 @@
> </xsl:call-template>
> 
> <xsl:if test="marc:datafield[@tag=856]">
>- <li>
>- Online Resources: 
>+ 
>+ Online Resources:
> <xsl:for-each select="marc:datafield[@tag=856]">
> <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>
> <a>
>@@ -386,7 +395,7 @@
> <xsl:otherwise> | </xsl:otherwise>
> </xsl:choose>
> </xsl:for-each>
>- </li>
>+ 
> </xsl:if>
> </xsl:template>
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
>index 0c4cf0f4a4..a2f17b4034 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/UNIMARCslimUtils.xsl
>@@ -29,8 +29,8 @@
> </xsl:template>
> 
> <xsl:template name="tag_210">
>- <li>
>- Publication: 
>+ 
>+ Publication: 
> <xsl:for-each select="marc:datafield[@tag=210]">
> 
> <xsl:call-template name="addClassRtl" />
>@@ -55,13 +55,13 @@
> </xsl:if>
> 
> </xsl:for-each>
>- </li>
>+ 
> </xsl:template>
> 
>-	<xsl:template name="tag_215">
>+ <xsl:template name="tag_215">
> <xsl:for-each select="marc:datafield[@tag=215]">
>- <li>
>- Description: 
>+ 
>+ Description: 
> <xsl:if test="marc:subfield[@code='a']">
> <xsl:value-of select="marc:subfield[@code='a']"/>
> </xsl:if>
>@@ -74,15 +74,15 @@
> <xsl:if test="marc:subfield[@code='e']"> +
> <xsl:value-of select="marc:subfield[@code='e']"/>
> </xsl:if>
>- </li>
>+ 
> </xsl:for-each>
> </xsl:template>
> 
> 	<xsl:template name="tag_4xx">
> <xsl:for-each select="marc:datafield[@tag=464 or @tag=461]">
>- <li>
>- Linked with: 
>- 
>+ 
>+ Linked with: 
>+ 
> <xsl:call-template name="addClassRtl" />
> <xsl:if test="marc:subfield[@code='t']">
> <xsl:value-of select="marc:subfield[@code='t']"/>
>@@ -97,7 +97,7 @@
> <xsl:value-of select="marc:subfield[@code='v']"/>
> </xsl:if>
> 
>- </li>
>+ 
> </xsl:for-each>
> </xsl:template>
> 
>@@ -194,9 +194,13 @@
> <xsl:template name="tag_title">
> <xsl:param name="tag" />
> <xsl:param name="label" />
>+ <xsl:param name="spanclass" />
> <xsl:if test="marc:datafield[@tag=$tag]">
>- <li>
>- <xsl:value-of select="$label"/>: 
>+ 
>+ 
>+ <xsl:value-of select="$label"/>
>+ <xsl:text>: </xsl:text>
>+ 
> <xsl:for-each select="marc:datafield[@tag=$tag]">
> <xsl:value-of select="marc:subfield[@code='a']" />
> <xsl:if test="marc:subfield[@code='d']">
>@@ -234,17 +238,20 @@
> <xsl:value-of select="marc:subfield[@code='z']"/>
> </xsl:if>
> </xsl:for-each>
>- </li>
>+ 
> </xsl:if>
> </xsl:template>
> 
>-
> <xsl:template name="tag_subject">
> <xsl:param name="tag" />
> <xsl:param name="label" />
>+ <xsl:param name="spanclass"/>
> <xsl:if test="marc:datafield[@tag=$tag]">
>- <li>
>- <xsl:value-of select="$label"/>: 
>+ 
>+ 
>+ <xsl:value-of select="$label"/>
>+ <xsl:text>: </xsl:text>
>+ 
> <xsl:for-each select="marc:datafield[@tag=$tag]">
> <a>
> <xsl:choose>
>@@ -269,27 +276,38 @@
> <xsl:text> | </xsl:text>
> </xsl:if>
> </xsl:for-each>
>- </li>
>+ 
> </xsl:if>
> </xsl:template>
> 
>-
> <xsl:template name="tag_7xx">
> <xsl:param name="tag" />
> <xsl:param name="label" />
>+ <xsl:param name="spanclass" />
> <xsl:if test="marc:datafield[@tag=$tag]">
>- <li>
>- <xsl:value-of select="$label" />: 
>- <xsl:for-each select="marc:datafield[@tag=$tag]">
>- 
>+ 
>+ 
>+ <xsl:value-of select="$label" />
>+ <xsl:text>: </xsl:text>
>+ 
>+ 
>+ <xsl:for-each select="marc:datafield[@tag=$tag]">
> <xsl:call-template name="addClassRtl" />
> <a>
> <xsl:choose>
> <xsl:when test="marc:subfield[@code=9]">
>- <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/></xsl:attribute>
>+ <xsl:attribute name="href">
>+ <xsl:text>/cgi-bin/koha/catalogue/search.pl?q=an:</xsl:text>
>+ <xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/>
>+ </xsl:attribute>
> </xsl:when>
> <xsl:otherwise>
>- <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:<xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/><xsl:text> </xsl:text><xsl:value-of select="marc:subfield[@code='b']"/></xsl:attribute>
>+ <xsl:attribute name="href">
>+ <xsl:text>/cgi-bin/koha/catalogue/search.pl?q=au:</xsl:text>
>+ <xsl:value-of select="str:encode-uri(marc:subfield[@code='a'], true())"/>
>+ <xsl:text>%20</xsl:text>
>+ <xsl:value-of select="str:encode-uri(marc:subfield[@code='b'], true())"/>
>+ </xsl:attribute>
> </xsl:otherwise>
> </xsl:choose>
> <xsl:if test="marc:subfield[@code='a']">
>@@ -323,12 +341,12 @@
> <xsl:value-of select="marc:subfield[@code='p']"/>
> </xsl:if>
> </a>
>- 
>- <xsl:if test="not (position() = last())">
>- <xsl:text> ; </xsl:text>
>- </xsl:if>
>- </xsl:for-each>
>- </li>
>+ <xsl:if test="not (position() = last())">
>+ <xsl:text> ; </xsl:text>
>+ </xsl:if>
>+ </xsl:for-each>
>+ 
>+ 
> </xsl:if>
> </xsl:template>
> 
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl
>index 5186823762..0a508e6a4e 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl
>@@ -163,7 +163,7 @@
> </xsl:if>
> 
> <xsl:if test="marc:datafield[@tag=102]">
>-	 
>+ 
> Country: 
> <xsl:for-each select="marc:datafield[@tag=102]">
> <xsl:for-each select="marc:subfield">
>@@ -192,7 +192,8 @@
> 
> 
> <xsl:if test="marc:datafield[@tag=010]/marc:subfield[@code='a']">
>- ISBN: 
>+ 
>+ ISBN: 
> <xsl:for-each select="marc:datafield[@tag=010]/marc:subfield[@code='a']">
> 
> <xsl:value-of select="."/>
>@@ -211,7 +212,8 @@
> 
> 
> <xsl:if test="marc:datafield[@tag=011]/marc:subfield[@code='a']">
>- ISSN: 
>+ 
>+ ISSN: 
> <xsl:for-each select="marc:datafield[@tag=011]/marc:subfield[@code='a']">
> 
> <xsl:value-of select="."/>
>@@ -236,7 +238,7 @@
> 
> <xsl:if test="marc:datafield[@tag=676]">
> 
>- Dewey: 
>+ Dewey: 
> <xsl:for-each select="marc:datafield[@tag=676]">
> <xsl:value-of select="marc:subfield[@code='a']"/>
> <xsl:if test="marc:subfield[@code='v']">
>@@ -256,7 +258,7 @@
> 
> <xsl:if test="marc:datafield[@tag=686]">
> 
>- Classification: 
>+ Classification: 
> <xsl:for-each select="marc:datafield[@tag=686]">
> <xsl:value-of select="marc:subfield[@code='a']"/>
> <xsl:if test="marc:subfield[@code='b']">
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl
>index b14b93fdba..7e13c0333b 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl
>@@ -115,7 +115,9 @@
> <xsl:if test="marc:datafield[@tag=$tag]">
> 
> 
>- <xsl:value-of select="$label"/>: 
>+ <xsl:value-of select="$label"/>
>+ <xsl:text>: </xsl:text>
>+ 
> <xsl:for-each select="marc:datafield[@tag=$tag]">
> <xsl:call-template name="addClassRtl" />
> <xsl:for-each select="marc:subfield">
>@@ -219,7 +221,7 @@
> 
> <xsl:template name="tag_215">
> <xsl:for-each select="marc:datafield[@tag=215]">
>-	 
>+ 
> Description: 
> <xsl:if test="marc:subfield[@code='a']">
> <xsl:value-of select="marc:subfield[@code='a']"/>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 26049: 107223 | 110020 | 110248