From 8ec52a8e23695f2277aaae4a9d216ea8fb079064 Mon Sep 17 00:00:00 2001
From: Magnus Enger <magnus@enger.priv.no>
Date: Sun, 23 Sep 2012 12:28:49 +0200
Subject: [PATCH] Bug 8793 - Fix materialTypeCode/typeOf008 icons for NORMARC
 XSLT

This patch fixes some issues with icons related to materialtypes in NORMARC:

Remove references to opac-tmpl in the *intranet* NORMARC XSLT files.

Add two new icons to koha-tmpl/intranet-tmpl/prog/img/famfamfam/ and
koha-tmpl/opac-tmpl/lib/famfamfam/
GR.png - Graphical materials
TD.png - Three dimentional objects

Copy PR.png from koha-tmpl/intranet-tmpl/prog/img/famfamfam/ to
koha-tmpl/opac-tmpl/lib/famfamfam/

Rename the XSLT variable materialTypeCode to typeOf008 for increased consistency
between stylesheets.

Make sure the XSLT uses icons that are actually available.

To test:
- No use testing all the different permutations of leader pos. 06 and 019b, I think.
- Set marcflavour = NORMARC and turn on default XSLT for OPAC and Intranet, details
  and results.
- Make sure you have a record with something relevant in leader position 6, like
  g for movies or c for music
- Check that the icon turns up in results and details, in the OPAC and Intranet
- Toggle DisplayOPACiconsXSLT and check that the results in the OPAC are as expected

Signed-off-by: Mirko Tietgen <mirko@abunchofthings.net>
Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---
 .../en/xslt/NORMARCslim2intranetDetail.xsl    |  40 +++++++-----------
 .../en/xslt/NORMARCslim2intranetResults.xsl   |  24 +++++------
 .../intranet-tmpl/prog/img/famfamfam/GR.png   | Bin 0 -> 606 bytes
 .../intranet-tmpl/prog/img/famfamfam/TD.png   | Bin 0 -> 452 bytes
 koha-tmpl/opac-tmpl/lib/famfamfam/GR.png      | Bin 0 -> 606 bytes
 koha-tmpl/opac-tmpl/lib/famfamfam/PR.png      | Bin 0 -> 385 bytes
 koha-tmpl/opac-tmpl/lib/famfamfam/TD.png      | Bin 0 -> 452 bytes
 .../prog/en/xslt/NORMARCslim2OPACDetail.xsl   |  40 +++++++-----------
 .../prog/en/xslt/NORMARCslim2OPACResults.xsl  |  27 ++++++------
 9 files changed, 56 insertions(+), 75 deletions(-)
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/GR.png
 create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/TD.png
 create mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/GR.png
 create mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/PR.png
 create mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/TD.png

diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
index 5ea4fc7833..25b661e056 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetDetail.xsl
@@ -37,7 +37,8 @@
         <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
         <xsl:variable name="field019b" select="marc:datafield[@tag=019]/marc:subfield[@code='b']"/>
         <xsl:variable name="biblionumber" select="marc:datafield[@tag=999]/marc:subfield[@code='c']"/>
-        <xsl:variable name="materialTypeCode">
+        <xsl:variable name="typeOf008">
+            <!-- The logic here should be exactly the same for NORMARCslim2intranetDetail.xsl, NORMARCslim2intranetResults.xsl, NORMARCslim2OPACDetail.xsl and NORMARCslim2OPACResults.xsl -->
             <xsl:choose>
                 <xsl:when test="$field019b='b' or $field019b='k' or $field019b='l' or $leader6='b'">Mon</xsl:when>
                 <xsl:when test="$field019b='e' or contains($field019b,'ec') or contains($field019b,'ed') or contains($field019b,'ee') or contains($field019b,'ef') or $leader6='g'">FV</xsl:when>
@@ -55,25 +56,6 @@
                 </xsl:when>
             </xsl:choose>
         </xsl:variable>
