From 6b658950a56562a7c9c618c9a068f24f1537f0aa Mon Sep 17 00:00:00 2001
From: Katrin Fischer <katrin.fischer.83@web.de>
Date: Sun, 13 Sep 2020 15:06:46 +0000
Subject: [PATCH] Bug 15437: (follow-up) Move $i subfield display to the
 beginning and add OPAC

This patch builds on Caitlin's to finish the work but keeping as
much from her code as possible.

- Finishes reindenting started in first patch
- Readds a space after the label
- Moves $i to the beginning of the field as suggested by MARC21
  documentation:
  http://www.loc.gov/marc/bibliographic/bd76x78x.html
  The data in subfield $i can be displayed preceding the other
  data contained in the field.
- Adds a span with a class around the $i so people can control
  the formatting

To test:
  - Catalog a record with 780/785 with and without $i.
  - Verify that they display nicely in staff and OPAC, $i should show.
    Also $a and $t will show (unchanged by this patch)

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     | 229 ++++++++++----------
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl    | 234 +++++++++++----------
 2 files changed, 244 insertions(+), 219 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 115901f278..15ec22fd7c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -1242,125 +1242,134 @@
 
         <!-- 780 -->
         <xsl:if test="marc:datafield[@tag=780]">
-           <xsl:for-each select="marc:datafield[@tag=780]">
-              <xsl:if test="@ind1=0">
-                 <span class="results_summary preceeding_entry">
-                 <xsl:choose>
-                    <xsl:when test="@ind2=0">
-                       <span class="label">Continues:</span>
-                    </xsl:when>
-                    <xsl:when test="@ind2=1">
-                       <span class="label">Continues in part:</span>
-                    </xsl:when>
-                    <xsl:when test="@ind2=2">
-                       <span class="label">Supersedes:</span>
-                    </xsl:when>
-                    <xsl:when test="@ind2=3">
-                       <span class="label">Supersedes in part:</span>
-                    </xsl:when>
-                    <xsl:when test="@ind2=4">
-                       <span class="label">Formed by the union: ... and: ...</span>
-                    </xsl:when>
-                    <xsl:when test="@ind2=5">
-                       <span class="label">Absorbed:</span>
-                    </xsl:when>
-                    <xsl:when test="@ind2=6">
-                       <span class="label">Absorbed in part:</span>
-                    </xsl:when>
-                    <xsl:when test="@ind2=7">
-                       <span class="label">Separated from:</span>
-                    </xsl:when>
-                </xsl:choose>
-                <xsl:variable name="f780">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">a_t</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:variable>
-            <xsl:choose>
-                <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
-                    <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
-                        <xsl:value-of select="$f780"/>
-                    </a>
-                </xsl:when>
-                <xsl:otherwise>
-                    <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f780, '()', ''), true())"/></xsl:attribute>
-                        <xsl:value-of select="$f780"/>
-                    </a>
-                </xsl:otherwise>
-            </xsl:choose>
-        </span>
- 
-        <xsl:if test="marc:subfield[@code='i']">
-            <span class="results_summary"><xsl:value-of select="marc:subfield[@code='i']"/></span>
-         </xsl:if>
+            <xsl:for-each select="marc:datafield[@tag=780]">
+                <xsl:if test="@ind1=0">
+                    <span class="results_summary preceeding_entry">
+                        <xsl:choose>
+                            <xsl:when test="@ind2=0">
+                               <span class="label">Continues:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=1">
+                               <span class="label">Continues in part:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=2">
+                               <span class="label">Supersedes:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=3">
+                               <span class="label">Supersedes in part:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=4">
+                               <span class="label">Formed by the union: ... and: ...</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=5">
+                               <span class="label">Absorbed:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=6">
+                               <span class="label">Absorbed in part:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=7">
+                               <span class="label">Separated from:</span>
+                            </xsl:when>
+                        </xsl:choose>
+                        <xsl:text> </xsl:text>
 
-        <xsl:if test="marc:subfield[@code='n']">
-            <span class="results_summary preceeding_entry_note"><xsl:value-of select="marc:subfield[@code='n']"/></span>
-        </xsl:if>
+                        <xsl:if test="marc:subfield[@code='i']">
+                            <span class="780_rel_info">
+                                <xsl:value-of select="marc:subfield[@code='i']"/>
+                                <xsl:text> </xsl:text>
+                            </span>
+                        </xsl:if>
 
