From d99bbe477732ef9b0dd3eafc3958f6e9a71a1b44 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 <span class="results_summary> 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>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 9db369fb58c1f2795f748e972397f1ecb882ce92)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 03e585ad5f951a3cc2bb684c11b829e5ce854f4c)

Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.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>
-      <strong>Language: </strong>
+    <span class="results_summary language">
+      <span class="label">Language: </span>
       <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>
+    </span>
   </xsl:if>
 
   <xsl:if test="marc:datafield[@tag=102]">
-    <li>
-      <strong>Country: </strong>
+    <span class="results_summary country">
+      <span class="label">Country: </span>
       <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>
+    </span>
   </xsl:if>
 
   <xsl:call-template name="tag_210" />
 
   <xsl:call-template name="tag_215" />
 
-<xsl:if test="marc:controlfield[@tag=009]">
-    <li><strong>Tag 009: </strong>
+  <xsl:if test="marc:controlfield[@tag=009]">
+    <span class="results_summary tag_009">
+      <span class="label">Tag 009: </span>
       <xsl:value-of select="marc:controlfield[@tag=009]"/>
-    </li>
+    </span>
   </xsl:if>
 
   <!-- Build ISBN -->
   <xsl:if test="marc:datafield[@tag=010]/marc:subfield[@code='a']">
-    <li><strong>ISBN: </strong>
+    <span class="results_summary isbn">
+      <span class="label">ISBN: </span>
       <xsl:for-each select="marc:datafield[@tag=010]/marc:subfield[@code='a']">
         <span property="isbn">
           <xsl:value-of select="."/>
@@ -158,13 +166,13 @@
           </xsl:choose>
         </span>
       </xsl:for-each>
-    </li>
+    </span>
   </xsl:if>
 
   <!-- Build ISSN -->
   <xsl:if test="marc:datafield[@tag=011]/marc:subfield[@code='a']">
-    <li>
-    <strong>ISSN: </strong>
+    <span class="results_summary issn">
+      <span class="label">ISSN: </span>
       <xsl:for-each select="marc:datafield[@tag=011]/marc:subfield[@code='a']">
         <span property="issn">
           <xsl:value-of select="."/>
@@ -178,17 +186,18 @@
           </xsl:choose>
         </span>
       </xsl:for-each>
-    </li>
+    </span>
   </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>
-    <strong>Dewey: </strong>
+    <span class="results_summary dewey">
+      <span class="label">Dewey: </span>
       <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>
+    </span>
   </xsl:if>
 
   <xsl:if test="marc:datafield[@tag=686]">
-    <li>
-    <strong>Classification: </strong>
+    <span class="results_summary classification">
+      <span class="label">Classification: </span>
       <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>
+    </span>
   </xsl:if>
 
   <xsl:if test="marc:datafield[@tag=327]">
-    <li>
-      <strong>Contents note: </strong>
+    <span class="results_summary contents">
+      <span class="label">Contents note: </span>
       <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>
+    </span>
   </xsl:if>
 
   <xsl:if test="marc:datafield[@tag=330]">
-    <li>
-      <strong>Abstract: </strong>
+    <span class="results_summary abstract">
+      <span class="label">Abstract: </span>
       <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>
+    </span>
   </xsl:if>
 
   <xsl:if test="marc:datafield[@tag=317]">
-    <li>
-      <strong>Provenance note: </strong>
+    <span class="results_summary provenance">
+      <span class="label">Provenance note: </span>
       <xsl:for-each select="marc:datafield[@tag=317]">
           <xsl:value-of select="marc:subfield[@code='a']"/>
       </xsl:for-each>
-    </li>
+    </span>
   </xsl:if>
 
   <xsl:if test="marc:datafield[@tag=320]">
-    <li>
-      <strong>Bibliography: </strong>
+    <span class="results_summary bibliography">
+      <span class="label">Bibliography: </span>
       <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>
+    </span>
   </xsl:if>
 
   <xsl:if test="marc:datafield[@tag=328]">
-    <li>
-      <strong>Thesis: </strong>
+    <span class="results_summary thesis">
+      <span class="label">Thesis: </span>
       <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>
+    </span>
   </xsl:if>
 
   <xsl:if test="marc:datafield[@tag=333]">
-    <li>
-      <strong>Audience: </strong>
+    <span class="results_summary audience">
+      <span class="label">Audience: </span>
       <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>
+    </span>
   </xsl:if>
 
   <xsl:if test="marc:datafield[@tag=955]">
-    <li>
-      <strong>SUDOC serial history: </strong>
+    <span class="results_summary sudoc_serial_history">
+      <span class="label">SUDOC serial history: </span>
       <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>