-        <xsl:variable name="materialTypeLabel">
-                        <xsl:choose>
-                <xsl:when test="$field019b='b' or $field019b='k' or $field019b='l' or $leader6='b'">Bok</xsl:when>
-                <xsl:when test="$field019b='e' or contains($field019b,'ec') or contains($field019b,'ed') or contains($field019b,'ee') or contains($field019b,'ef') or $leader6='g'">Film og video</xsl:when>
-                <xsl:when test="$field019b='c' or $field019b='d' or contains($field019b,'da') or contains($field019b,'db') or contains($field019b,'dc') or contains($field019b,'dd') or contains($field019b,'dg') or contains($field019b,'dh') or contains($field019b,'di') or contains($field019b,'dj') or contains($field019b,'dk') or $leader6='c' or $leader6='d' or $leader6='i' or $leader6='j'">Musikalier</xsl:when>
-                <xsl:when test="$field019b='a' or contains($field019b,'ab') or contains($field019b,'aj') or $leader6='e' or $leader6='f'">Kart</xsl:when>
-                <xsl:when test="$field019b='f' or $field019b='i' or contains($field019b,'ib') or contains($field019b,'ic') or contains($field019b,'fd') or contains($field019b,'ff') or contains($field019b,'fi') or $leader6='k'">Grafisk materiale</xsl:when>
-                <xsl:when test="$field019b='g' or contains($field019b,'gb') or contains($field019b,'gd') or contains($field019b,'ge') or $leader6='m'">Fil</xsl:when>
-                <xsl:when test="$leader6='o'">Kombidokument</xsl:when>
-                <xsl:when test="$field019b='h' or $leader6='r'">Tredimensjonal gjenstand</xsl:when>
-                <xsl:when test="$field019b='j' or $leader6='a'">
-                    <xsl:choose>
-                        <xsl:when test="$leader7='a' or $leader7='c' or $leader7='m' or $leader7='p'">Bok</xsl:when>
-                        <xsl:when test="$field019b='j' or $leader7='b' or $leader7='s'">Periodikum</xsl:when>
-                    </xsl:choose>
-                </xsl:when>
-            </xsl:choose>
-
-        </xsl:variable>
 
         <!-- Tittel og ansvarsopplysninger -->
         <xsl:if test="marc:datafield[@tag=245]">
@@ -155,10 +137,20 @@
         </xsl:choose>
 
 
-        <xsl:if test="$materialTypeCode!=''">
-        <span class="results_summary"><span class="label">Materialtype: </span>
-        <xsl:element name="img"><xsl:attribute name="src">/opac-tmpl/prog/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt"></xsl:attribute></xsl:element>
-        <xsl:value-of select="$materialTypeLabel"/>
+        <xsl:if test="$typeOf008!=''">
+        <span class="results_summary">
+            <span class="label">Materialtype: </span>
+            <xsl:choose>
+                <xsl:when test="$typeOf008='Mon'"><img src="/intranet-tmpl/prog/img/famfamfam/BK.png" alt="Bok" title="Bok"/> Bok</xsl:when>
+                <xsl:when test="$typeOf008='Per'"><img src="/intranet-tmpl/prog/img/famfamfam/AR.png" alt="Periodika" title="Periodika"/> Periodika</xsl:when>
+                <xsl:when test="$typeOf008='Fil'"><img src="/intranet-tmpl/prog/img/famfamfam/CF.png" alt="Fil" title="Fil"/> Fil</xsl:when>
+                <xsl:when test="$typeOf008='Kar'"><img src="/intranet-tmpl/prog/img/famfamfam/MP.png" alt="Kart" title="Kart"/> Kart</xsl:when>
+                <xsl:when test="$typeOf008='FV'"><img  src="/intranet-tmpl/prog/img/famfamfam/VM.png" alt="Film og video" title="Film og video"/> Film og video</xsl:when>
+                <xsl:when test="$typeOf008='Mus'"><img src="/intranet-tmpl/prog/img/famfamfam/PR.png" alt="Musikktrykk og lydopptak" title="Musikktrykk og lydopptak"/> Musikk</xsl:when>
+                <xsl:when test="$typeOf008='gra'"><img src="/intranet-tmpl/prog/img/famfamfam/GR.png" alt="Grafisk materiale" title="Grafisk materiale"/> Grafisk materiale</xsl:when>
+                <xsl:when test="$typeOf008='kom'"><img src="/intranet-tmpl/prog/img/famfamfam/MX.png" alt="Kombidokumenter" title="Kombidokumenter"/> Kombidokumenter</xsl:when>
+                <xsl:when test="$typeOf008='trd'"><img src="/intranet-tmpl/prog/img/famfamfam/TD.png" alt="Tre-dimensjonale gjenstander" title="Tre-dimensjonale gjenstander"/> Tre-dimensjonale gjenstander</xsl:when>
+            </xsl:choose>
         </span>
         </xsl:if>
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl
index 5ee95ffee2..e593284304 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl
+++ b/koha-tmpl/intranet-tmpl/prog/en/xslt/NORMARCslim2intranetResults.xsl
@@ -33,9 +33,8 @@
         <xsl:variable name="controlField007-01" select="substring($controlField007,2,1)"/>
         <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
         <xsl:variable name="field019b" select="marc:datafield[@tag=019]/marc:subfield[@code='b']"/>