-        </xsl:if>
-        </xsl:for-each>
+                        <xsl:variable name="f780">
+                            <xsl:call-template name="subfieldSelect">
+                                <xsl:with-param name="codes">a_t</xsl:with-param>
+                            </xsl:call-template>
+                        </xsl:variable>
+                        <xsl:choose>
+                            <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
+                                <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
+                                    <xsl:value-of select="$f780"/>
+                                </a>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f780, '()', ''), true())"/></xsl:attribute>
+                                    <xsl:value-of select="$f780"/>
+                                </a>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </span>
+                    
+                    <xsl:if test="marc:subfield[@code='n']">
+                        <span class="results_summary preceeding_entry_note"><xsl:value-of select="marc:subfield[@code='n']"/></span>
+                    </xsl:if>
+
+                </xsl:if>
+            </xsl:for-each>
         </xsl:if>
 
         <!-- 785 -->
         <xsl:if test="marc:datafield[@tag=785]">
-        <xsl:for-each select="marc:datafield[@tag=785]">
-        <span class="results_summary succeeding_entry">
-        <xsl:choose>
-        <xsl:when test="@ind2=0">
-            <span class="label">Continued by:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=1">
-            <span class="label">Continued in part by:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=2">
-            <span class="label">Superseded by:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=3">
-            <span class="label">Superseded in part by:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=4">
-            <span class="label">Absorbed by:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=5">
-            <span class="label">Absorbed in part by:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=6">
-            <span class="label">Split into .. and ...:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=7">
-            <span class="label">Merged with ... to form ...</span>
-        </xsl:when>
-        <xsl:when test="@ind2=8">
-            <span class="label">Changed back to:</span>
-        </xsl:when>
-        </xsl:choose>
-        <xsl:text> </xsl:text>
-                   <xsl:variable name="f785">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">a_t</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:variable>
+            <xsl:for-each select="marc:datafield[@tag=785]">
+                <span class="results_summary succeeding_entry">
+                    <xsl:choose>
+                        <xsl:when test="@ind2=0">
+                            <span class="label">Continued by:</span>
+                        </xsl:when>
+                        <xsl:when test="@ind2=1">
+                            <span class="label">Continued in part by:</span>
+                        </xsl:when>
+                        <xsl:when test="@ind2=2">
+                            <span class="label">Superseded by:</span>
+                        </xsl:when>
+                        <xsl:when test="@ind2=3">
+                            <span class="label">Superseded in part by:</span>
+                        </xsl:when>
+                        <xsl:when test="@ind2=4">
+                            <span class="label">Absorbed by:</span>
+                        </xsl:when>
+                        <xsl:when test="@ind2=5">
+                            <span class="label">Absorbed in part by:</span>
+                        </xsl:when>
+                        <xsl:when test="@ind2=6">
+                            <span class="label">Split into .. and ...:</span>
+                        </xsl:when>
+                        <xsl:when test="@ind2=7">
+                            <span class="label">Merged with ... to form ...</span>
+                        </xsl:when>
+                        <xsl:when test="@ind2=8">
+                            <span class="label">Changed back to:</span>
+                        </xsl:when>
+                    </xsl:choose>
+                    <xsl:text> </xsl:text>
 
-            <xsl:choose>
-                <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
-                    <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
-                        <xsl:value-of select="$f785"/>
-                    </a>
-                </xsl:when>
-                <xsl:otherwise>
-                    <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f785, '()', ''), true())"/></xsl:attribute>
-                        <xsl:value-of select="$f785"/>
-                    </a>
-                </xsl:otherwise>
-            </xsl:choose>
+                    <xsl:if test="marc:subfield[@code='i']">
+                        <span class="785_rel_info">
+                            <xsl:value-of select="marc:subfield[@code='i']"/>
+                            <xsl:text> </xsl:text>
+                        </span>
+                    </xsl:if>
 
-        </span>
-            <xsl:if test="marc:subfield[@code='i']">
-                 <span class="results_summary"><xsl:value-of select="marc:subfield[@code='i']"/></span>
-             </xsl:if>
+                    <xsl:variable name="f785">
+                        <xsl:call-template name="subfieldSelect">
+                            <xsl:with-param name="codes">a_t</xsl:with-param>
+                        </xsl:call-template>
+                    </xsl:variable>
 
