From 5c0071a39f331ca89c6ebfa027b91692502b604d Mon Sep 17 00:00:00 2001
From: Lucas Gass <lucas@bywatersolutions.com>
Date: Sun, 12 Dec 2021 23:27:54 +0000
Subject: [PATCH] Bug 27613: (follow-up) add authors and contributors

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss     |  3 ++-
 .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl     |  9 ++++++---
 .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl    | 13 +++++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
index 3b0ac23f29..ea327506d0 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss
@@ -83,6 +83,7 @@ a {
     }
 
     &.title {
+        display: block;
         font-size: 108%;
         font-weight: bold;
     }
@@ -1154,7 +1155,7 @@ div {
 }
 
 .resource_list {
-    display: inline-block;
+    display: inline;
     margin: 0 auto;
     padding-left: 0;
 
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index e6288e8973..4e507a5754 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -1718,6 +1718,10 @@
                     <!--#13382 Changed Additional author to contributor -->
                     <xsl:otherwise>Contributor(s): </xsl:otherwise>
                 </xsl:choose>
+           </xsl:for-each>
+            <ul class="resource_list">
+            <xsl:for-each select="$authorfield">
+            <li>
             <xsl:choose>
                 <xsl:when test="not(@tag=111) or @tag=700 or @tag=710 or @tag=711"/>
                 <xsl:when test="marc:subfield[@code='n']">
@@ -1971,10 +1975,9 @@
                     </xsl:element>
                 </a>
             </xsl:if>
-                <xsl:choose>
-                    <xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
-                </xsl:choose>
+            </li>
             </xsl:for-each>
+        </ul>
         </span>
         </xsl:if>
     </xsl:template>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
index cfb4e4812c..c7f05fd19d 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
@@ -503,7 +503,6 @@
     </xsl:if>
     <!-- End of OpenURL -->
 
-    <p>
     <!-- Author Statement: Alternate Graphic Representation (MARC 880) -->
     <xsl:if test="$display880">
       <xsl:call-template name="m880Select">
@@ -515,9 +514,11 @@
     <xsl:choose>
     <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
 
-        <span class="byAuthor">by </span><span class="author">
+        <span class="byAuthor">by </span>
+        <ul class="author resource_list">
         <!-- #13383 -->
         <xsl:for-each select="marc:datafield[(@tag=100 or @tag=700 or @tag=110 or @tag=710 or @tag=111 or @tag=711) and @ind1!='z']">
+            <li>
             <xsl:call-template name="chopPunctuation">
                 <xsl:with-param name="chopString">
                     <xsl:call-template name="subfieldSelect">
@@ -633,15 +634,11 @@
                     <xsl:text>]</xsl:text>
                 </span>
             </xsl:if>
-            <xsl:choose>
-                <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><span class="separator"><xsl:text> | </xsl:text></span></xsl:otherwise>
-            </xsl:choose>
+            </li>
         </xsl:for-each>
-
-    </span>
+        </ul>
     </xsl:when>
     </xsl:choose>
-    </p>
 
     <xsl:call-template name="show-series">
         <xsl:with-param name="searchurl">/cgi-bin/koha/opac-search.pl</xsl:with-param>
-- 
2.39.5