-
         <xsl:variable name="typeOf008">
-        <!-- Codes with upper case first letter below are from the NORMARC standard, lower case first letter are made up. -->
+            <!-- The logic here should be exactly the same for NORMARCslim2intranetDetail.xsl, NORMARCslim2intranetResults.xsl, NORMARCslim2OPACDetail.xsl and NORMARCslim2OPACResults.xsl -->
             <xsl:choose>
                 <xsl:when test="$field019b='b' or $field019b='k' or $field019b='l' or $leader6='b'">Mon</xsl:when>
                 <xsl:when test="$field019b='e' or contains($field019b,'ec') or contains($field019b,'ed') or contains($field019b,'ee') or contains($field019b,'ef') or $leader6='g'">FV</xsl:when>
@@ -385,18 +384,17 @@
 
     <span class="results_summary">
     <xsl:if test="$typeOf008!=''">
-        <span class="label">Type: </span>
-
+        <span class="label">Materialtype: </span>
             <xsl:choose>
-                <xsl:when test="$typeOf008='Mon'"><img src="/opac-tmpl/prog/famfamfam/silk/book.png" alt="Bok" title="Bok"/> Bok</xsl:when>
-                <xsl:when test="$typeOf008='Per'"><img src="/opac-tmpl/prog/famfamfam/silk/newspaper.png" alt="Periodika" title="Periodika"/> Periodika</xsl:when>
-                <xsl:when test="$typeOf008='Fil'"><img src="/opac-tmpl/prog/famfamfam/silk/computer_link.png" alt="Fil" title="Fil"/> Fil</xsl:when>
-                <xsl:when test="$typeOf008='Kar'"><img src="/opac-tmpl/prog/famfamfam/silk/map.png" alt="Kart" title="Kart"/> Kart</xsl:when>
-                <xsl:when test="$typeOf008='FV'"><img src="/opac-tmpl/prog/famfamfam/silk/film.png" alt="Film og video" title="Film og video"/> Film og video</xsl:when>
-                <xsl:when test="$typeOf008='Mus'"><img src="/opac-tmpl/prog/famfamfam/silk/sound.png" alt="Musikktrykk og lydopptak" title="Musikktrykk og lydopptak"/> Musikk</xsl:when>
-                <xsl:when test="$typeOf008='gra'"> Grafisk materiale</xsl:when>
-                <xsl:when test="$typeOf008='kom'"> Kombidokumenter</xsl:when>
-                <xsl:when test="$typeOf008='trd'"> Tre-dimensjonale gjenstander</xsl:when>
+                <xsl:when test="$typeOf008='Mon'"><img src="/intranet-tmpl/prog/img/famfamfam/BK.png" alt="Bok" title="Bok"/> Bok</xsl:when>
+                <xsl:when test="$typeOf008='Per'"><img src="/intranet-tmpl/prog/img/famfamfam/AR.png" alt="Periodika" title="Periodika"/> Periodika</xsl:when>
+                <xsl:when test="$typeOf008='Fil'"><img src="/intranet-tmpl/prog/img/famfamfam/CF.png" alt="Fil" title="Fil"/> Fil</xsl:when>
+                <xsl:when test="$typeOf008='Kar'"><img src="/intranet-tmpl/prog/img/famfamfam/MP.png" alt="Kart" title="Kart"/> Kart</xsl:when>
+                <xsl:when test="$typeOf008='FV'"><img  src="/intranet-tmpl/prog/img/famfamfam/VM.png" alt="Film og video" title="Film og video"/> Film og video</xsl:when>
+                <xsl:when test="$typeOf008='Mus'"><img src="/intranet-tmpl/prog/img/famfamfam/PR.png" alt="Musikktrykk og lydopptak" title="Musikktrykk og lydopptak"/> Musikk</xsl:when>
+                <xsl:when test="$typeOf008='gra'"><img src="/intranet-tmpl/prog/img/famfamfam/GR.png" alt="Grafisk materiale" title="Grafisk materiale"/> Grafisk materiale</xsl:when>
+                <xsl:when test="$typeOf008='kom'"><img src="/intranet-tmpl/prog/img/famfamfam/MX.png" alt="Kombidokumenter" title="Kombidokumenter"/> Kombidokumenter</xsl:when>
+                <xsl:when test="$typeOf008='trd'"><img src="/intranet-tmpl/prog/img/famfamfam/TD.png" alt="Tre-dimensjonale gjenstander" title="Tre-dimensjonale gjenstander"/> Tre-dimensjonale gjenstander</xsl:when>
             </xsl:choose>
     </xsl:if>
     <xsl:if test="string-length(normalize-space($physicalDescription))">