-        </xsl:for-each>
+                    <xsl:choose>
+                        <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
+                            <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
+                                <xsl:value-of select="$f785"/>
+                            </a>
+                        </xsl:when>
+                        <xsl:otherwise>
+                            <a><xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f785, '()', ''), true())"/></xsl:attribute>
+                                <xsl:value-of select="$f785"/>
+                            </a>
+                        </xsl:otherwise>
+                    </xsl:choose>
+
+                </span>
+            </xsl:for-each>
         </xsl:if>
 
         <xsl:if test="$OPACBaseURL!=''">
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index f507ea428e..d4096d666c 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -1353,125 +1353,141 @@
 
         <!-- 780 -->
         <xsl:if test="marc:datafield[@tag=780]">
-        <xsl:for-each select="marc:datafield[@tag=780]">
-        <xsl:if test="@ind1=0">
-        <span class="results_summary preceeding_entry">
-        <xsl:choose>
-        <xsl:when test="@ind2=0">
-            <span class="label">Continues:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=1">
-            <span class="label">Continues in part:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=2">
-            <span class="label">Supersedes:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=3">
-            <span class="label">Supersedes in part:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=4">
-            <span class="label">Formed by the union: ... and: ...</span>
-        </xsl:when>
-        <xsl:when test="@ind2=5">
-            <span class="label">Absorbed:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=6">
-            <span class="label">Absorbed in part:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=7">
-            <span class="label">Separated from:</span>
-        </xsl:when>
-        </xsl:choose>
-        <xsl:text> </xsl:text>
-                <xsl:variable name="f780">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">a_t</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:variable>
-            <xsl:choose>
-                <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
-                    <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
-                        <xsl:value-of select="$f780"/>
-                    </a>
-                </xsl:when>
-                <xsl:otherwise>
-                    <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f780, '()', ''), true())"/></xsl:attribute>
-                        <xsl:value-of select="$f780"/>
-                    </a>
-                </xsl:otherwise>
-            </xsl:choose>
-        </span>
+            <xsl:for-each select="marc:datafield[@tag=780]">
+                <xsl:if test="@ind1=0">
+                    <span class="results_summary preceeding_entry">
+                        <xsl:choose>
+                            <xsl:when test="@ind2=0">
+                                <span class="label">Continues:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=1">
+                                <span class="label">Continues in part:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=2">
+                                <span class="label">Supersedes:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=3">
+                                <span class="label">Supersedes in part:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=4">
+                                <span class="label">Formed by the union: ... and: ...</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=5">
+                                <span class="label">Absorbed:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=6">
+                                <span class="label">Absorbed in part:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=7">
+                                <span class="label">Separated from:</span>
+                            </xsl:when>
+                        </xsl:choose>
+                        <xsl:text> </xsl:text>
 
-        <xsl:if test="marc:subfield[@code='n']">
-            <span class="results_summary preceeding_entry_note"><xsl:value-of select="marc:subfield[@code='n']"/></span>
-        </xsl:if>
+                        <xsl:if test="marc:subfield[@code='i']">
+                            <span class="780_rel_info">
+                                <xsl:value-of select="marc:subfield[@code='i']"/>
+                                    <xsl:text> </xsl:text>
+                            </span>
+                        </xsl:if>
 
-        </xsl:if>
-        </xsl:for-each>
+                        <xsl:variable name="f780">
+                            <xsl:call-template name="subfieldSelect">
+                                <xsl:with-param name="codes">a_t</xsl:with-param>
+                            </xsl:call-template>
+                        </xsl:variable>
+
+                        <xsl:choose>
+                            <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
+                                <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
+                                    <xsl:value-of select="$f780"/>
+                                </a>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f780, '()', ''), true())"/></xsl:attribute>
+                                    <xsl:value-of select="$f780"/>
+                                </a>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </span>
+
+                    <xsl:if test="marc:subfield[@code='n']">
+                        <span class="results_summary preceeding_entry_note"><xsl:value-of select="marc:subfield[@code='n']"/></span>
+                    </xsl:if>
+
+                </xsl:if>
+            </xsl:for-each>
         </xsl:if>
 
         <!-- 785 -->
         <xsl:if test="marc:datafield[@tag=785]">
