Bugzilla – Attachment 23972 Details for
Bug 11310
Update XSLT stylesheets in bootstrap theme
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11310: update the XSLT for the Bootstrap theme
Bug-11310-update-the-XSLT-for-the-Bootstrap-theme.patch (text/plain), 75.96 KB, created by
Galen Charlton
on 2014-01-06 17:00:16 UTC
(
hide
)
Description:
Bug 11310: update the XSLT for the Bootstrap theme
Filename:
MIME Type:
Creator:
Galen Charlton
Created:
2014-01-06 17:00:16 UTC
Size:
75.96 KB
patch
obsolete
>From 2032959108a9942f73a27912c006685375851752 Mon Sep 17 00:00:00 2001 >From: Galen Charlton <gmc@esilibrary.com> >Date: Mon, 6 Jan 2014 16:54:19 +0000 >Subject: [PATCH] Bug 11310: update the XSLT for the Bootstrap theme > >When the Bootstrap theme was started, the XSLT directory >was copied over from the prog theme. However, it was not >kept up to date with respect to changes to prog's XSLT. > >This patch rectifies the problem by copying over the >current state of prog/en/xslt to bootstrap/en/xslt. As >a consequence, the following bugs or enhancements should >now be reflected in the Bootstrap theme: > >* 6886 >* 10905 >* 10465 >* 10564 >* 10793 >* 10218 >* 6594 >* 9820 >* 10745 >* 6553 >* 10218 >* 10284 > >To test: > >[1] Apply the patch and ensure that OPACXSLTDetailsDisplay > and OPACXSLTResultsDisplay are set to 'default' and that > OPAC theme is set to 'bootstrap'. >[2] Ensure that OPAC results and bib details look OK. >[3] To be really thorough, run through the test plans for the > other bugs referenced by this patch. > >Signed-off-by: Galen Charlton <gmc@esilibrary.com> >--- > .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 112 +++++++++------ > .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 75 +++++----- > .../bootstrap/en/xslt/MARC21slimUtils.xsl | 8 +- > .../bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl | 34 ++--- > .../bootstrap/en/xslt/NORMARCslim2OPACResults.xsl | 79 +++++------ > .../bootstrap/en/xslt/NORMARCslimUtils.xsl | 4 +- > .../bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl | 143 ++++---------------- > .../bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl | 23 +++- > .../bootstrap/en/xslt/UNIMARCslimUtils.xsl | 18 ++- > koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl | 12 +- > 10 files changed, 229 insertions(+), 279 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl >index 11c72be..9854e9d 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl >@@ -8,6 +8,7 @@ > exclude-result-prefixes="marc items"> > <xsl:import href="MARC21slimUtils.xsl"/> > <xsl:output method = "html" indent="yes" omit-xml-declaration = "yes" encoding="UTF-8"/> >+ > <xsl:template match="/"> > <xsl:apply-templates/> > </xsl:template> >@@ -21,7 +22,7 @@ > <xsl:variable name="DisplayOPACiconsXSLT" select="marc:sysprefs/marc:syspref[@name='DisplayOPACiconsXSLT']"/> > <xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/> > <xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/> >- >+ > <xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable> > <xsl:variable name="UseAuthoritiesForTracings" select="marc:sysprefs/marc:syspref[@name='UseAuthoritiesForTracings']"/> > <xsl:variable name="TraceSubjectSubdivisions" select="marc:sysprefs/marc:syspref[@name='TraceSubjectSubdivisions']"/> >@@ -91,10 +92,27 @@ > </xsl:choose> > </xsl:variable> > >+ <!-- Schema.org type --> >+ <xsl:variable name="schemaOrgType"> >+ <xsl:choose> >+ <xsl:when test="$materialTypeLabel='Book'">Book</xsl:when> >+ <xsl:when test="$materialTypeLabel='Map'">Map</xsl:when> >+ <xsl:when test="$materialTypeLabel='Music'">MusicAlbum</xsl:when> >+ <xsl:otherwise>CreativeWork</xsl:otherwise> >+ </xsl:choose> >+ </xsl:variable> >+ >+ <!-- Wrapper div for our schema.org object --> >+ <xsl:element name="div"> >+ <xsl:attribute name="class">record</xsl:attribute> >+ <xsl:attribute name="vocab">http://schema.org/</xsl:attribute> >+ <xsl:attribute name="typeof"><xsl:value-of select='$schemaOrgType' /> Product</xsl:attribute> >+ <xsl:attribute name="resource">#record</xsl:attribute> >+ > <!-- Title Statement --> > <!-- Alternate Graphic Representation (MARC 880) --> > <xsl:if test="$display880"> >- <h1 class="title"> >+ <h1 class="title" property="alternativeHeadline"> > <xsl:call-template name="m880Select"> > <xsl:with-param name="basetags">245</xsl:with-param> > <xsl:with-param name="codes">abhfgknps</xsl:with-param> >@@ -103,7 +121,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=245]"> >- <h1 class="title"> >+ <h1 class="title" property="name"> > <xsl:for-each select="marc:datafield[@tag=245]"> > <xsl:call-template name="subfieldSelect"> > <xsl:with-param name="codes">a</xsl:with-param> >@@ -141,7 +159,7 @@ > </xsl:if> > <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]"> >- <h5 class="author">by >+ <h5 class="author" property="author">by > <xsl:call-template name="showAuthor"> > <xsl:with-param name="authorfield" select="marc:datafield[@tag=100 or @tag=110 or @tag=111 or @tag=700 or @tag=710 or @tag=711]"/> > <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/> >@@ -237,7 +255,7 @@ > </xsl:if> > </span> > </xsl:if> >- >+ > <!-- Analytics --> > <xsl:if test="$leader7='s'"> > <span class="results_summary analytics"><span class="label">Analytics: </span> >@@ -308,28 +326,36 @@ > <xsl:if test="marc:datafield[@tag=260]"> > <span class="results_summary publisher"><span class="label">Publisher: </span> > <xsl:for-each select="marc:datafield[@tag=260]"> >+ <span property="publisher" typeof="Organization"> > <xsl:if test="marc:subfield[@code='a']"> >+ <span property="location"> > <xsl:call-template name="subfieldSelect"> > <xsl:with-param name="codes">a</xsl:with-param> > </xsl:call-template> >+ </span> > </xsl:if> > <xsl:text> </xsl:text> > <xsl:if test="marc:subfield[@code='b']"> >- <a href="/cgi-bin/koha/opac-search.pl?q=pb:{marc:subfield[@code='b']}"> >+ <span property="name"><a href="/cgi-bin/koha/opac-search.pl?q=pb:{marc:subfield[@code='b']}"> > <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:call-template name="chopPunctuation"> >- <xsl:with-param name="chopString"> >- <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">cg</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> >+ </a></span> >+ </xsl:if> >+ </span> >+ <xsl:text> </xsl:text> >+ <xsl:if test="marc:subfield[@code='c' or @code='g']"> >+ <span property="datePublished"> >+ <xsl:call-template name="chopPunctuation"> >+ <xsl:with-param name="chopString"> >+ <xsl:call-template name="subfieldSelect"> >+ <xsl:with-param name="codes">cg</xsl:with-param> >+ </xsl:call-template> >+ </xsl:with-param> >+ </xsl:call-template> >+ </span> >+ </xsl:if> >+ <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:if> >@@ -347,6 +373,7 @@ > <xsl:if test="marc:datafield[@tag=250]"> > <span class="results_summary edition"><span class="label">Edition: </span> > <xsl:for-each select="marc:datafield[@tag=250]"> >+ <span property="bookEdition"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> > <xsl:call-template name="subfieldSelect"> >@@ -354,6 +381,7 @@ > </xsl:call-template> > </xsl:with-param> > </xsl:call-template> >+ </span> > <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> >@@ -372,6 +400,7 @@ > <xsl:if test="marc:datafield[@tag=300]"> > <span class="results_summary description"><span class="label">Description: </span> > <xsl:for-each select="marc:datafield[@tag=300]"> >+ <span property="description"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> > <xsl:call-template name="subfieldSelect"> >@@ -379,6 +408,7 @@ > </xsl:call-template> > </xsl:with-param> > </xsl:call-template> >+ </span> > <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> >@@ -387,9 +417,11 @@ > <xsl:if test="marc:datafield[@tag=020]"> > <span class="results_summary isbn"><span class="label">ISBN: </span> > <xsl:for-each select="marc:datafield[@tag=020]"> >+ <span property="isbn"> > <xsl:variable name="isbn" select="marc:subfield[@code='a']"/> > <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> >+ </span> > </xsl:for-each> > </span> > </xsl:if> >@@ -441,6 +473,7 @@ > <xsl:if test="marc:datafield[@tag=246]"> > <span class="results_summary other_title"><span class="label">Other title: </span> > <xsl:for-each select="marc:datafield[@tag=246]"> >+ <span property="alternativeHeadline"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> > <xsl:call-template name="subfieldSelect"> >@@ -448,6 +481,7 @@ > </xsl:call-template> > </xsl:with-param> > </xsl:call-template> >+ </span> > <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> >@@ -457,6 +491,7 @@ > <xsl:if test="marc:datafield[@tag=242]"> > <span class="results_summary translated_title"><span class="label">Title translated: </span> > <xsl:for-each select="marc:datafield[@tag=242]"> >+ <span property="alternativeHeadline"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> > <xsl:call-template name="subfieldSelect"> >@@ -464,6 +499,7 @@ > </xsl:call-template> > </xsl:with-param> > </xsl:call-template> >+ </span> > <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> >@@ -471,17 +507,20 @@ > > <!-- Uniform Title Statement: Alternate Graphic Representation (MARC 880) --> > <xsl:if test="$display880"> >+ <span property="alternativeHeadline"> > <xsl:call-template name="m880Select"> > <xsl:with-param name="basetags">130,240</xsl:with-param> > <xsl:with-param name="codes">adfklmor</xsl:with-param> > <xsl:with-param name="class">results_summary uniform_title</xsl:with-param> > <xsl:with-param name="label">Uniform titles: </xsl:with-param> > </xsl:call-template> >+ </span> > </xsl:if> > > <xsl:if test="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]"> > <span class="results_summary uniform_titles"><span class="label">Uniform titles: </span> > <xsl:for-each select="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]"> >+ <span property="alternativeHeadline"> > <xsl:variable name="str"> > <xsl:for-each select="marc:subfield"> > <xsl:if test="(contains('adfklmor',@code) and (not(../marc:subfield[@code='n' or @code='p']) or (following-sibling::marc:subfield[@code='n' or @code='p'])))"> >@@ -496,6 +535,7 @@ > > </xsl:with-param> > </xsl:call-template> >+ </span> > <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> >@@ -504,6 +544,7 @@ > <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']"> > <span class="results_summary subjects"><span class="label">Subject(s): </span> > <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']"> >+ <span property="keywords"> > <a> > <xsl:choose> > <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'"> >@@ -532,6 +573,7 @@ > </xsl:with-param> > </xsl:call-template> > </a> >+ </span> > <xsl:if test="marc:subfield[@code=9]"> > <a class='authlink'> > <xsl:attribute name="href">/cgi-bin/koha/opac-authoritiesdetail.pl?authid=<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute> >@@ -552,7 +594,7 @@ > <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> >+ <a property="url"> > <xsl:choose> > <xsl:when test="$OPACTrackClicks='track'"> > <xsl:attribute name="href">/cgi-bin/koha/tracklinks.pl?uri=<xsl:value-of select="marc:subfield[@code='u']"/>;biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute> >@@ -570,7 +612,7 @@ > <xsl:choose> > <xsl:when test="($Show856uAsImage='Details' or $Show856uAsImage='Both') and (substring($SubqText,1,6)='image/' or $SubqText='img' or $SubqText='bmp' or $SubqText='cod' or $SubqText='gif' or $SubqText='ief' or $SubqText='jpe' or $SubqText='jpeg' or $SubqText='jpg' or $SubqText='jfif' or $SubqText='png' or $SubqText='svg' or $SubqText='tif' or $SubqText='tiff' or $SubqText='ras' or $SubqText='cmx' or $SubqText='ico' or $SubqText='pnm' or $SubqText='pbm' or $SubqText='pgm' or $SubqText='ppm' or $SubqText='rgb' or $SubqText='xbm' or $SubqText='xpm' or $SubqText='xwd')"> > <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text> >- </xsl:when> >+ </xsl:when> > <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']"> > <xsl:call-template name="subfieldSelect"> > <xsl:with-param name="codes">y3z</xsl:with-param> >@@ -628,7 +670,7 @@ > </xsl:otherwise> > </xsl:choose> > </xsl:if> >- <div class='contentblock'> >+ <div class='contentblock' property='description'> > <xsl:choose> > <xsl:when test="@ind2=0"> > <xsl:call-template name="subfieldSelectSpan"> >@@ -847,6 +889,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> >@@ -859,7 +902,7 @@ > </a> > </xsl:when> > <xsl:otherwise> >- <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:value-of select="translate($f780, '()', '')"/></xsl:attribute> >+ <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="translate($f780, '()', '')"/></xsl:attribute> > <xsl:value-of select="translate($f780, '()', '')"/> > </a> > </xsl:otherwise> >@@ -907,8 +950,8 @@ > <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> >@@ -922,7 +965,7 @@ > </a> > </xsl:when> > <xsl:otherwise> >- <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:value-of select="translate($f785, '()', '')"/></xsl:attribute> >+ <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=ti,phr:<xsl:value-of select="translate($f785, '()', '')"/></xsl:attribute> > <xsl:value-of select="translate($f785, '()', '')"/> > </a> > </xsl:otherwise> >@@ -938,6 +981,7 @@ > </xsl:for-each> > </xsl:if> > >+ </xsl:element> > </xsl:template> > > <xsl:template name="showAuthor"> >@@ -958,14 +1002,14 @@ > <a> > <xsl:choose> > <xsl:when test="marc:subfield[@code=9] and $UseAuthoritiesForTracings='1'"> >- <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute> >+ <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:"<xsl:value-of select="marc:subfield[@code=9]"/>"</xsl:attribute> > </xsl:when> > <xsl:otherwise> >- <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute> >+ <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=au:"<xsl:value-of select="marc:subfield[@code='a']"/>"</xsl:attribute> > </xsl:otherwise> > </xsl:choose> > <xsl:choose> >- <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCDQ"/></xsl:when> >+ <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCQ"/></xsl:when> > <xsl:when test="@tag=110 or @tag=710"><xsl:call-template name="nameABCDN"/></xsl:when> > <xsl:when test="@tag=111 or @tag=711"><xsl:call-template name="nameACDEQ"/></xsl:when> > </xsl:choose> >@@ -991,18 +1035,17 @@ > <xsl:text>.</xsl:text> > </xsl:template> > >- <xsl:template name="nameABCDQ"> >+ <xsl:template name="nameABCQ"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> > <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">aq</xsl:with-param> >+ <xsl:with-param name="codes">abcq</xsl:with-param> > </xsl:call-template> > </xsl:with-param> > <xsl:with-param name="punctuation"> > <xsl:text>:,;/ </xsl:text> > </xsl:with-param> > </xsl:call-template> >- <xsl:call-template name="termsOfAddress"/> > </xsl:template> > > <xsl:template name="nameABCDN"> >@@ -1031,17 +1074,6 @@ > <xsl:with-param name="codes">acdeq</xsl:with-param> > </xsl:call-template> > </xsl:template> >- <xsl:template name="termsOfAddress"> >- <xsl:if test="marc:subfield[@code='b' or @code='c']"> >- <xsl:call-template name="chopPunctuation"> >- <xsl:with-param name="chopString"> >- <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">bc</xsl:with-param> >- </xsl:call-template> >- </xsl:with-param> >- </xsl:call-template> >- </xsl:if> >- </xsl:template> > > <xsl:template name="part"> > <xsl:variable name="partNumber"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl >index 4890682..24ffa85 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl >@@ -455,10 +455,10 @@ > <xsl:for-each select="marc:datafield[(@tag=100 or @tag=700) and @ind1!='z']"> > <xsl:choose> > <xsl:when test="position()=last()"> >- <xsl:call-template name="nameABCDQ"/>. >+ <xsl:call-template name="nameABCQ"/>. > </xsl:when> > <xsl:otherwise> >- <xsl:call-template name="nameABCDQ"/>; >+ <xsl:call-template name="nameABCQ"/>; > </xsl:otherwise> > </xsl:choose> > </xsl:for-each> >@@ -471,7 +471,7 @@ > </xsl:choose> > <xsl:choose> > <xsl:when test="position()=last()"> >- <xsl:call-template name="nameABCDN"/> >+ <xsl:call-template name="nameABCDN"/> > </xsl:when> > <xsl:otherwise> > <xsl:call-template name="nameABCDN"/>; >@@ -489,7 +489,7 @@ > <xsl:when test="marc:subfield[@code='n']"> > <xsl:text> </xsl:text> > <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">n</xsl:with-param> >+ <xsl:with-param name="codes">n</xsl:with-param> > </xsl:call-template> > <xsl:text> </xsl:text> > </xsl:when> >@@ -509,7 +509,7 @@ > </p> > > <xsl:if test="marc:datafield[@tag=250]"> >- <span class="results_summary"> >+ <span class="results_summary edition"> > <span class="label">Edition: </span> > <xsl:for-each select="marc:datafield[@tag=250]"> > <xsl:call-template name="subfieldSelect"> >@@ -522,7 +522,7 @@ > <xsl:if test="marc:datafield[@tag=773]"> > <xsl:for-each select="marc:datafield[@tag=773]"> > <xsl:if test="marc:subfield[@code='t']"> >- <span class="results_summary"> >+ <span class="results_summary source"> > <span class="label">Source: </span> > <xsl:value-of select="marc:subfield[@code='t']"/> > </span> >@@ -531,7 +531,7 @@ > </xsl:if> > > <xsl:if test="$DisplayOPACiconsXSLT!='0'"> >- <span class="results_summary"> >+ <span class="results_summary type"> > <xsl:if test="$typeOf008!=''"> > <span class="label">Type: </span> > <xsl:choose> >@@ -703,7 +703,7 @@ > </xsl:when> > <xsl:when test="$controlField008-33='1'"> > fiction >- </xsl:when> >+ </xsl:when> > <xsl:when test="$controlField008-33='e'"> > essay > </xsl:when> >@@ -732,7 +732,7 @@ > speech > </xsl:when> > </xsl:choose> >- </xsl:if> >+ </xsl:if> > <xsl:if test="$typeOf008='MU' and $controlField008-30-31 and $controlField008-30-31!='||' and $controlField008-30-31!=' '"> > <span class="label">; Literary form: </span> <!-- Literary text for sound recordings --> > <xsl:if test="contains($controlField008-30-31,'b')"> >@@ -841,7 +841,7 @@ > </xsl:when> > </xsl:choose> > </xsl:if> >- </xsl:if> >+ </xsl:if> > > <xsl:if test="($typeOf008='BK' or $typeOf008='CF' or $typeOf008='MU' or $typeOf008='VM') and ($controlField008-22='a' or $controlField008-22='b' or $controlField008-22='c' or $controlField008-22='d' or $controlField008-22='e' or $controlField008-22='g' or $controlField008-22='j' or $controlField008-22='f')"> > <span class="label">; Audience: </span> >@@ -881,7 +881,7 @@ > <xsl:call-template name="m880Select"> > <xsl:with-param name="basetags">260</xsl:with-param> > <xsl:with-param name="codes">abcg</xsl:with-param> >- <xsl:with-param name="class">results_summary</xsl:with-param> >+ <xsl:with-param name="class">results_summary publisher</xsl:with-param> > <xsl:with-param name="label">Publisher: </xsl:with-param> > </xsl:call-template> > </xsl:if> >@@ -918,13 +918,13 @@ > <xsl:call-template name="m880Select"> > <xsl:with-param name="basetags">246</xsl:with-param> > <xsl:with-param name="codes">ab</xsl:with-param> >- <xsl:with-param name="class">results_summary</xsl:with-param> >- <xsl:with-param name="label">Other Title: </xsl:with-param> >+ <xsl:with-param name="class">results_summary other_title</xsl:with-param> >+ <xsl:with-param name="label">Other title: </xsl:with-param> > </xsl:call-template> > </xsl:if> >- >+ > <xsl:if test="marc:datafield[@tag=246]"> >- <span class="results_summary"> >+ <span class="results_summary other_title"> > <span class="label">Other title: </span> > <xsl:for-each select="marc:datafield[@tag=246]"> > <xsl:call-template name="subfieldSelect"> >@@ -935,7 +935,7 @@ > </span> > </xsl:if> > <xsl:if test="marc:datafield[@tag=242]"> >- <span class="results_summary"> >+ <span class="results_summary translated_title"> > <span class="label">Title translated: </span> > <xsl:for-each select="marc:datafield[@tag=242]"> > <xsl:call-template name="subfieldSelect"> >@@ -946,7 +946,7 @@ > </span> > </xsl:if> > <xsl:if test="marc:datafield[@tag=856]"> >- <span class="results_summary"> >+ <span class="results_summary online_resources"> > <span class="label">Online Access: </span> > <xsl:for-each select="marc:datafield[@tag=856]"> > <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable> >@@ -968,8 +968,8 @@ > <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text> > </xsl:when> > <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']"> >- <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">y3z</xsl:with-param> >+ <xsl:call-template name="subfieldSelect"> >+ <xsl:with-param name="codes">y3z</xsl:with-param> > </xsl:call-template> > </xsl:when> > <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])"> >@@ -1003,8 +1003,8 @@ > <xsl:element name="img"><xsl:attribute name="src"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute><xsl:attribute name="alt"><xsl:value-of select="marc:subfield[@code='y']"/></xsl:attribute><xsl:attribute name="height">100</xsl:attribute></xsl:element><xsl:text></xsl:text> > </xsl:when> > <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']"> >- <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">y3z</xsl:with-param> >+ <xsl:call-template name="subfieldSelect"> >+ <xsl:with-param name="codes">y3z</xsl:with-param> > </xsl:call-template> > </xsl:when> > <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])"> >@@ -1062,7 +1062,7 @@ > </xsl:when> > <xsl:otherwise> > <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]"> >- <xsl:value-of select="items:homebranch"/> >+ <xsl:value-of select="items:homebranch"/> > <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber and $OPACItemLocation='callnum'"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if> > <xsl:text> (</xsl:text> > <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/> >@@ -1082,12 +1082,14 @@ > <b><xsl:text>Copies available for reference: </xsl:text></b> > <xsl:variable name="reference_items" select="key('item-by-status', 'reference')"/> > <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]"> >+ <xsl:if test="$singleBranchMode=0"> > <xsl:value-of select="items:homebranch"/> >- <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if> >- <xsl:text> (</xsl:text> >- <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/> >- <xsl:text> )</xsl:text> >- <xsl:choose><xsl:when test="position()=last()"><xsl:text>. </xsl:text></xsl:when><xsl:otherwise><xsl:text>, </xsl:text></xsl:otherwise></xsl:choose> >+ </xsl:if> >+ <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if> >+ <xsl:text> (</xsl:text> >+ <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/> >+ <xsl:text> )</xsl:text> >+ <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> >@@ -1180,18 +1182,17 @@ > </xsl:choose> > </xsl:template> > >- <xsl:template name="nameABCDQ"> >+ <xsl:template name="nameABCQ"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> > <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">aq</xsl:with-param> >+ <xsl:with-param name="codes">abcq</xsl:with-param> > </xsl:call-template> > </xsl:with-param> > <xsl:with-param name="punctuation"> > <xsl:text>:,;/ </xsl:text> > </xsl:with-param> > </xsl:call-template> >- <xsl:call-template name="termsOfAddress"/> > </xsl:template> > > <xsl:template name="nameABCDN"> >@@ -1216,18 +1217,6 @@ > </xsl:call-template> > </xsl:template> > >- <xsl:template name="termsOfAddress"> >- <xsl:if test="marc:subfield[@code='b' or @code='c']"> >- <xsl:call-template name="chopPunctuation"> >- <xsl:with-param name="chopString"> >- <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">bc</xsl:with-param> >- </xsl:call-template> >- </xsl:with-param> >- </xsl:call-template> >- </xsl:if> >- </xsl:template> >- > <xsl:template name="nameDate"> > <xsl:for-each select="marc:subfield[@code='d']"> > <xsl:call-template name="chopPunctuation"> >@@ -1268,7 +1257,7 @@ > <xsl:value-of select="marc:subfield[@code='b']"/> > > <!--<xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">b</xsl:with-param> >+ <xsl:with-param name="codes">b</xsl:with-param> > </xsl:call-template>--> > </xsl:with-param> > </xsl:call-template> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl >index 9599566..df7c450 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slimUtils.xsl >@@ -107,12 +107,12 @@ > </xsl:template> > > <!-- Function m880Select: Display Alternate Graphic Representation (MARC 880) for selected latin "base"tags >- - should be called immediately before the corresonding latin tags are processed >+ - should be called immediately before the corresonding latin tags are processed > - tags in right-to-left languages are displayed floating right > * Parameter: > + basetags: display these tags if found in linkage section ( subfield 6) of tag 880 > + codes: display these subfields codes >- * Options: >+ * Options: > - class: wrap output in <span class="$class">...</span> > - label: prefix each(!) tag with label $label > - bibno: link to biblionumber $bibno >@@ -142,10 +142,10 @@ > <xsl:when test="boolean($class)"> > <xsl:attribute name="class"><xsl:value-of select="$class"/></xsl:attribute> > <xsl:attribute name="style">display:block; </xsl:attribute> >- </xsl:when> >+ </xsl:when> > <xsl:when test="substring($code6,string-length($code6)-1,2) ='/r'"> > <xsl:attribute name="class"><xsl:value-of select="$class"/> m880</xsl:attribute> >- </xsl:when> >+ </xsl:when> > </xsl:choose> > <xsl:if test="boolean($label)"> > <span class="label"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl >index 16ce3e2..25f6604 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACDetail.xsl >@@ -76,7 +76,7 @@ > <xsl:text> </xsl:text> > (<xsl:call-template name="subfieldSelect"> > <xsl:with-param name="codes">h</xsl:with-param> >- </xsl:call-template>) >+ </xsl:call-template>) > </xsl:if> > <xsl:text> </xsl:text> > <xsl:call-template name="subfieldSelect"> >@@ -87,7 +87,7 @@ > </xsl:if> > > <!-- Author Statement --> >- <!-- 245$9 is Koha authority number --> >+ <!-- 245$9 is Koha authority number --> > <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]"> > <h5 class="author">av >@@ -119,7 +119,7 @@ > <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute> > </xsl:when> > <xsl:otherwise> >- <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute> >+ <xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute> > </xsl:otherwise> > </xsl:choose> > <xsl:call-template name="nameABCDN"/></a> >@@ -191,7 +191,7 @@ > <xsl:text> </xsl:text><xsl:call-template name="part"/> > <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> >- >+ > <xsl:for-each select="marc:datafield[@tag=490][@ind1=0]"> > <a href="/cgi-bin/koha/opac-search.pl?q=se:{marc:subfield[@code='a']}"> > <xsl:call-template name="chopPunctuation"> >@@ -243,7 +243,7 @@ > </span> > <xsl:variable name="f773"> > <xsl:call-template name="chopPunctuation"><xsl:with-param name="chopString"><xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">at</xsl:with-param> >+ <xsl:with-param name="codes">a_t</xsl:with-param> > </xsl:call-template></xsl:with-param></xsl:call-template> > </xsl:variable> > <xsl:choose> >@@ -274,7 +274,7 @@ > </xsl:if> > > <!-- Publisher Statement --> >- >+ > <xsl:if test="marc:datafield[@tag=260]"> > <span class="results_summary"><span class="label">Utgiver: </span> > <xsl:for-each select="marc:datafield[@tag=260]"> >@@ -287,11 +287,11 @@ > </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:for-each> >- </span> >+ </span> > </xsl:if> > > <!-- Edition Statement --> >- >+ > <xsl:if test="marc:datafield[@tag=250]"> > <span class="results_summary"><span class="label">Utgave: </span> > <xsl:for-each select="marc:datafield[@tag=250]"> >@@ -308,7 +308,7 @@ > </xsl:if> > > <!-- Description --> >- >+ > <xsl:if test="marc:datafield[@tag=300]"> > <span class="results_summary"><span class="label">Beskrivelse: </span> > <xsl:for-each select="marc:datafield[@tag=300]"> >@@ -378,7 +378,7 @@ > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> > <xsl:value-of select="substring($str,1,string-length($str)-1)"/> >- >+ > </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> >@@ -454,11 +454,11 @@ > <xsl:choose> > <xsl:when test="position()=last()"></xsl:when> > <xsl:otherwise> | </xsl:otherwise> >- </xsl:choose> >+ </xsl:choose> > </xsl:for-each> > </span> > </xsl:if> >- >+ > <!-- NORMARC does not define indicators for 505 > <xsl:if test="marc:datafield[@tag=505]"> > <xsl:for-each select="marc:datafield[@tag=505]"> >@@ -473,13 +473,13 @@ > <xsl:when test="@ind1=1"> > Partial contents: > </xsl:when> >- </xsl:choose> >+ </xsl:choose> > </span> > <xsl:choose> > <xsl:when test="@ind2=0"> > <xsl:for-each select="marc:subfield[@code='t']"> > <xsl:value-of select="marc:subfield[@code=t]"/> <xsl:value-of select="marc:subfield[@code=r]"/> >- </xsl:for-each> >+ </xsl:for-each> > </xsl:when> > <xsl:otherwise> > <xsl:call-template name="subfieldSelect"> >@@ -496,7 +496,7 @@ > <xsl:with-param name="codes">a</xsl:with-param> > </xsl:call-template> > </xsl:if> >- >+ > <!-- 780 --> > <xsl:if test="marc:datafield[@tag=780]"> > <xsl:for-each select="marc:datafield[@tag=780]"> >@@ -537,7 +537,7 @@ > <xsl:value-of select="translate($f780, '()', '')"/> > </a> > </span> >- >+ > <xsl:choose> > <xsl:when test="@ind1=0"> > <span class="results_summary"><xsl:value-of select="marc:subfield[@code='n']"/></span> >@@ -574,7 +574,7 @@ > Fortsettes av: ...; og ... > </xsl:when> > <xsl:when test="@ind2=7"> >- Slått sammen med: .., til: ... >+ Slått sammen med: .., til: ... > </xsl:when> > </xsl:choose> > </span> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl >index 30d6e18..5f4b533 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslim2OPACResults.xsl >@@ -63,9 +63,9 @@ > <xsl:variable name="controlField008-30-31" select="substring($controlField008,31,2)"/> > > <xsl:variable name="physicalDescription"> >- >- <!-- Why are these treated specially? >- >+ >+ <!-- Why are these treated specially? >+ > <xsl:if test="$typeOf008='CF' and marc:controlfield[@tag=007][substring(.,12,1)='a']"> > reformatted digital > </xsl:if> >@@ -86,7 +86,7 @@ > <xsl:value-of select="true()"></xsl:value-of> > </xsl:if> > </xsl:variable> >- >+ > <xsl:choose> > <xsl:when test="($check008-23 and $controlField008-23='f') or ($check008-29 and $controlField008-29='f')"> > braille >@@ -104,11 +104,11 @@ > microfilm > </xsl:when> > </xsl:choose> >- >+ > --> >- >+ > <!-- 019$b from BSMARC --> >- >+ > <xsl:if test="$field019b"> > <xsl:if test="$field019b='a'"> Kartografisk materiale</xsl:if> > <xsl:if test="contains($field019b,'ab')"> Atlas</xsl:if> >@@ -146,11 +146,11 @@ > <xsl:if test="$field019b='k'"> Artikler (i bøker eller periodika)</xsl:if> > <xsl:if test="$field019b='l'"> Fysiske bøker</xsl:if> > </xsl:if> >- >+ > <!-- Check positions 00 and 01 of controlfield 007 --> > > <xsl:if test="$controlField007-00='a'"> >- <!-- Kartografisk materiale (unntatt globus) --> >+ <!-- Kartografisk materiale (unntatt globus) --> > <xsl:if test="$controlField007-01='a'">Anamorfisk kart</xsl:if> > <xsl:if test="$controlField007-01='b'">Atlas</xsl:if> > <xsl:if test="$controlField007-01='c'">Fantasikart</xsl:if> >@@ -175,7 +175,7 @@ > </xsl:if> > > <xsl:if test="$controlField007-00='c'"> >- <!-- Maskinlesbar fil --> >+ <!-- Maskinlesbar fil --> > <xsl:if test="$controlField007-01='a'">Magnetisk-optisk plate</xsl:if> > <xsl:if test="$controlField007-01='b'">Lagringsbrikke</xsl:if> > <xsl:if test="$controlField007-01='c'">Optisk kassett</xsl:if> >@@ -189,7 +189,7 @@ > </xsl:if> > > <xsl:if test="$controlField007-00='d'"> >- <!-- Globus --> >+ <!-- Globus --> > <xsl:if test="$controlField007-01='a'">Stjerneglobus</xsl:if> > <xsl:if test="$controlField007-01='b'">Planet- eller måneglobus</xsl:if> > <xsl:if test="$controlField007-01='c'">Jordglobus</xsl:if> >@@ -197,7 +197,7 @@ > </xsl:if> > > <xsl:if test="$controlField007-00='g'"> >- <!-- Grafisk materiale som er tenkt projisert eller gjennomlyst --> >+ <!-- Grafisk materiale som er tenkt projisert eller gjennomlyst --> > <xsl:if test="$controlField007-01='h'">Hologram</xsl:if> > <xsl:if test="$controlField007-01='o'">Billedbånd</xsl:if> > <xsl:if test="$controlField007-01='p'">Stereobilde</xsl:if> >@@ -206,9 +206,9 @@ > <xsl:if test="$controlField007-01='t'">Transparent</xsl:if> > <xsl:if test="$controlField007-01='z'">Annen materialtype</xsl:if> > </xsl:if> >- >+ > <xsl:if test="$controlField007-00='h'"> >- <!-- Mikroform --> >+ <!-- Mikroform --> > <xsl:if test="$controlField007-01='a'">Vinduskort</xsl:if> > <xsl:if test="$controlField007-01='c'">Mikrofilmkassett</xsl:if> > <xsl:if test="$controlField007-01='d'">Mikrofilmspole</xsl:if> >@@ -218,7 +218,7 @@ > </xsl:if> > > <xsl:if test="$controlField007-00='k'"> >- <!-- Grafisk materiale som er ugjennomtrengelig for lys --> >+ <!-- Grafisk materiale som er ugjennomtrengelig for lys --> > <xsl:if test="$controlField007-01='c'">Collage</xsl:if> <!-- Originalt kunstverk --> > <xsl:if test="$controlField007-01='d'">Tegning</xsl:if> <!-- Originalt kunstverk --> > <xsl:if test="$controlField007-01='e'">Maleri</xsl:if> <!-- Originalt kunstverk --> >@@ -238,9 +238,9 @@ > <xsl:if test="$controlField007-01='t'">Plakat</xsl:if> > <xsl:if test="$controlField007-01='z'">Annen materialtype</xsl:if> > </xsl:if> >- >+ > <xsl:if test="$controlField007-00='m'"> >- <!-- Film --> >+ <!-- Film --> > <xsl:if test="$controlField007-01='c'">Filmsløyfe</xsl:if> > <xsl:if test="$controlField007-01='f'">Filmkassett</xsl:if> > <xsl:if test="$controlField007-01='r'">Filmspole</xsl:if> >@@ -248,7 +248,7 @@ > </xsl:if> > > <xsl:if test="$controlField007-00='s'"> >- <!-- Lydopptak --> >+ <!-- Lydopptak --> > <xsl:if test="$controlField007-01='c'">Kompaktplate</xsl:if> > <xsl:if test="$controlField007-01='d'">Grammofonplate</xsl:if> > <xsl:if test="$controlField007-01='e'">Sylinder</xsl:if> <!-- Lydrull, voksrull, fonografsylinder --> >@@ -262,7 +262,7 @@ > </xsl:if> > > <xsl:if test="$controlField007-00='u'"> >- <!-- Tre-dimensjonal gjenstand --> >+ <!-- Tre-dimensjonal gjenstand --> > <xsl:if test="$controlField007-01='a'">Originalt kunstverk</xsl:if> <!-- F.eks. en skulptur. --> > <xsl:if test="$controlField007-01='c'">Kunstreproduksjon</xsl:if> > <xsl:if test="$controlField007-01='d'">Diorama</xsl:if> >@@ -276,7 +276,7 @@ > </xsl:if> > > <xsl:if test="$controlField007-00='v'"> >- <!-- Videoopptak --> >+ <!-- Videoopptak --> > <xsl:if test="$controlField007-01='d'">Videoplate</xsl:if> > <xsl:if test="$controlField007-01='f'">Videokassett</xsl:if> > <xsl:if test="$controlField007-01='r'">Videospole</xsl:if> >@@ -286,7 +286,7 @@ > </xsl:variable> > > <!-- Tittel og ansvarsopplysninger --> >- <a><xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute> >+ <a><xsl:attribute name="href">/cgi-bin/koha/opac-detail.pl?biblionumber=<xsl:value-of select="$biblionumber"/></xsl:attribute> > <xsl:if test="marc:datafield[@tag=245]"> > <xsl:for-each select="marc:datafield[@tag=245]"> > <xsl:variable name="title"> >@@ -303,7 +303,7 @@ > <xsl:text> </xsl:text> > (<xsl:call-template name="subfieldSelect"> > <xsl:with-param name="codes">h</xsl:with-param> >- </xsl:call-template>) >+ </xsl:call-template>) > </xsl:if> > <xsl:text> </xsl:text> > <xsl:call-template name="subfieldSelect"> >@@ -326,7 +326,7 @@ > <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]"> > >- av >+ av > <xsl:for-each select="marc:datafield[(@tag=100 or @tag=700) and @ind1!='z']"> > <xsl:choose> > <xsl:when test="position()=last()"> >@@ -409,7 +409,7 @@ > </span> > <xsl:variable name="f773"> > <xsl:call-template name="chopPunctuation"><xsl:with-param name="chopString"><xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">at</xsl:with-param> >+ <xsl:with-param name="codes">a_t</xsl:with-param> > </xsl:call-template></xsl:with-param></xsl:call-template> > </xsl:variable> > <xsl:choose> >@@ -458,16 +458,16 @@ > <xsl:if test="string-length(normalize-space($physicalDescription))"> > <span class="label">; Format: </span><xsl:copy-of select="$physicalDescription"></xsl:copy-of> > </xsl:if> >- >- <!-- test >+ >+ <!-- test > <xsl:for-each select="marc:datafield[@tag=019]"> >- 019b: >+ 019b: > <xsl:call-template name="subfieldSelect"> > <xsl:with-param name="codes">b</xsl:with-param> > </xsl:call-template> > </xsl:for-each> > --> >- >+ > <xsl:if test="$controlField008-21 or $controlField008-22 or $controlField008-24 or $controlField008-26 or $controlField008-29 or $controlField008-34 or $controlField008-33 or $controlField008-30-31 or $controlField008-33"> > > <xsl:if test="$typeOf008='Per'"> >@@ -482,7 +482,7 @@ > <xsl:when test="$controlField008-21='z'">Andre typer periodika</xsl:when> > </xsl:choose> > </xsl:if> >- >+ > <xsl:if test="$typeOf008='Mon' or $typeOf008='Per'"> > <xsl:if test="contains($controlField008-24,'abcdefhiklmnoqrstx')"> > <span class="label">; Innhold: </span> >@@ -564,7 +564,7 @@ > <xsl:when test="$controlField008-33='a'">Antologi</xsl:when> > <xsl:when test="$controlField008-33='p'">Pekebok</xsl:when> > </xsl:choose> >- </xsl:if> >+ </xsl:if> > <xsl:if test="$typeOf008='Mus' and $controlField008-30-31 and $controlField008-30-31!='^^' and $controlField008-30-31!=' '"> > <span class="label">; Litterær form: </span> <!-- Literary text for sound recordings --> > <xsl:if test="contains($controlField008-30-31,'a')">Selvbiografier</xsl:if> >@@ -587,7 +587,7 @@ > <xsl:if test="contains($controlField008-30-31,'t')">Intervjuer</xsl:if> > <xsl:if test="contains($controlField008-30-31,'z')">Andre typer innhold</xsl:if> > </xsl:if> >- >+ > <!-- > <xsl:if test="$typeOf008='VM'"> > <span class="label">; Type of visual material: </span> >@@ -653,9 +653,9 @@ > </xsl:choose> > </xsl:if> > --> >- >- </xsl:if> >- >+ >+ </xsl:if> >+ > <!-- > <xsl:if test="($typeOf008='Mon' or $typeOf008='Per' or $typeOf008='Mus' or $typeOf008='FV' or $typeOf008='Fil') and ($controlField008-22='a' or $controlField008-22='b' or $controlField008-22='c' or $controlField008-22='d' or $controlField008-22='e' or $controlField008-22='g' or $controlField008-22='j' or $controlField008-22='f')"> > --> >@@ -748,7 +748,7 @@ > <!-- Utgivelse, distribusjon osv --> > <xsl:if test="marc:datafield[@tag=260]"> > <span class="results_summary"> >- <span class="label">Utgiver: </span> >+ <span class="label">Utgiver: </span> > <xsl:for-each select="marc:datafield[@tag=260]"> > <xsl:call-template name="subfieldSelect"> > <xsl:with-param name="codes">bcg</xsl:with-param> >@@ -756,7 +756,7 @@ > </xsl:for-each> > </span> > </xsl:if> >- >+ > <!-- Parallelltittel (R) --> > <xsl:if test="marc:datafield[@tag=246]"> > <span class="results_summary"> >@@ -814,8 +814,9 @@ > <xsl:variable name="reference_items" > select="key('item-by-status', 'reference')"/> > <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]"> >- <xsl:value-of select="items:homebranch"/> >- >+ <xsl:if test="$singleBranchMode=0"> >+ <xsl:value-of select="items:homebranch"/> >+ </xsl:if> > <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber"> [<xsl:value-of select="items:itemcallnumber"/>]</xsl:if> > <xsl:text> (</xsl:text> > <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/> >@@ -932,7 +933,7 @@ > <xsl:value-of select="marc:subfield[@code='b']"/> > > <!--<xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">b</xsl:with-param> >+ <xsl:with-param name="codes">b</xsl:with-param> > </xsl:call-template>--> > </xsl:with-param> > </xsl:call-template> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl >index 4a1f360..d5b1fc6 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/NORMARCslimUtils.xsl >@@ -136,12 +136,12 @@ > </xsl:template> > > <!-- Function m880Select: Display Alternate Graphic Representation (MARC 880) for selected latin "base"tags >- - should be called immediately before the corresonding latin tags are processed >+ - should be called immediately before the corresonding latin tags are processed > - tags in right-to-left languages are displayed floating right > * Parameter: > + basetags: display these tags if found in linkage section ( subfield 6) of tag 880 > + codes: display these subfields codes >- * Options: >+ * Options: > - class: wrap output in <span class="$class">...</span> > - label: prefix each(!) tag with label $label > - bibno: link to biblionumber $bibno >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl >index cb365d9..f7d1984 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACDetail.xsl >@@ -69,61 +69,72 @@ > <xsl:call-template name="tag_title"> > <xsl:with-param name="tag">454</xsl:with-param> > <xsl:with-param name="label">Translation of</xsl:with-param> >+ <xsl:with-param name="spanclass">original_title</xsl:with-param> > </xsl:call-template> > > <xsl:call-template name="tag_title"> > <xsl:with-param name="tag">461</xsl:with-param> > <xsl:with-param name="label">Set Level</xsl:with-param> >+ <xsl:with-param name="spanclass">set_level</xsl:with-param> > </xsl:call-template> > > <xsl:call-template name="tag_title"> > <xsl:with-param name="tag">464</xsl:with-param> > <xsl:with-param name="label">Piece-Analytic Level</xsl:with-param> >+ <xsl:with-param name="spanclass">piece_analytic_level</xsl:with-param> > </xsl:call-template> > > <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:call-template name="tag_title"> > <xsl:with-param name="tag">500</xsl:with-param> > <xsl:with-param name="label">Uniform Title</xsl:with-param> >+ <xsl:with-param name="spanclass">uniform_title</xsl:with-param> > </xsl:call-template> > > <xsl:call-template name="tag_title"> > <xsl:with-param name="tag">503</xsl:with-param> > <xsl:with-param name="label">Uniform Conventional Heading</xsl:with-param> >+ <xsl:with-param name="spanclass">uniform_conventional_heading</xsl:with-param> > </xsl:call-template> > > <xsl:if test="marc:datafield[@tag=101]"> >- <span class="results_summary"> >- <span class="label">Language:</span> >+ <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> >@@ -152,7 +163,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=102]"> >- <span class="results_summary"> >+ <span class="results_summary country"> > <span class="label">Country: </span> > <xsl:for-each select="marc:datafield[@tag=102]"> > <xsl:for-each select="marc:subfield"> >@@ -172,6 +183,7 @@ > <xsl:call-template name="tag_comma"> > <xsl:with-param name="tag">205</xsl:with-param> > <xsl:with-param name="label">Edition Statement</xsl:with-param> >+ <xsl:with-param name="spanclass">edition</xsl:with-param> > </xsl:call-template> > > <xsl:call-template name="tag_210" /> >@@ -179,7 +191,7 @@ > <xsl:call-template name="tag_215" /> > > <xsl:if test="marc:datafield[@tag=010]/marc:subfield[@code='a']"> >- <span class="results_summary"><span class="label">ISBN: </span> >+ <span class="results_summary isbn"><span class="label">ISBN: </span> > <xsl:for-each select="marc:datafield[@tag=010]"> > <xsl:variable name="isbn" select="marc:subfield[@code='a']"/> > <xsl:value-of select="marc:subfield[@code='a']"/> >@@ -196,7 +208,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=011]"> >- <span class="results_summary"> >+ <span class="results_summary issn"> > <span class="label">ISSN: </span> > <xsl:for-each select="marc:datafield[@tag=011]"> > <xsl:value-of select="marc:subfield[@code='a']"/> >@@ -215,10 +227,11 @@ > <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]"> >- <span class="results_summary"> >+ <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']"/> >@@ -238,7 +251,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=686]"> >- <span class="results_summary"> >+ <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']"/> >@@ -256,7 +269,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=327]"> >- <span class="results_summary"> >+ <span class="results_summary contents"> > <span class="label">Contents note: </span> > <xsl:for-each select="marc:datafield[@tag=327]"> > <xsl:call-template name="chopPunctuation"> >@@ -273,7 +286,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=330]"> >- <span class="results_summary"> >+ <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']"/> >@@ -290,7 +303,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=317]"> >- <span class="results_summary"> >+ <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']"/> >@@ -299,7 +312,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=320]"> >- <span class="results_summary"> >+ <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']"/> >@@ -309,7 +322,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=328]"> >- <span class="results_summary"> >+ <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']"/> >@@ -319,7 +332,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=333]"> >- <span class="results_summary"> >+ <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']"/> >@@ -329,7 +342,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=955]"> >- <span class="results_summary"> >+ <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']"/>: >@@ -390,7 +403,7 @@ > </xsl:call-template> > > <xsl:if test="marc:datafield[@tag=856]"> >- <span class="results_summary"> >+ <span class="results_summary online_resources"> > <span class="label">Online Resources:</span> > <xsl:for-each select="marc:datafield[@tag=856]"> > <a> >@@ -425,105 +438,7 @@ > </xsl:for-each> > </span> > </xsl:if> >- >- <!-- 780 --> >- <xsl:if test="marc:datafield[@tag=780]"> >- <xsl:for-each select="marc:datafield[@tag=780]"> >- <span class="results_summary"> >- <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> >- <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:value-of select="translate($f780, '()', '')"/></xsl:attribute> >- <xsl:value-of select="translate($f780, '()', '')"/> >- </a> >- </span> >- >- <xsl:choose> >- <xsl:when test="@ind1=0"> >- <span class="results_summary"><xsl:value-of select="marc:subfield[@code='n']"/></span> >- </xsl:when> >- </xsl:choose> >- >- </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"> >- <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:variable name="f785"> >- <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">a_t</xsl:with-param> >- </xsl:call-template> >- </xsl:variable> >- >- <a><xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=<xsl:value-of select="translate($f785, '()', '')"/></xsl:attribute> >- <xsl:value-of select="translate($f785, '()', '')"/> >- </a> >- >- </span> >- </xsl:for-each> >- </xsl:if> >- >- </xsl:template> >+</xsl:template> > > <xsl:template name="nameABCDQ"> > <xsl:call-template name="chopPunctuation"> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl >index 378e96c..9dde821 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslim2OPACResults.xsl >@@ -28,6 +28,7 @@ > > <xsl:variable name="hidelostitems" select="marc:sysprefs/marc:syspref[@name='hidelostitems']"/> > <xsl:variable name="singleBranchMode" select="marc:sysprefs/marc:syspref[@name='singleBranchMode']"/> >+ <xsl:variable name="OPACURLOpenInNewWindow" select="marc:sysprefs/marc:syspref[@name='OPACURLOpenInNewWindow']"/> > > <xsl:if test="marc:datafield[@tag=200]"> > <xsl:for-each select="marc:datafield[@tag=200]"> >@@ -79,23 +80,26 @@ > <xsl:call-template name="tag_title"> > <xsl:with-param name="tag">454</xsl:with-param> > <xsl:with-param name="label">Translation of</xsl:with-param> >+ <xsl:with-param name="spanclass">original_title</xsl:with-param> > </xsl:call-template> > > <xsl:call-template name="tag_title"> > <xsl:with-param name="tag">461</xsl:with-param> > <xsl:with-param name="label">Set Level</xsl:with-param> >+ <xsl:with-param name="spanclass">set_level</xsl:with-param> > </xsl:call-template> > > <xsl:call-template name="tag_title"> > <xsl:with-param name="tag">464</xsl:with-param> > <xsl:with-param name="label">Piece-Analytic Level</xsl:with-param> >+ <xsl:with-param name="spanclass">piece_analytic_level</xsl:with-param> > </xsl:call-template> > > <xsl:call-template name="tag_210" /> > > <xsl:call-template name="tag_215" /> > >- <span class="results_summary"> >+ <span class="results_summary availability"> > <span class="label">Availability: </span> > <xsl:choose> > <xsl:when test="marc:datafield[@tag=856]"> >@@ -106,10 +110,13 @@ > <xsl:attribute name="href"> > <xsl:value-of select="marc:subfield[@code='u']"/> > </xsl:attribute> >+ <xsl:if test="$OPACURLOpenInNewWindow='1'"> >+ <xsl:attribute name="target">_blank</xsl:attribute> >+ </xsl:if> > <xsl:choose> > <xsl:when test="marc:subfield[@code='y' or @code='3' or @code='z']"> >- <xsl:call-template name="subfieldSelect"> >- <xsl:with-param name="codes">y3z</xsl:with-param> >+ <xsl:call-template name="subfieldSelect"> >+ <xsl:with-param name="codes">y3z</xsl:with-param> > </xsl:call-template> > </xsl:when> > <xsl:when test="not(marc:subfield[@code='y']) and not(marc:subfield[@code='3']) and not(marc:subfield[@code='z'])"> >@@ -121,7 +128,7 @@ > <xsl:when test="position()=last()"></xsl:when> > <xsl:otherwise> | </xsl:otherwise> > </xsl:choose> >- </xsl:when> >+ </xsl:when> > </xsl:choose> > </xsl:for-each> > </xsl:when> >@@ -145,8 +152,8 @@ > <xsl:otherwise> > <xsl:for-each select="$available_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]"> > <xsl:value-of select="items:homebranch"/> >- <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">[<xsl:value-of select="items:itemcallnumber"/>] >- </xsl:if> >+ <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">[<xsl:value-of select="items:itemcallnumber"/>] >+ </xsl:if> > <xsl:text> (</xsl:text> > <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/> > <xsl:text>)</xsl:text> >@@ -171,7 +178,9 @@ > <xsl:variable name="reference_items" > select="key('item-by-status', 'reference')"/> > <xsl:for-each select="$reference_items[generate-id() = generate-id(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch))[1])]"> >- <xsl:value-of select="items:homebranch"/> >+ <xsl:if test="$singleBranchMode=0"> >+ <xsl:value-of select="items:homebranch"/> >+ </xsl:if> > <xsl:if test="items:itemcallnumber != '' and items:itemcallnumber">[<xsl:value-of select="items:itemcallnumber"/>]</xsl:if> > <xsl:text> (</xsl:text> > <xsl:value-of select="count(key('item-by-status-and-branch', concat(items:status, ' ', items:homebranch)))"/> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl >index 657f314..fc4faa1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/UNIMARCslimUtils.xsl >@@ -83,8 +83,9 @@ > <xsl:template name="tag_title"> > <xsl:param name="tag" /> > <xsl:param name="label" /> >+ <xsl:param name="spanclass" /> > <xsl:if test="marc:datafield[@tag=$tag]"> >- <span class="results_summary"> >+ <span class="results_summary {$spanclass}"> > <span class="label"> > <xsl:value-of select="$label"/>: </span> > <xsl:for-each select="marc:datafield[@tag=$tag]"> >@@ -137,8 +138,9 @@ > <xsl:template name="tag_comma"> > <xsl:param name="tag" /> > <xsl:param name="label" /> >+ <xsl:param name="spanclass" /> > <xsl:if test="marc:datafield[@tag=$tag]"> >- <span class="results_summary"> >+ <span class="results_summary {$spanclass}"> > <span class="label"> > <xsl:value-of select="$label"/>: </span> > <xsl:for-each select="marc:datafield[@tag=$tag]"> >@@ -158,8 +160,8 @@ > </xsl:template> > > <xsl:template name="tag_210"> >- <span class="results_summary"> >- <span class="label">Publication:</span> >+ <span class="results_summary publication"> >+ <span class="label">Publication: </span> > <xsl:for-each select="marc:datafield[@tag=210]"> > <span> > <xsl:call-template name="addClassRtl" /> >@@ -189,7 +191,7 @@ > > <xsl:template name="tag_215"> > <xsl:for-each select="marc:datafield[@tag=215]"> >- <span class="results_summary"> >+ <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']"/> >@@ -293,8 +295,9 @@ > <xsl:template name="tag_subject"> > <xsl:param name="tag" /> > <xsl:param name="label" /> >+ <xsl:param name="spanclass" /> > <xsl:if test="marc:datafield[@tag=$tag]"> >- <span class="results_summary"> >+ <span class="results_summary subjects {$spanclass}"> > <span class="label"> > <xsl:value-of select="$label"/> > <xsl:text>: </xsl:text> >@@ -312,8 +315,9 @@ > <xsl:template name="tag_7xx"> > <xsl:param name="tag" /> > <xsl:param name="label" /> >+ <xsl:param name="spanclass" /> > <xsl:if test="marc:datafield[@tag=$tag]"> >- <span class="results_summary"> >+ <span class="results_summary author {$spanclass}"> > <span class="label"> > <xsl:value-of select="$label" /> > <xsl:text>: </xsl:text> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl >index eaded8c..17c9b67 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/compact.xsl >@@ -5,10 +5,10 @@ > <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" > xmlns="http://www.w3.org/1999/xhtml" > xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" >- xmlns:marc="http://www.loc.gov/MARC21/slim" >+ xmlns:marc="http://www.loc.gov/MARC21/slim" > exclude-result-prefixes="xsi marc" > version="1.0"> >- <xsl:output method="xml" version="1.0" encoding="UTF-8" doctype-public="-//W3C//DTD Xhtml 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" /> >+ <xsl:output method="xml" version="1.0" encoding="UTF-8" doctype-public="-//W3C//DTD Xhtml 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd" /> > <xsl:template match="/"> > <html> > <head> >@@ -19,7 +19,7 @@ > </body> > </html> > </xsl:template> >- >+ > <xsl:template match="marc:record"> > <div class="cardimage"> > <xsl:apply-templates select="marc:datafield[@tag!='082' and @tag!='092' and @tag!='010']"/> >@@ -29,11 +29,11 @@ > </span> > </div> > </xsl:template> >- >+ > <xsl:template match="marc:controlfield"> > <span class="oclc">#<xsl:value-of select="substring(.,4)"/></span> > </xsl:template> >- >+ > <xsl:template match="marc:datafield"> > <xsl:if test="starts-with(@tag, '1')"> > <p class="mainheading"><xsl:value-of select="."/></p> >@@ -80,7 +80,7 @@ > </xsl:if> > </xsl:template> > <xsl:template match="marc:subfield"> >- <xsl:if test="@code!='2'"> >+ <xsl:if test="@code!='2'"> > <xsl:if test="@code!='a'">--</xsl:if> > <xsl:value-of select="."/> > </xsl:if> >-- >1.7.10.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11310
:
23972
|
25314
|
25376