+    </span>
   </xsl:if>
 
   <xsl:call-template name="tag_subject">
@@ -359,8 +368,8 @@
   </xsl:call-template>
 
   <xsl:if test="marc:datafield[@tag=856]">
-    <li>
-      <strong>Online Resources: </strong>
+    <span class="results_summary online_resources">
+      <span class="label">Online Resources:</span>
       <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>
+    </span>
   </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>
-      <strong>Publication: </strong>
+    <span class="results_summary publication">
+      <span class="label">Publication: </span>
       <xsl:for-each select="marc:datafield[@tag=210]">
         <span>
           <xsl:call-template name="addClassRtl" />
@@ -55,13 +55,13 @@
           </xsl:if>
         </span>
       </xsl:for-each>
-    </li>
+    </span>
   </xsl:template>
 
-	<xsl:template name="tag_215">
+  <xsl:template name="tag_215">
     <xsl:for-each select="marc:datafield[@tag=215]">
-      <li>
-        <strong>Description: </strong>
+      <span class="results_summary description">
+        <span class="label">Description: </span>
         <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>
+      </span>
     </xsl:for-each>
   </xsl:template>
 
 	<xsl:template name="tag_4xx">
     <xsl:for-each select="marc:datafield[@tag=464 or @tag=461]">
-        <li>
-        <strong>Linked with: </strong>
-        <span>
+      <span class="results_summary linked_with">
+        <span class="label">Linked with: </span>
+        <span class="value">
           <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>
         </span>
-      </li>
+      </span>
     </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>
-        <strong><xsl:value-of select="$label"/>: </strong>
+      <span class="results_summary {$spanclass}">
+        <span class="label">
+          <xsl:value-of select="$label"/>
+          <xsl:text>: </xsl:text>
+        </span>
         <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>
+      </span>
     </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>
-        <strong><xsl:value-of select="$label"/>: </strong>
+      <span class="results_summary subjects {$spanclass}">
+        <span class="label">
+          <xsl:value-of select="$label"/>
+          <xsl:text>: </xsl:text>
+        </span>
         <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>
+      </span>
     </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>
-        <strong><xsl:value-of select="$label" />: </strong>
-        <xsl:for-each select="marc:datafield[@tag=$tag]">
-          <span>
+      <span class="results_summary author {$spanclass}">
+        <span class="label">
+          <xsl:value-of select="$label" />
+          <xsl:text>: </xsl:text>
+        </span>
+        <span class="value">
+          <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>
-          </span>
-          <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>
+        </span>
+      </span>
     </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]">
-	  <span class="results_summary country">
+    <span class="results_summary country">
       <span class="label">Country: </span>
       <xsl:for-each select="marc:datafield[@tag=102]">
         <xsl:for-each select="marc:subfield">
@@ -192,7 +192,8 @@
 
   <!-- Build ISBN -->
   <xsl:if test="marc:datafield[@tag=010]/marc:subfield[@code='a']">
-    <span class="results_summary isbn"><span class="label">ISBN: </span>
+    <span class="results_summary isbn">
+      <span class="label">ISBN: </span>
       <xsl:for-each select="marc:datafield[@tag=010]/marc:subfield[@code='a']">
         <span property="isbn">
           <xsl:value-of select="."/>
@@ -211,7 +212,8 @@
 
   <!-- Build ISSN -->
   <xsl:if test="marc:datafield[@tag=011]/marc:subfield[@code='a']">
-    <span class="results_summary issn"><span class="label">ISSN: </span>
+    <span class="results_summary issn">
+      <span class="label">ISSN: </span>
       <xsl:for-each select="marc:datafield[@tag=011]/marc:subfield[@code='a']">
         <span property="issn">
           <xsl:value-of select="."/>
@@ -236,7 +238,7 @@
 
   <xsl:if test="marc:datafield[@tag=676]">
     <span class="results_summary dewey">
-    <span class="label">Dewey: </span>
+      <span class="label">Dewey: </span>
       <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]">
     <span class="results_summary classification">
-    <span class="label">Classification: </span>
+      <span class="label">Classification: </span>
       <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]">
       <span class="results_summary {$spanclass}">
         <span class="label">
-        <xsl:value-of select="$label"/>: </span>
+          <xsl:value-of select="$label"/>
+          <xsl:text>: </xsl:text>
+        </span>
         <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]">
-	  <span class="results_summary description">
+      <span class="results_summary description">
         <span class="label">Description: </span>
         <xsl:if test="marc:subfield[@code='a']">
           <xsl:value-of select="marc:subfield[@code='a']"/>
-- 
2.39.5