Attachment 110028 Details for Bug 19616 – Bug 19616: (follow-up) Reindent XSLT code used for 505 display

[patch] Bug 19616: (follow-up) Reindent XSLT code used for 505 display

Bug-19616-follow-up-Reindent-XSLT-code-used-for-50.patch (text/plain), 5.40 KB, created by Katrin Fischer on 2020-09-13 22:47:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-09-13 22:47:53 UTC

Size: 5.40 KB

patch

obsolete

>From 3c0dd0540a83dee7f866b82a13345046bea04049 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Sun, 13 Sep 2020 16:31:13 +0000
>Subject: [PATCH] Bug 19616: (follow-up) Reindent XSLT code used for 505
> display
>
>Also adds a note at the beginning of the code block.
>This causes no functional change, just code clean-up.
>---
> .../prog/en/xslt/MARC21slim2intranetDetail.xsl     | 19 ++++---
> .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    | 64 +++++++++++-----------
> 2 files changed, 42 insertions(+), 41 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>index 9a76807a62..be898a7b98 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
>@@ -1016,18 +1016,19 @@
>         </span>
>     </xsl:if>
> 
>+        
>         <xsl:if test="marc:datafield[@tag=505]">
>             <div class="results_summary contents">
>             <xsl:choose>
>-            <xsl:when test="marc:datafield[@tag=505]/@ind1=0">
>-                <span class="label">Contents:</span>
>-            </xsl:when>
>-            <xsl:when test="marc:datafield[@tag=505]/@ind1=1">
>-                <span class="label">Incomplete contents:</span>
>-            </xsl:when>
>-            <xsl:when test="marc:datafield[@tag=505]/@ind1=2">
>-                <span class="label">Partial contents:</span>
>-            </xsl:when>
>+                <xsl:when test="marc:datafield[@tag=505]/@ind1=0">
>+                    <span class="label">Contents:</span>
>+                </xsl:when>
>+                <xsl:when test="marc:datafield[@tag=505]/@ind1=1">
>+                    <span class="label">Incomplete contents:</span>
>+                </xsl:when>
>+                <xsl:when test="marc:datafield[@tag=505]/@ind1=2">
>+                    <span class="label">Partial contents:</span>
>+                </xsl:when>
>             </xsl:choose>
>                 <xsl:for-each select="marc:datafield[@tag=505]">
>                     <div class='contentblock'>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>index ab3844a1ff..fa63abf147 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
>@@ -1097,39 +1097,39 @@
>         </xsl:for-each>
>         </xsl:if>
> 
>-        
>+        
>         <xsl:if test="marc:datafield[@tag=505]">
>-        <div class="results_summary contents">
>-        <xsl:for-each select="marc:datafield[@tag=505]">
>-        <xsl:if test="position()=1">
>-            <xsl:choose>
>-            <xsl:when test="@ind1=1">
>-                <span class="label">Incomplete contents:</span>
>-            </xsl:when>
>-            <xsl:when test="@ind1=2">
>-                <span class="label">Partial contents:</span>
>-            </xsl:when>
>-            <xsl:otherwise>
>-                <span class="label">Contents:</span>
>-            </xsl:otherwise>
>-            </xsl:choose>
>-        </xsl:if>
>-        <div class='contentblock' property='description'>
>-        <xsl:choose>
>-        <xsl:when test="@ind2=0">
>-            <xsl:call-template name="subfieldSelectSpan">
>-                <xsl:with-param name="codes">trug</xsl:with-param>
>-            </xsl:call-template>
>-        </xsl:when>
>-        <xsl:otherwise>
>-            <xsl:call-template name="subfieldSelectSpan">
>-                <xsl:with-param name="codes">atrug</xsl:with-param>
>-            </xsl:call-template>
>-        </xsl:otherwise>
>-        </xsl:choose>
>-        </div>
>-        </xsl:for-each>
>-        </div>
>+            <div class="results_summary contents">
>+                <xsl:for-each select="marc:datafield[@tag=505]">
>+                    <xsl:if test="position()=1">
>+                        <xsl:choose>
>+                        <xsl:when test="@ind1=1">
>+                            <span class="label">Incomplete contents:</span>
>+                        </xsl:when>
>+                        <xsl:when test="@ind1=2">
>+                            <span class="label">Partial contents:</span>
>+                        </xsl:when>
>+                        <xsl:otherwise>
>+                            <span class="label">Contents:</span>
>+                        </xsl:otherwise>
>+                        </xsl:choose>
>+                    </xsl:if>
>+                    <div class='contentblock' property='description'>
>+                        <xsl:choose>
>+                            <xsl:when test="@ind2=0">
>+                                <xsl:call-template name="subfieldSelectSpan">
>+                                    <xsl:with-param name="codes">trug</xsl:with-param>
>+                                </xsl:call-template>
>+                            </xsl:when>
>+                            <xsl:otherwise>
>+                                <xsl:call-template name="subfieldSelectSpan">
>+                                    <xsl:with-param name="codes">atrug</xsl:with-param>
>+                                </xsl:call-template>
>+                            </xsl:otherwise>
>+                        </xsl:choose>
>+                    </div>
>+                </xsl:for-each>
>+            </div>
>         </xsl:if>
> 
>         
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 19616: 82798 | 110027 | 110028 | 110029 | 110215 | 110216 | 110217 | 111353 | 111354 | 111355