Bug 15594: (QA follow-up) Move span to publisher name, fix whitespace, only add space...

[srvgit] / koha-tmpl / intranet-tmpl / prog / en / xslt / MARC21slim2intranetDetail.xsl

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index 6983988..656cd45 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -283,43 +283,37 @@
             <xsl:when test="marc:datafield[@tag=260]">
                 <span class="results_summary publisher"><span class="label">Publication details: </span>
                     <xsl:for-each select="marc:datafield[@tag=260]">
-                        <xsl:for-each select="marc:subfield[@code='a']">
-                            <a>
-                                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=pl:"<xsl:value-of select="str:encode-uri(., true())"/>"</xsl:attribute>
-                                <xsl:value-of select="."/>
-                            </a>
-                            <xsl:if test="position() != last()">
-                                <xsl:text> </xsl:text>
+                        <xsl:for-each select="marc:subfield">
+                            <xsl:if test="@code='a'">
+                                <a>
+                                    <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=pl:"<xsl:value-of select="str:encode-uri(current(), true())"/>"</xsl:attribute>
+                                    <xsl:value-of select="current()"/>
+                                </a>
+                            </xsl:if>
+                            <xsl:if test="@code='b'">
+                                <a>
+                                    <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Provider:"<xsl:value-of select="str:encode-uri(current(), true())"/>"</xsl:attribute>
+                                    <xsl:value-of select="current()"/>
+                                </a>
+                            </xsl:if>
+                            <xsl:if test="@code='c'">
+                                <a>
+                                    <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=copydate:"<xsl:value-of select="str:encode-uri(current(), true())"/>"</xsl:attribute>
+                                    <xsl:value-of select="current()"/>
+                                </a>
+                            </xsl:if>
+                            <xsl:if test="@code='g'">
+                                <xsl:call-template name="chopPunctuation">
+                                   <xsl:with-param name="chopString">
+                                      <xsl:value-of select="current()"/>
+                                   </xsl:with-param>
+                                </xsl:call-template>
                             </xsl:if>
-                        </xsl:for-each>
-                        <xsl:text> </xsl:text>
-                        <xsl:if test="marc:subfield[@code='b']">
-                        <a>
-                            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=Provider:"<xsl:value-of select="str:encode-uri(marc:subfield[@code='b'], true())"/>"</xsl:attribute>
-                            <xsl:call-template name="subfieldSelect">
-                                <xsl:with-param name="codes">b</xsl:with-param>
-                            </xsl:call-template>
-                        </a>
-                        </xsl:if>
-                        <xsl:text> </xsl:text>
-                        <xsl:for-each select="marc:subfield[@code='c']">
-                            <a>
-                                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=copydate:"<xsl:value-of select="str:encode-uri(., true())"/>"</xsl:attribute>
-                                <xsl:value-of select="."/>
-                            </a>
                             <xsl:if test="position() != last()">
                                 <xsl:text> </xsl:text>
                             </xsl:if>
                         </xsl:for-each>
-                        <xsl:text> </xsl:text>
-                        <xsl:call-template name="chopPunctuation">
-                          <xsl:with-param name="chopString">
-                            <xsl:call-template name="subfieldSelect">
-                                <xsl:with-param name="codes">g</xsl:with-param>
-                            </xsl:call-template>
-                           </xsl:with-param>
-                       </xsl:call-template>
-                            <xsl:choose><xsl:when test="position()=last()"><xsl:text></xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
+                        <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>
                 </span>
             </xsl:when>
@@ -688,11 +682,9 @@
                 <xsl:text> </xsl:text>
                 <a class='authlink'>
                     <xsl:attribute name="href">/cgi-bin/koha/authorities/detail.pl?authid=<xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/></xsl:attribute>
-                    <xsl:element name="img">
-                        <xsl:attribute name="src">/intranet-tmpl/prog/img/filefind.png</xsl:attribute>
-                        <xsl:attribute name="alt"></xsl:attribute>
-                        <xsl:attribute name="height">15</xsl:attribute>
-                        <xsl:attribute name="width">15</xsl:attribute>
+                    <xsl:element name="i">
+                        <xsl:attribute name="class">fa fa-search</xsl:attribute>
+                        <xsl:attribute name="aria-label">View authority record</xsl:attribute>
                     </xsl:element>
                 </a>
             </xsl:if>
@@ -740,11 +732,9 @@
                         <xsl:text> </xsl:text>
                         <a class='authlink'>
                             <xsl:attribute name="href">/cgi-bin/koha/authorities/detail.pl?authid=<xsl:value-of select="str:encode-uri(marc:subfield[@code=9], true())"/></xsl:attribute>
-                            <xsl:element name="img">
-                                <xsl:attribute name="src">/intranet-tmpl/prog/img/filefind.png</xsl:attribute>
-                                <xsl:attribute name="alt"></xsl:attribute>
-                                <xsl:attribute name="height">15</xsl:attribute>
-                                <xsl:attribute name="width">15</xsl:attribute>
+                            <xsl:element name="i">
+                                <xsl:attribute name="class">fa fa-search</xsl:attribute>
+                                <xsl:attribute name="aria-label">View authority record</xsl:attribute>
                             </xsl:element>
                         </a>
                     </xsl:if>