[Koha-patches] [PATCH] [SIGNED-OFF] Bug 5467: Kits shown wrong as visual material in XSLT displays

Owen Leonard oleonard at myacpl.org
Mon Dec 6 15:55:03 CET 2010


From: Katrin Fischer <katrin.fischer at bsz-bw.de>

- reused icon for mixed materials for kits
- fixed missing icon for mixed materials

Signed-off-by: Owen Leonard <oleonard at myacpl.org>
---
 .../prog/en/xslt/MARC21slim2intranetDetail.xsl     |    7 ++++---
 koha-tmpl/intranet-tmpl/prog/img/famfamfam/MX.png  |  Bin 0 -> 760 bytes
 .../prog/en/xslt/MARC21slim2OPACDetail.xsl         |    7 ++++---
 .../prog/en/xslt/MARC21slim2OPACResults.xsl        |    9 +++++----
 koha-tmpl/opac-tmpl/prog/famfamfam/MX.png          |  Bin 0 -> 760 bytes
 5 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/MX.png
 create mode 100644 koha-tmpl/opac-tmpl/prog/famfamfam/MX.png

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
index a49e04d..8867c99 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
@@ -32,10 +32,10 @@
                     </xsl:choose>
                 </xsl:when>
                 <xsl:when test="$leader6='t'">BK</xsl:when>
-                <xsl:when test="$leader6='p'">MX</xsl:when>
+                <xsl:when test="$leader6='o' or $leader6='p'">MX</xsl:when>
                 <xsl:when test="$leader6='m'">CF</xsl:when>
                 <xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='o' or $leader6='r'">VM</xsl:when>
+                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">VM</xsl:when>
                 <xsl:when test="$leader6='i' or $leader6='j'">MU</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d'">PR</xsl:when>
             </xsl:choose>
@@ -49,10 +49,11 @@
                     </xsl:choose>
                 </xsl:when>
                 <xsl:when test="$leader6='t'">Book</xsl:when>
+                <xsl:when test="$leader6='o'">Kit</xsl:when>				
                 <xsl:when test="$leader6='p'">Mixed Materials</xsl:when>
                 <xsl:when test="$leader6='m'">Computer File</xsl:when>
                 <xsl:when test="$leader6='e' or $leader6='f'">Map</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='o' or $leader6='r'">Visual Material</xsl:when>
+                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">Visual Material</xsl:when>
                 <xsl:when test="$leader6='j'">Music</xsl:when>
                 <xsl:when test="$leader6='i'">Sound</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d'">Score</xsl:when>