-        <xsl:for-each select="marc:datafield[@tag=785]">
-        <xsl:if test="@ind1=0">
-        <span class="results_summary succeeding_entry">
-        <xsl:choose>
-        <xsl:when test="@ind2=0">
-            <span class="label">Continued by:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=1">
-            <span class="label">Continued in part by:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=2">
-            <span class="label">Superseded by:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=3">
-            <span class="label">Superseded in part by:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=4">
-            <span class="label">Absorbed by:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=5">
-            <span class="label">Absorbed in part by:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=6">
-            <span class="label">Split into .. and ...:</span>
-        </xsl:when>
-        <xsl:when test="@ind2=7">
-            <span class="label">Merged with ... to form ...</span>
-        </xsl:when>
-        <xsl:when test="@ind2=8">
-            <span class="label">Changed back to:</span>
-        </xsl:when>
-        </xsl:choose>
-        <xsl:text> </xsl:text>
-                   <xsl:variable name="f785">
-                    <xsl:call-template name="subfieldSelect">
-                        <xsl:with-param name="codes">a_t</xsl:with-param>
-                    </xsl:call-template>
-                </xsl:variable>
+            <xsl:for-each select="marc:datafield[@tag=785]">
+                <xsl:if test="@ind1=0">
+                    <span class="results_summary succeeding_entry">
+                        <xsl:choose>
+                            <xsl:when test="@ind2=0">
+                                <span class="label">Continued by:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=1">
+                                <span class="label">Continued in part by:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=2">
+                                <span class="label">Superseded by:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=3">
+                                <span class="label">Superseded in part by:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=4">
+                                <span class="label">Absorbed by:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=5">
+                                <span class="label">Absorbed in part by:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=6">
+                                <span class="label">Split into .. and ...:</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=7">
+                                <span class="label">Merged with ... to form ...</span>
+                            </xsl:when>
+                            <xsl:when test="@ind2=8">
+                                <span class="label">Changed back to:</span>
+                            </xsl:when>
+                        </xsl:choose>
+                        <xsl:text> </xsl:text>
 
-            <xsl:choose>
-                <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
-                    <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
-                        <xsl:value-of select="$f785"/>
-                    </a>
-                </xsl:when>
-                <xsl:otherwise>
-                    <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f785, '()', ''), true())"/></xsl:attribute>
-                        <xsl:value-of select="$f785"/>
-                    </a>
-                </xsl:otherwise>
-            </xsl:choose>
+                        <xsl:if test="marc:subfield[@code='i']">
+                            <span class="785_rel_info">
+                                <xsl:value-of select="marc:subfield[@code='i']"/>
+                                <xsl:text> </xsl:text>
+                            </span>
+                        </xsl:if>
 
-        </span>
+                        <xsl:variable name="f785">
+                            <xsl:call-template name="subfieldSelect">
+                                <xsl:with-param name="codes">a_t</xsl:with-param>
+                            </xsl:call-template>
+                        </xsl:variable>
 
-        <xsl:if test="marc:subfield[@code='n']">
-            <span class="results_summary succeeding_entry_note"><xsl:value-of select="marc:subfield[@code='n']"/></span>
-        </xsl:if>
+                        <xsl:choose>
+                            <xsl:when test="$UseControlNumber = '1' and marc:subfield[@code='w']">
+                                <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=Control-number:<xsl:call-template name="extractControlNumber"><xsl:with-param name="subfieldW" select="marc:subfield[@code='w']"/></xsl:call-template></xsl:attribute>
+                                    <xsl:value-of select="$f785"/>
+                                </a>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="str:encode-uri(translate($f785, '()', ''), true())"/></xsl:attribute>
+                                    <xsl:value-of select="$f785"/>
+                                </a>
+                            </xsl:otherwise>
+                        </xsl:choose>
+                    </span>
 
-        </xsl:if>
-        </xsl:for-each>
+                    <xsl:if test="marc:subfield[@code='n']">
+                        <span class="results_summary succeeding_entry_note"><xsl:value-of select="marc:subfield[@code='n']"/></span>
+                    </xsl:if>
+
+                </xsl:if>
+            </xsl:for-each>
         </xsl:if>
 
         <!-- OpenURL -->
-- 
2.11.0