diff --git a/koha-tmpl/intranet-tmpl/prog/img/famfamfam/GR.png b/koha-tmpl/intranet-tmpl/prog/img/famfamfam/GR.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a158fef7e0da8fd19525f574f2c4966443866cf
GIT binary patch
literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz@JU2LR5;6}
zlRaxxK@^6cGxy%T_a+Owkd0v@QIddQ5yVtR|A2*sja5=uNcw<{Kf>Q2rnAt>LM%-F
zK|rtwgcU)}7x~z1Hrcs5bH*ZO$!>xO8K#?==bZPQ_ecnV>#P`H`QzGaRhd62G_&rC
zTLU$c7_x*nFP_dW#Q+*);mM<k(JaeEB>HE?j)HexK784D4x9l_tfpz2$@1y}9rkF+
zI+J5N<Vh13l>MWeZyObc!d+rUc=>D+uOdAOg#%+Ej6h+wn5^xPmVVH*Eu446Y0A_@
zo$rlds-+sL10Db<V2ohHE~Vsv!_y|#cPO00g*IuL(zZDxxgijG#`FV32u`uSOUGGG
zyOu&7UIFP6)Ds)w;?J3$(cuh`F-ogFOd!Fk$2yNliFT_@xin4`83=M&LI`IP%F#`J
zZEaJ@HW?Z=q~bW<A7Xo}PQ5ZkY~*qd!bL!GgYo=6Ki5{MmVYDOlXOP8HN8MNtK(Js
zV$s*Z`raa56|c%2yUX0fZ4_v1Zu9B*6?&woD)4!rgAfql@$6FXAeuSkq`gPB`IXwk
zMdqWVFPY~)#sG3fUVUE0=T&TN`ieXbn3yHfM7x!HV-G;&FDjhxOOKr^h$9I-Kq;1Y
s?^hagg%30TGn{b*iQz4PTz8!R00wW`ldl!TzW@LL07*qoM6N<$g6(7tz5oCK

literal 0
HcmV?d00001

diff --git a/koha-tmpl/intranet-tmpl/prog/img/famfamfam/TD.png b/koha-tmpl/intranet-tmpl/prog/img/famfamfam/TD.png
new file mode 100644
index 0000000000000000000000000000000000000000..7851cf34c946e5667221e3478668503eb1cd733f
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzR!KxbR2Ufr
z!9Pe;0RRW!@7<lIl3o%R*`Lh}3L0v44WhBhrLn=H)^JZ~X)lPPp*Ym3y&;EiD#3^_
z;}R2s(2l&aJKy{DeMJDQEOc(}O)|dId@(Z*AR=OUqSZ^1Bx&_tPDVr&v9i#a-8-w+
zG-X<R@>Pdwe5?6tW?r-ok|b$oDQj8FV%kZPq;(MWOV8?8;<)(iP}>h<N+(r5>NMU>
z7fbz%jjlr7h8uuoQ~J6}n}@Y@PdTk=)PxO{%7zmL?dchpZX*~n;I{!C>*(8cU;q(~
zAS%Po_@naEU!xidrBXD?;hN|x^%W|Ij)0y*r5vi|?W&Fub(NqJ@z0o=O<Ao~*SBxI
z`SL+wOarB!5l6MHf7`vAYen#UBKI<P{@6LCZG|0M`+1T_cfL~u@bp6FGkdxCW!wI8
u9^8Hp6am2FtGS=SJe+$CKoI}{0Kk9KAGswB^FYP`0000<MNUMnLSTXd=EXk%

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/GR.png b/koha-tmpl/opac-tmpl/lib/famfamfam/GR.png
new file mode 100644
index 0000000000000000000000000000000000000000..4a158fef7e0da8fd19525f574f2c4966443866cf
GIT binary patch
literal 606
zcmV-k0-^nhP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz@JU2LR5;6}
zlRaxxK@^6cGxy%T_a+Owkd0v@QIddQ5yVtR|A2*sja5=uNcw<{Kf>Q2rnAt>LM%-F
zK|rtwgcU)}7x~z1Hrcs5bH*ZO$!>xO8K#?==bZPQ_ecnV>#P`H`QzGaRhd62G_&rC
zTLU$c7_x*nFP_dW#Q+*);mM<k(JaeEB>HE?j)HexK784D4x9l_tfpz2$@1y}9rkF+
zI+J5N<Vh13l>MWeZyObc!d+rUc=>D+uOdAOg#%+Ej6h+wn5^xPmVVH*Eu446Y0A_@
zo$rlds-+sL10Db<V2ohHE~Vsv!_y|#cPO00g*IuL(zZDxxgijG#`FV32u`uSOUGGG
zyOu&7UIFP6)Ds)w;?J3$(cuh`F-ogFOd!Fk$2yNliFT_@xin4`83=M&LI`IP%F#`J
zZEaJ@HW?Z=q~bW<A7Xo}PQ5ZkY~*qd!bL!GgYo=6Ki5{MmVYDOlXOP8HN8MNtK(Js
zV$s*Z`raa56|c%2yUX0fZ4_v1Zu9B*6?&woD)4!rgAfql@$6FXAeuSkq`gPB`IXwk
zMdqWVFPY~)#sG3fUVUE0=T&TN`ieXbn3yHfM7x!HV-G;&FDjhxOOKr^h$9I-Kq;1Y
s?^hagg%30TGn{b*iQz4PTz8!R00wW`ldl!TzW@LL07*qoM6N<$g6(7tz5oCK

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/PR.png b/koha-tmpl/opac-tmpl/lib/famfamfam/PR.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8b3ede3df956f8d505543b190bc8d1b5b4dce75
GIT binary patch
literal 385
zcmV-{0e=38P)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz6G=otR2Uh3
z!7)ohQ5b;X_uh^agam;kVNESTgG+0}-TMdC4+sSJhH`b0hQ@}w^amOmT`LTP5Uj~T
z9HJ!3P|x=rPX%%A5coWiXFfx4=^cuq2#O#m?-+tHdpI198H&T<IL8n;lp8vXaVUAV
z*+nq~7RNJJ5q}PR8B0tc2%b!gAjAX~MafJNl$gLG2pNka!~}w3$#|v+hQKjJ_;r+M
zIw@`Nh8-GyoF$S@OGRGsLpZFiG}bBLxJ9lb&uMkJQD7D2j)ydVzjd+6A~Sk4c}dL4
z@mixu4xvYf&(!W1geAIk`Kt7rX1Fk6M2;uAj4JIW&2s0lZX<0`>klCE>?a@fNhGaV
ftv%qM$TQzJ6;XjO8erVL00000NkvXXu0mjfw}q7O

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/TD.png b/koha-tmpl/opac-tmpl/lib/famfamfam/TD.png
new file mode 100644
index 0000000000000000000000000000000000000000..7851cf34c946e5667221e3478668503eb1cd733f
GIT binary patch
literal 452
zcmV;#0XzPQP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzR!KxbR2Ufr
z!9Pe;0RRW!@7<lIl3o%R*`Lh}3L0v44WhBhrLn=H)^JZ~X)lPPp*Ym3y&;EiD#3^_
z;}R2s(2l&aJKy{DeMJDQEOc(}O)|dId@(Z*AR=OUqSZ^1Bx&_tPDVr&v9i#a-8-w+
zG-X<R@>Pdwe5?6tW?r-ok|b$oDQj8FV%kZPq;(MWOV8?8;<)(iP}>h<N+(r5>NMU>
z7fbz%jjlr7h8uuoQ~J6}n}@Y@PdTk=)PxO{%7zmL?dchpZX*~n;I{!C>*(8cU;q(~
zAS%Po_@naEU!xidrBXD?;hN|x^%W|Ij)0y*r5vi|?W&Fub(NqJ@z0o=O<Ao~*SBxI
z`SL+wOarB!5l6MHf7`vAYen#UBKI<P{@6LCZG|0M`+1T_cfL~u@bp6FGkdxCW!wI8
u9^8Hp6am2FtGS=SJe+$CKoI}{0Kk9KAGswB^FYP`0000<MNUMnLSTXd=EXk%

literal 0
HcmV?d00001

diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl
index 2d6d65ff46..299dfee048 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACDetail.xsl
@@ -38,7 +38,8 @@
         <xsl:variable name="leader7" select="substring($leader,8,1)"/>
         <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
         <xsl:variable name="field019b" select="marc:datafield[@tag=019]/marc:subfield[@code='b']"/>
-        <xsl:variable name="materialTypeCode">
+        <xsl:variable name="typeOf008">
+            <!-- The logic here should be exactly the same for NORMARCslim2intranetDetail.xsl, NORMARCslim2intranetResults.xsl, NORMARCslim2OPACDetail.xsl and NORMARCslim2OPACResults.xsl -->
             <xsl:choose>
                 <xsl:when test="$field019b='b' or $field019b='k' or $field019b='l' or $leader6='b'">Mon</xsl:when>
                 <xsl:when test="$field019b='e' or contains($field019b,'ec') or contains($field019b,'ed') or contains($field019b,'ee') or contains($field019b,'ef') or $leader6='g'">FV</xsl:when>
@@ -56,25 +57,6 @@
                 </xsl:when>
             </xsl:choose>
         </xsl:variable>
-        <xsl:variable name="materialTypeLabel">
-                        <xsl:choose>
-                <xsl:when test="$field019b='b' or $field019b='k' or $field019b='l' or $leader6='b'">Bok</xsl:when>
-                <xsl:when test="$field019b='e' or contains($field019b,'ec') or contains($field019b,'ed') or contains($field019b,'ee') or contains($field019b,'ef') or $leader6='g'">Film og video</xsl:when>
-                <xsl:when test="$field019b='c' or $field019b='d' or contains($field019b,'da') or contains($field019b,'db') or contains($field019b,'dc') or contains($field019b,'dd') or contains($field019b,'dg') or contains($field019b,'dh') or contains($field019b,'di') or contains($field019b,'dj') or contains($field019b,'dk') or $leader6='c' or $leader6='d' or $leader6='i' or $leader6='j'">Musikalier</xsl:when>
-                <xsl:when test="$field019b='a' or contains($field019b,'ab') or contains($field019b,'aj') or $leader6='e' or $leader6='f'">Kart</xsl:when>
-                <xsl:when test="$field019b='f' or $field019b='i' or contains($field019b,'ib') or contains($field019b,'ic') or contains($field019b,'fd') or contains($field019b,'ff') or contains($field019b,'fi') or $leader6='k'">Grafisk materiale</xsl:when>
-                <xsl:when test="$field019b='g' or contains($field019b,'gb') or contains($field019b,'gd') or contains($field019b,'ge') or $leader6='m'">Fil</xsl:when>
-                <xsl:when test="$leader6='o'">Kombidokument</xsl:when>
-                <xsl:when test="$field019b='h' or $leader6='r'">Tredimensjonal gjenstand</xsl:when>
-                <xsl:when test="$field019b='j' or $leader6='a'">
-                    <xsl:choose>
-                        <xsl:when test="$leader7='a' or $leader7='c' or $leader7='m' or $leader7='p'">Bok</xsl:when>
-                        <xsl:when test="$field019b='j' or $leader7='b' or $leader7='s'">Periodikum</xsl:when>
-                    </xsl:choose>
-                </xsl:when>
-            </xsl:choose>
-
-        </xsl:variable>
 
         <!-- Tittel og ansvarsopplysninger -->
         <xsl:if test="marc:datafield[@tag=245]">
@@ -174,10 +156,20 @@
         </xsl:choose>
 
     <xsl:if test="$DisplayOPACiconsXSLT!='0'">
-        <xsl:if test="$materialTypeCode!=''">
-        <span class="results_summary"><span class="label">Materialtype: </span>
-        <xsl:element name="img"><xsl:attribute name="src">/opac-tmpl/lib/famfamfam/<xsl:value-of select="$materialTypeCode"/>.png</xsl:attribute><xsl:attribute name="alt"></xsl:attribute></xsl:element>
-        <xsl:value-of select="$materialTypeLabel"/>
+        <xsl:if test="$typeOf008!=''">
+        <span class="results_summary">
+            <span class="label">Materialtype: </span>
+            <xsl:choose>
+                <xsl:when test="$typeOf008='Mon'"><img src="/opac-tmpl/lib/famfamfam/BK.png" alt="Bok" title="Bok"/> Bok</xsl:when>
+                <xsl:when test="$typeOf008='Per'"><img src="/opac-tmpl/lib/famfamfam/AR.png" alt="Periodika" title="Periodika"/> Periodika</xsl:when>
+                <xsl:when test="$typeOf008='Fil'"><img src="/opac-tmpl/lib/famfamfam/CF.png" alt="Fil" title="Fil"/> Fil</xsl:when>
+                <xsl:when test="$typeOf008='Kar'"><img src="/opac-tmpl/lib/famfamfam/MP.png" alt="Kart" title="Kart"/> Kart</xsl:when>
+                <xsl:when test="$typeOf008='FV'"><img  src="/opac-tmpl/lib/famfamfam/VM.png" alt="Film og video" title="Film og video"/> Film og video</xsl:when>
+                <xsl:when test="$typeOf008='Mus'"><img src="/opac-tmpl/lib/famfamfam/PR.png" alt="Musikktrykk og lydopptak" title="Musikktrykk og lydopptak"/> Musikk</xsl:when>
+                <xsl:when test="$typeOf008='gra'"><img src="/opac-tmpl/lib/famfamfam/GR.png" alt="Grafisk materiale" title="Grafisk materiale"/> Grafisk materiale</xsl:when>
+                <xsl:when test="$typeOf008='kom'"><img src="/opac-tmpl/lib/famfamfam/MX.png" alt="Kombidokumenter" title="Kombidokumenter"/> Kombidokumenter</xsl:when>
+                <xsl:when test="$typeOf008='trd'"><img src="/opac-tmpl/lib/famfamfam/TD.png" alt="Tre-dimensjonale gjenstander" title="Tre-dimensjonale gjenstander"/> Tre-dimensjonale gjenstander</xsl:when>
+            </xsl:choose>
         </span>
         </xsl:if>
     </xsl:if>
diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl
index 3645174633..d7d8423b01 100644
--- a/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/prog/en/xslt/NORMARCslim2OPACResults.xsl
@@ -32,7 +32,7 @@
         <xsl:variable name="controlField008" select="marc:controlfield[@tag=008]"/>
         <xsl:variable name="field019b" select="marc:datafield[@tag=019]/marc:subfield[@code='b']"/>
         <xsl:variable name="typeOf008">
-        <!-- Codes with upper case first letter below are from the NORMARC standard, lower case first letter are made up. -->
+            <!-- The logic here should be exactly the same for NORMARCslim2intranetDetail.xsl, NORMARCslim2intranetResults.xsl, NORMARCslim2OPACDetail.xsl and NORMARCslim2OPACResults.xsl -->
             <xsl:choose>
                 <xsl:when test="$field019b='b' or $field019b='k' or $field019b='l' or $leader6='b'">Mon</xsl:when>
                 <xsl:when test="$field019b='e' or contains($field019b,'ec') or contains($field019b,'ed') or contains($field019b,'ee') or contains($field019b,'ef') or $leader6='g'">FV</xsl:when>
@@ -375,19 +375,18 @@
 <xsl:if test="$DisplayOPACiconsXSLT!='0'">
     <span class="results_summary">
     <xsl:if test="$typeOf008!=''">
-        <span class="label">Type: </span>
-        
-            <xsl:choose>
-                <xsl:when test="$typeOf008='Mon'"><img src="/opac-tmpl/lib/famfamfam/silk/book.png" alt="Bok" title="Bok"/> Bok</xsl:when>
-                <xsl:when test="$typeOf008='Per'"><img src="/opac-tmpl/lib/famfamfam/silk/newspaper.png" alt="Periodika" title="Periodika"/> Periodika</xsl:when>
-                <xsl:when test="$typeOf008='Fil'"><img src="/opac-tmpl/lib/famfamfam/silk/computer_link.png" alt="Fil" title="Fil"/> Fil</xsl:when>
-                <xsl:when test="$typeOf008='Kar'"><img src="/opac-tmpl/lib/famfamfam/silk/map.png" alt="Kart" title="Kart"/> Kart</xsl:when>
-                <xsl:when test="$typeOf008='FV'"><img src="/opac-tmpl/lib/famfamfam/silk/film.png" alt="Film og video" title="Film og video"/> Film og video</xsl:when>
-                <xsl:when test="$typeOf008='Mus'"><img src="/opac-tmpl/lib/famfamfam/silk/sound.png" alt="Musikktrykk og lydopptak" title="Musikktrykk og lydopptak"/> Musikk</xsl:when>
-                <xsl:when test="$typeOf008='gra'"> Grafisk materiale</xsl:when>
-                <xsl:when test="$typeOf008='kom'"> Kombidokumenter</xsl:when>
-                <xsl:when test="$typeOf008='trd'"> Tre-dimensjonale gjenstander</xsl:when>
-            </xsl:choose>
+        <span class="label">Materialtype: </span>
+        <xsl:choose>
+            <xsl:when test="$typeOf008='Mon'"><img src="/opac-tmpl/lib/famfamfam/BK.png" alt="Bok" title="Bok"/> Bok</xsl:when>
+            <xsl:when test="$typeOf008='Per'"><img src="/opac-tmpl/lib/famfamfam/AR.png" alt="Periodika" title="Periodika"/> Periodika</xsl:when>
+            <xsl:when test="$typeOf008='Fil'"><img src="/opac-tmpl/lib/famfamfam/CF.png" alt="Fil" title="Fil"/> Fil</xsl:when>
+            <xsl:when test="$typeOf008='Kar'"><img src="/opac-tmpl/lib/famfamfam/MP.png" alt="Kart" title="Kart"/> Kart</xsl:when>
+            <xsl:when test="$typeOf008='FV'"><img  src="/opac-tmpl/lib/famfamfam/VM.png" alt="Film og video" title="Film og video"/> Film og video</xsl:when>
+            <xsl:when test="$typeOf008='Mus'"><img src="/opac-tmpl/lib/famfamfam/PR.png" alt="Musikktrykk og lydopptak" title="Musikktrykk og lydopptak"/> Musikk</xsl:when>
+            <xsl:when test="$typeOf008='gra'"><img src="/opac-tmpl/lib/famfamfam/GR.png" alt="Grafisk materiale" title="Grafisk materiale"/> Grafisk materiale</xsl:when>
+            <xsl:when test="$typeOf008='kom'"><img src="/opac-tmpl/lib/famfamfam/MX.png" alt="Kombidokumenter" title="Kombidokumenter"/> Kombidokumenter</xsl:when>
+            <xsl:when test="$typeOf008='trd'"><img src="/opac-tmpl/lib/famfamfam/TD.png" alt="Tre-dimensjonale gjenstander" title="Tre-dimensjonale gjenstander"/> Tre-dimensjonale gjenstander</xsl:when>
+        </xsl:choose>
     </xsl:if>
     <xsl:if test="string-length(normalize-space($physicalDescription))">
         <span class="label">; Format: </span><xsl:copy-of select="$physicalDescription"></xsl:copy-of>
-- 
2.20.1