diff --git a/koha-tmpl/intranet-tmpl/prog/img/famfamfam/MX.png b/koha-tmpl/intranet-tmpl/prog/img/famfamfam/MX.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c856cd61593e944e09238a6c2cee7e10cb42c56
GIT binary patch
literal 760
zcmV<U0tfwxP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!ib+I4R5;6x
zl1pe)K@^6+x%Va}G1}JFD2O5=J`kUv(v_ehE))fYE~LIdrRdhBAmUQNg at Pb9D1rnO
zLB+SUBB<b_wV)QornY9$hFDEW%*~xS<Kot|#f<~AIB?EC-}(Ph)>^u|ySI)$xo}?>
za_FHfThhJj`M)!)y1Ken7-L>YP?_pt$X`6n=F1=cYufX?^<E~E>1}RqJ{J3UFP&@z
zECfL?sZm6*)=sM9 at pvfG($ccT7;|1yt+;54&pQ5j$#EP+q*g1XYJxR_XwSX$w3G!2
z8vst-96|&vgaZNsoZQ_szDA8;W-G4J{Ce716A*!AbK_$I;eFp<0>BspfZNc}Fj7}n
zH&}UjW2aN>p_1)q;jW_`Z~sC}RT&uig<tXc^tC{4xJb;c($O=*&FA0wR?sge5bVWO
znvo|V!S8Z~jq4V(V@;B~ufB6)&(cZ0T<y#w($?-|GMV07E_W>d at Cv23*T7n=wUqsU
zAEO$8$8UyegB1-$AM!t|C?yj;*oTW|<Wa|%^9t8OV1%=6YY?$mz{QgA!1sNMrRsPJ
z&g(nr=_!kt(D7Krq2dRe&h+Cb&_)m=<B3>EL?#jJ$3auL-+ at vJEf(KsTqgop6ei4H
zEY=EI2UM$i0>P`>>10YEOo!2OKty at 8ZJUOcD&T+xtAv;r<;?W~3dPa{g6#)Fg1eo#
zu8R?iO9bIJ?eC7zl$eLYAzvQk(Asl2#3=h?9%!wXum1F)FEJyIwUEtb at jRFLvtd?p
zluawwQ6HTH4*aalAvIN#h=QjS>hGUEu&8mvykvA^t`rPj{#@u;b at 0}uB at 3EX)K94=
q=1oUSfD%DjgQzmS1APn^1O5Pr0d*Bb`9~`N0000<MNUMnLSTXs9AnY|

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
index 8334a02..e7a7ddf 100755
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACDetail.xsl
@@ -35,10 +35,10 @@
                     </xsl:choose>
                 </xsl:when>
                 <xsl:when test="$leader6='t'">BK</xsl:when>
-                <xsl:when test="$leader6='p'">MX</xsl:when>
+                <xsl:when test="$leader6='o' or $leader6='p'">MX</xsl:when>
                 <xsl:when test="$leader6='m'">CF</xsl:when>
                 <xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='o' or $leader6='r'">VM</xsl:when>
+                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">VM</xsl:when>
                 <xsl:when test="$leader6='i' or $leader6='j'">MU</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d'">PR</xsl:when>
             </xsl:choose>
@@ -53,10 +53,11 @@
                     </xsl:choose>
                 </xsl:when>
                 <xsl:when test="$leader6='t'">Book</xsl:when>
+				<xsl:when test="$leader6='o'">Kit</xsl:when>
                 <xsl:when test="$leader6='p'">Mixed Materials</xsl:when>
                 <xsl:when test="$leader6='m'">Computer File</xsl:when>
                 <xsl:when test="$leader6='e' or $leader6='f'">Map</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='o' or $leader6='r'">Visual Material</xsl:when>
+                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">Visual Material</xsl:when>
                 <xsl:when test="$leader6='j'">Music</xsl:when>
                 <xsl:when test="$leader6='i'">Sound</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d'">Score</xsl:when>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
index 75d838e..397c032 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl
@@ -37,10 +37,10 @@
                     </xsl:choose>
                 </xsl:when>
                 <xsl:when test="$leader6='t'">BK</xsl:when>
-                <xsl:when test="$leader6='p'">MX</xsl:when>
+                <xsl:when test="$leader6='o' or $leader6='p'">MX</xsl:when>
                 <xsl:when test="$leader6='m'">CF</xsl:when>
                 <xsl:when test="$leader6='e' or $leader6='f'">MP</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='o' or $leader6='r'">VM</xsl:when>
+                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'">VM</xsl:when>
                 <xsl:when test="$leader6='i' or $leader6='j'">MU</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d'">PR</xsl:when>
             </xsl:choose>
@@ -522,10 +522,11 @@
                     </xsl:choose>
                 </xsl:when>
                 <xsl:when test="$leader6='t'"><img src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="book" title="book"/> Book</xsl:when>
-                <xsl:when test="$leader6='p'"><img src="/opac-tmpl/prog/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials"/>Mixed Materials</xsl:when>
+				<xsl:when test="$leader6='o'"><img src="/opac-tmpl/prog/famfamfam/silk/report_disk.png" alt="kit" title="kit"/> Kit</xsl:when>
+				<xsl:when test="$leader6='p'"><img src="/opac-tmpl/prog/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials"/>Mixed Materials</xsl:when>
                 <xsl:when test="$leader6='m'"><img src="/opac-tmpl/prog/famfamfam/silk/computer_link.png" alt="computer file" title="computer file"/> Computer File</xsl:when>
                 <xsl:when test="$leader6='e' or $leader6='f'"><img src="/opac-tmpl/prog/famfamfam/silk/map.png" alt="map" title="map"/> Map</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='o' or $leader6='r'"><img src="/opac-tmpl/prog/famfamfam/silk/film.png" alt="visual material" title="visual material"/> Visual Material</xsl:when>
+                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/opac-tmpl/prog/famfamfam/silk/film.png" alt="visual material" title="visual material"/> Visual Material</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d'"><img src="/opac-tmpl/prog/famfamfam/silk/music.png" alt="score" title="score"/> Score</xsl:when>
                 <xsl:when test="$leader6='i'"><img src="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="sound" title="sound"/> Sound</xsl:when>
                 <xsl:when test="$leader6='j'"><img src="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="music" title="music"/> Music</xsl:when>
diff --git a/koha-tmpl/opac-tmpl/prog/famfamfam/MX.png b/koha-tmpl/opac-tmpl/prog/famfamfam/MX.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c856cd61593e944e09238a6c2cee7e10cb42c56
GIT binary patch
literal 760
zcmV<U0tfwxP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!ib+I4R5;6x
zl1pe)K@^6+x%Va}G1}JFD2O5=J`kUv(v_ehE))fYE~LIdrRdhBAmUQNg at Pb9D1rnO
zLB+SUBB<b_wV)QornY9$hFDEW%*~xS<Kot|#f<~AIB?EC-}(Ph)>^u|ySI)$xo}?>
za_FHfThhJj`M)!)y1Ken7-L>YP?_pt$X`6n=F1=cYufX?^<E~E>1}RqJ{J3UFP&@z
zECfL?sZm6*)=sM9 at pvfG($ccT7;|1yt+;54&pQ5j$#EP+q*g1XYJxR_XwSX$w3G!2
z8vst-96|&vgaZNsoZQ_szDA8;W-G4J{Ce716A*!AbK_$I;eFp<0>BspfZNc}Fj7}n
zH&}UjW2aN>p_1)q;jW_`Z~sC}RT&uig<tXc^tC{4xJb;c($O=*&FA0wR?sge5bVWO
znvo|V!S8Z~jq4V(V@;B~ufB6)&(cZ0T<y#w($?-|GMV07E_W>d at Cv23*T7n=wUqsU
zAEO$8$8UyegB1-$AM!t|C?yj;*oTW|<Wa|%^9t8OV1%=6YY?$mz{QgA!1sNMrRsPJ
z&g(nr=_!kt(D7Krq2dRe&h+Cb&_)m=<B3>EL?#jJ$3auL-+ at vJEf(KsTqgop6ei4H
zEY=EI2UM$i0>P`>>10YEOo!2OKty at 8ZJUOcD&T+xtAv;r<;?W~3dPa{g6#)Fg1eo#
zu8R?iO9bIJ?eC7zl$eLYAzvQk(Asl2#3=h?9%!wXum1F)FEJyIwUEtb at jRFLvtd?p
zluawwQ6HTH4*aalAvIN#h=QjS>hGUEu&8mvykvA^t`rPj{#@u;b at 0}uB at 3EX)K94=
q=1oUSfD%DjgQzmS1APn^1O5Pr0d*Bb`9~`N0000<MNUMnLSTXs9AnY|

literal 0
HcmV?d00001

-- 
1.7.1



More information about the Koha-patches mailing list