Bugzilla – Attachment 5522 Details for
Bug 6901
Add CSS classes/ids to OPAC and staff XSLT views
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6901: Add classes to XSLT detail view in STAFF
Bug-6901-Add-classes-to-XSLT-detail-view-in-STAFF.patch (text/plain), 17.52 KB, created by
Liz Rea
on 2011-09-21 20:47:43 UTC
(
hide
)
Description:
Bug 6901: Add classes to XSLT detail view in STAFF
Filename:
MIME Type:
Creator:
Liz Rea
Created:
2011-09-21 20:47:43 UTC
Size:
17.52 KB
patch
obsolete
>From 77d57d06acabe80f83ec79fc5c725b7faeedfb55 Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <Katrin.Fischer.83@web.de> >Date: Wed, 21 Sep 2011 21:17:16 +0200 >Subject: [PATCH] Bug 6901: Add classes to XSLT detail view in STAFF >Content-Type: text/plain; charset="utf-8" > >This patch adds css classes to the fields in XSLT intranet views. >Use OpacUserCss and IntranetUserCss system preferences for altering the styling of >and hiding fields. > >The css classes are named like the labels with additional underscores >where necessary. > >Example: >.publisher { >display:none; >} > >.other_title { >font-weight: bold; >} > >Note: This patch also fixes the display of additional authors in field 880 (original >scripts like Hebrew). This small additional problem was found as a side effect of testing, where the >existence of an author in 880 would break the XSLT. > >Also moves some CSS from a style attribute into the CSS file for 880 fields. > >Signed-off-by: Liz Rea <lrea@nekls.org> > >-- minor commit message edits (requested by KF) >--- > .../intranet-tmpl/prog/en/css/staff-global.css | 8 +++ > .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 54 ++++++++++---------- > .../intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl | 25 +++++---- > 3 files changed, 48 insertions(+), 39 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >index 36cef19..2763dd2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css >@@ -1981,6 +1981,14 @@ fieldset.rows+h3 {clear:both;padding-top:.5em;} > padding-bottom: 10px; > } > >+.m880 { >+ display:block; >+ text-align:right; >+ float:right; >+ width:50%; >+ padding-left:20px >+} >+ > #advanced-search fieldset { > border : 1px solid #EEE; > -moz-border-radius : 3px; >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >index 4af47bd..112a809 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl >@@ -15,8 +15,7 @@ > > <!-- Option: Display Alternate Graphic Representation (MARC 880) --> > <xsl:variable name="display880" select="boolean(marc:datafield[@tag=880])"/> >- >- <xsl:variable name="UseControlNumber" select="marc:sysprefs/marc:syspref[@name='UseControlNumber']"/> >+ <xsl:variable name="UseControlNumber" select="marc:sysprefs/marc:syspref[@name='UseControlNumber']"/> > <xsl:variable name="URLLinkText" select="marc:sysprefs/marc:syspref[@name='URLLinkText']"/> > <xsl:variable name="OPACBaseURL" select="marc:sysprefs/marc:syspref[@name='OPACBaseURL']"/> > <xsl:variable name="SubjectModifier"><xsl:if test="marc:sysprefs/marc:syspref[@name='TraceCompleteSubfields']='1'">,complete-subfield</xsl:if></xsl:variable> >@@ -119,6 +118,7 @@ > <xsl:with-param name="basetags">100,110,111,700,710,711</xsl:with-param> > <xsl:with-param name="codes">abc</xsl:with-param> > <xsl:with-param name="index">au</xsl:with-param> >+ <xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/> > <!-- do not use label 'by ' here, it would be repeated for every occurence of 100,110,111,700,710,711 --> > </xsl:call-template> > </h5> >@@ -129,7 +129,7 @@ > <xsl:call-template name="showAuthor"><xsl:with-param name="authorfield" select="marc:datafield[@tag=700 or @tag=710 or @tag=711]"/><xsl:with-param name="UseAuthoritiesForTracings" select="$UseAuthoritiesForTracings"/></xsl:call-template> > > <xsl:if test="$materialTypeCode!=''"> >- <span class="results_summary"><span class="label">Type: </span> >+ <span class="results_summary type"><span class="label">Type: </span> > <xsl:element name="img"><xsl:attribute name="src">/intranet-tmpl/prog/img/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt"></xsl:attribute></xsl:element> > <xsl:text> </xsl:text> > <xsl:value-of select="$materialTypeLabel"/> >@@ -141,7 +141,7 @@ > <xsl:call-template name="m880Select"> > <xsl:with-param name="basetags">440,490</xsl:with-param> > <xsl:with-param name="codes">av</xsl:with-param> >- <xsl:with-param name="class">results_summary</xsl:with-param> >+ <xsl:with-param name="class">results_summary series</xsl:with-param> > <xsl:with-param name="label">Series: </xsl:with-param> > <xsl:with-param name="index">se</xsl:with-param> > </xsl:call-template> >@@ -149,7 +149,7 @@ > > <!-- Series --> > <xsl:if test="marc:datafield[@tag=440 or @tag=490]"> >- <span class="results_summary"><span class="label">Series: </span> >+ <span class="results_summary series"><span class="label">Series: </span> > <!-- 440 --> > <xsl:for-each select="marc:datafield[@tag=440]"> > <a href="/cgi-bin/koha/catalogue/search.pl?q=se:{marc:subfield[@code='a']}"> >@@ -218,7 +218,7 @@ > > <!-- Analytics --> > <xsl:if test="$leader7='s'"> >- <span class="results_summary"><span class="label">Analytics: </span> >+ <span class="results_summary analytics"><span class="label">Analytics: </span> > <a> > <xsl:choose> > <xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]"> >@@ -235,7 +235,7 @@ > > <!-- Volumes of sets and traced series --> > <xsl:if test="$materialTypeCode='ST' or substring($controlField008,22,1)='m'"> >- <span class="results_summary"><span class="label">Volumes: </span> >+ <span class="results_summary volumes"><span class="label">Volumes: </span> > <a> > <xsl:choose> > <xsl:when test="$UseControlNumber = '1' and marc:controlfield[@tag=001]"> >@@ -252,7 +252,7 @@ > > <!-- Set --> > <xsl:if test="$leader19='c'"> >- <span class="results_summary"><span class="label">Set: </span> >+ <span class="results_summary set"><span class="label">Set: </span> > <xsl:for-each select="marc:datafield[@tag=773]"> > <a> > <xsl:choose> >@@ -278,13 +278,13 @@ > <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> > > <xsl:if test="marc:datafield[@tag=260]"> >- <span class="results_summary"><span class="label">Publisher: </span> >+ <span class="results_summary publisher"><span class="label">Publisher: </span> > <xsl:for-each select="marc:datafield[@tag=260]"> > <xsl:if test="marc:subfield[@code='b']"> > <a href="/cgi-bin/koha/catalogue/search.pl?q=pb:{marc:subfield[@code='b']}"> >@@ -311,13 +311,13 @@ > <xsl:call-template name="m880Select"> > <xsl:with-param name="basetags">250</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="class">results_summary edition</xsl:with-param> > <xsl:with-param name="label">Edition: </xsl:with-param> > </xsl:call-template> > </xsl:if> > > <xsl:if test="marc:datafield[@tag=250]"> >- <span class="results_summary"><span class="label">Edition: </span> >+ <span class="results_summary edition"><span class="label">Edition: </span> > <xsl:for-each select="marc:datafield[@tag=250]"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> >@@ -336,13 +336,13 @@ > <xsl:call-template name="m880Select"> > <xsl:with-param name="basetags">300</xsl:with-param> > <xsl:with-param name="codes">abceg</xsl:with-param> >- <xsl:with-param name="class">results_summary</xsl:with-param> >+ <xsl:with-param name="class">results_summary description</xsl:with-param> > <xsl:with-param name="label">Description: </xsl:with-param> > </xsl:call-template> > </xsl:if> > > <xsl:if test="marc:datafield[@tag=300]"> >- <span class="results_summary"><span class="label">Description: </span> >+ <span class="results_summary description"><span class="label">Description: </span> > <xsl:for-each select="marc:datafield[@tag=300]"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> >@@ -357,7 +357,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=020]"> >- <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=020]"> > <xsl:variable name="isbn" select="marc:subfield[@code='a']"/> > <xsl:value-of select="marc:subfield[@code='a']"/> >@@ -367,7 +367,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=022]"> >- <span class="results_summary"><span class="label">ISSN: </span> >+ <span class="results_summary issn"><span class="label">ISSN: </span> > <xsl:for-each select="marc:datafield[@tag=022]"> > <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> >@@ -380,13 +380,13 @@ > <xsl:call-template name="m880Select"> > <xsl:with-param name="basetags">246</xsl:with-param> > <xsl:with-param name="codes">abhfgnp</xsl:with-param> >- <xsl:with-param name="class">results_summary</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="label">Other Title: </span> >+ <span class="results_summary other_title"><span class="label">Other Title: </span> > <xsl:for-each select="marc:datafield[@tag=246]"> > <xsl:call-template name="chopPunctuation"> > <xsl:with-param name="chopString"> >@@ -405,13 +405,13 @@ > <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</xsl:with-param> >+ <xsl:with-param name="class">results_summary uniform_title</xsl:with-param> > <xsl:with-param name="label">Uniform Title: </xsl:with-param> > </xsl:call-template> > </xsl:if> > > <xsl:if test="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]"> >- <span class="results_summary"><span class="label">Uniform titles: </span> >+ <span class="results_summary uniform_title"><span class="label">Uniform titles: </span> > <xsl:for-each select="marc:datafield[@tag=130]|marc:datafield[@tag=240]|marc:datafield[@tag=730][@ind2!=2]"> > <xsl:variable name="str"> > <xsl:for-each select="marc:subfield"> >@@ -433,7 +433,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[substring(@tag, 1, 1) = '6']"> >- <span class="results_summary"><span class="label">Subject(s): </span> >+ <span class="results_summary subjects"><span class="label">Subject(s): </span> > <xsl:for-each select="marc:datafield[substring(@tag, 1, 1) = '6']"> > <a> > <xsl:choose> >@@ -473,7 +473,7 @@ > </xsl:if> > > <xsl:if test="marc:datafield[@tag=856]"> >- <span class="results_summary"><span class="label">Online Resources: </span> >+ <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><xsl:attribute name="href"><xsl:value-of select="marc:subfield[@code='u']"/></xsl:attribute> >@@ -508,7 +508,7 @@ > </xsl:if> > <xsl:if test="marc:datafield[@tag=505]"> > <xsl:for-each select="marc:datafield[@tag=505]"> >- <span class="results_summary"> >+ <span class="results_summary contents"> > <xsl:choose> > <xsl:when test="@ind1=0"> > <span class="label">Contents:</span> >@@ -540,7 +540,7 @@ > <xsl:if test="marc:datafield[@tag=773]"> > <xsl:for-each select="marc:datafield[@tag=773]"> > <xsl:if test="@ind1=0"> >- <span class="results_summary"><span class="label"> >+ <span class="results_summary in"><span class="label"> > <xsl:choose> > <xsl:when test="@ind2=' '"> > In: >@@ -583,7 +583,7 @@ > > <!-- 775 Other Edition --> > <xsl:if test="marc:datafield[@tag=775]"> >- <span class="results_summary"><span class="label">Other Editions: </span> >+ <span class="results_summary other_editions"><span class="label">Other Editions: </span> > <xsl:for-each select="marc:datafield[@tag=775]"> > <xsl:if test="marc:subfield[@code='i']"> > <xsl:call-template name="subfieldSelect"> >@@ -616,7 +616,7 @@ > <xsl:if test="marc:datafield[@tag=780]"> > <xsl:for-each select="marc:datafield[@tag=780]"> > <xsl:if test="@ind1=0"> >- <span class="results_summary"> >+ <span class="results_summary preceeding_entry"> > <xsl:choose> > <xsl:when test="@ind2=0"> > <span class="label">Continues:</span> >@@ -673,7 +673,7 @@ > <!-- 785 --> > <xsl:if test="marc:datafield[@tag=785]"> > <xsl:for-each select="marc:datafield[@tag=785]"> >- <span class="results_summary"> >+ <span class="results_summary succeeding_entry"> > <xsl:choose> > <xsl:when test="@ind2=0"> > <span class="label">Continued by:</span> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >index 05a1d83..cfc434e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slimUtils.xsl >@@ -101,7 +101,7 @@ > - displays every field on a separate line (to switch between rtl and ltr) > * Pitfalls: > (!) output might be empty >- --> >+ --> > <xsl:template name="m880Select"> > <xsl:param name="basetags"/> <!-- e.g. 100,700,110,710 --> > <xsl:param name="codes"/> <!-- e.g. abc --> >@@ -109,23 +109,24 @@ > <xsl:param name="label"/> <!-- e.g. Edition --> > <xsl:param name="bibno"/> > <xsl:param name="index"/> <!-- e.g. au --> >+ <xsl:param name="UseAuthoritiesForTracings"/> > > <xsl:for-each select="marc:datafield[@tag=880]"> > <xsl:variable name="code6" select="marc:subfield[@code=6]"/> > <xsl:if test="contains(string($basetags), substring($code6,1,3))"> > <span> >- <xsl:if test="boolean($class)"> >- <xsl:attribute name="class"><xsl:value-of select="$class"/></xsl:attribute> >- </xsl:if> > <xsl:choose> >- <!-- display right-to-left tags floating right of their left-to-right counterparts --> >- <xsl:when test="substring($code6,string-length($code6)-1,2) ='/r'"> >- <xsl:attribute name="style">display:block; text-align:right; float:right; width:50%; padding-left:20px</xsl:attribute> >- <xsl:attribute name="dir">rtl</xsl:attribute> >- </xsl:when> >- <xsl:otherwise> >- <xsl:attribute name="style">display:block; </xsl:attribute> >- </xsl:otherwise> >+ <xsl:when test="boolean($class) and substring($code6,string-length($code6)-1,2) ='/r'"> >+ <xsl:attribute name="class"><xsl:value-of select="$class"/> m880</xsl:attribute> >+ <xsl:attribute name="dir">rtl</xsl:attribute> >+ </xsl:when> >+ <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 test="substring($code6,string-length($code6)-1,2) ='/r'"> >+ <xsl:attribute name="class"><xsl:value-of select="$class"/> m880</xsl:attribute> >+ </xsl:when> > </xsl:choose> > <xsl:if test="boolean($label)"> > <span class="label"> >-- >1.7.2.5
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 6901
:
5519
|
5520
|
5521
| 5522 |
5523