Bug 10562: Improve Leader06 Type Labels in MARC21slim2OPACResults.xsl

This patch takes the suggestions in Bug 10562 and implements those
changes in MARC21slim2OPACResults.xsl. This patch also makes the
following changes:

 - De-duplicate famfamfam icons: Remove the /silk subdirectory and move
   non-duplicates to famfamfam/; Correct paths to these images in
   templates and CSS
 - Improve the granularity of some material type icon choices: Show
   "Film," "Picture," or "Object" instead of "Visual material."
 - Remove unnecessary title attributes from material type images
 - Implement the kind of changes made in Bug 18235, "Add classes to
   material type icons on result lists and detail pages"

Signed-off-by: Charles Farmer <charles.farmer@inLibro.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit c747c74568850089d2a13b47aecf9987214ff8db)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/sci.css b/koha-tmpl/opac-tmpl/bootstrap/css/sci.css
index 38fe877..51464cb 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/css/sci.css
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/sci.css
@@ -152,27 +152,27 @@ i.icon {
 }
 
 i.back {
-    background : transparent url("../lib/famfamfam/silk/arrow_left.png") no-repeat 0 0;
+    background : transparent url("../lib/famfamfam/arrow_left.png") no-repeat 0 0;
 }
 
 i.return {
-    background : transparent url("../lib/famfamfam/silk/book_previous.png") no-repeat 0 0;
+    background : transparent url("../lib/famfamfam/book_previous.png") no-repeat 0 0;
 }
 
 i.renew {
-    background : transparent url("../lib/famfamfam/silk/arrow_refresh.png") no-repeat 0 0;
+    background : transparent url("../lib/famfamfam/arrow_refresh.png") no-repeat 0 0;
 }
 
 i.cancel {
-    background : transparent url("../lib/famfamfam/silk/cancel.png") no-repeat 0 0;
+    background : transparent url("../lib/famfamfam/cancel.png") no-repeat 0 0;
 }
 
 i.finish {
-    background : transparent url("../lib/famfamfam/silk/stop.png") no-repeat 0 0;
+    background : transparent url("../lib/famfamfam/stop.png") no-repeat 0 0;
 }
 
 i.help {
-    background : transparent url("../lib/famfamfam/silk/help.png") no-repeat 0 0;
+    background : transparent url("../lib/famfamfam/help.png") no-repeat 0 0;
 }
 
 .table .sorting_asc {

diff --git a/koha-tmpl/opac-tmpl/bootstrap/css/sco.css b/koha-tmpl/opac-tmpl/bootstrap/css/sco.css
index 38fe877..51464cb 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/css/sco.css
+++ b/koha-tmpl/opac-tmpl/bootstrap/css/sco.css
@@ -152,27 +152,27 @@ i.icon {
 }
 
 i.back {
-    background : transparent url("../lib/famfamfam/silk/arrow_left.png") no-repeat 0 0;
+    background : transparent url("../lib/famfamfam/arrow_left.png") no-repeat 0 0;
 }
 
 i.return {
-    background : transparent url("../lib/famfamfam/silk/book_previous.png") no-repeat 0 0;
+    background : transparent url("../lib/famfamfam/book_previous.png") no-repeat 0 0;
 }
 
 i.renew {
-    background : transparent url("../lib/famfamfam/silk/arrow_refresh.png") no-repeat 0 0;
+    background : transparent url("../lib/famfamfam/arrow_refresh.png") no-repeat 0 0;
 }
 
 i.cancel {
-    background : transparent url("../lib/famfamfam/silk/cancel.png") no-repeat 0 0;
+    background : transparent url("../lib/famfamfam/cancel.png") no-repeat 0 0;
 }
 
 i.finish {
-    background : transparent url("../lib/famfamfam/silk/stop.png") no-repeat 0 0;
+    background : transparent url("../lib/famfamfam/stop.png") no-repeat 0 0;
 }
 
 i.help {
-    background : transparent url("../lib/famfamfam/silk/help.png") no-repeat 0 0;
+    background : transparent url("../lib/famfamfam/help.png") no-repeat 0 0;
 }
 
 .table .sorting_asc {

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
index 54bcc6a..83d67c9 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc
@@ -53,7 +53,7 @@
                 showOn: "both",
                 changeMonth: true,
                 changeYear: true,
-                buttonImage: '[% interface | html %]/lib/famfamfam/silk/calendar.png',
+                buttonImage: '[% interface | html %]/lib/famfamfam/calendar.png',
                 buttonImageOnly: true,
                 showButtonPanel: true,
                 showOtherMonths: true,

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
index d057de0..7206c8e 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt
@@ -357,7 +357,7 @@
                                                                         [% ELSE %]
                                                                             <input disabled="disabled" type="radio" class="checkitem" name="checkitem" value="[% itemLoo.itemnumber | html %]"
                                                                                    style="display:none;" />
-                                                                            <img src="[% interface | html %]/lib/famfamfam/silk/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />
+                                                                            <img src="[% interface | html %]/lib/famfamfam/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />
                                                                         [% END %]
 
                                                                         [% IF ( itemLoo.copynumber ) %]

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
index 9fe561d..8d2039e 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl
@@ -63,8 +63,11 @@
                 <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='r'">VM</xsl:when>
-                <xsl:when test="$leader6='i' or $leader6='j'">MU</xsl:when>
+                <xsl:when test="$leader6='g'">VM</xsl:when>
+                <xsl:when test="$leader6='k'">PK</xsl:when>
+                <xsl:when test="$leader6='r'">OB</xsl:when>
+                <xsl:when test="$leader6='i'">SO</xsl:when>
+                <xsl:when test="$leader6='j'">MU</xsl:when>
                 <xsl:when test="$leader6='c' or $leader6='d'">PR</xsl:when>
             </xsl:choose>
         </xsl:variable>
@@ -73,7 +76,7 @@
                 <xsl:when test="$leader19='a'">Set</xsl:when>
                 <xsl:when test="$leader6='a'">
                     <xsl:choose>
-                        <xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'">Book</xsl:when>
+                        <xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'">Text</xsl:when>
                         <xsl:when test="$leader7='i' or $leader7='s'">
                             <xsl:choose>
                                 <xsl:when test="substring($controlField008,22,1)!='m'">Continuing resource</xsl:when>
@@ -83,12 +86,14 @@
                         <xsl:when test="$leader7='a' or $leader7='b'">Article</xsl:when>
                     </xsl:choose>
                 </xsl:when>
-                <xsl:when test="$leader6='t'">Book</xsl:when>
+                <xsl:when test="$leader6='t'">Text</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='r'">Visual material</xsl:when>
+                <xsl:when test="$leader6='g'">Film</xsl:when>
+                <xsl:when test="$leader6='k'">Picture</xsl:when>
+                <xsl:when test="$leader6='r'">Object</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>
@@ -185,7 +190,11 @@
    <xsl:if test="$DisplayOPACiconsXSLT!='0'">
         <xsl:if test="$materialTypeCode!=''">
         <span class="results_summary type"><span class="label">Material type: </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">materialTypeLabel</xsl:attribute><xsl:attribute name="class">materialtype</xsl:attribute></xsl:element>
+        <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:value-of select="$materialTypeLabel"/></xsl:attribute>
+            <xsl:attribute name="class">materialtype mt_icon_<xsl:value-of select="$materialTypeCode"/></xsl:attribute>
+        </xsl:element>
         <xsl:value-of select="$materialTypeLabel"/>
         </span>
         </xsl:if>

diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
index b6c9ee7..abaf7dd 100644 (file)
--- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl
@@ -171,7 +171,7 @@
                 chip cartridge
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='c']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/cd.png" alt="computer optical disc cartridge" title="computer optical disc cartridge" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/cd.png" alt="computer optical disc cartridge" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='j']">
                 magnetic disc
@@ -180,11 +180,11 @@
                 magneto-optical disc
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='o']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/cd.png" alt="optical disc" title="optical disc" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/cd.png" alt="optical disc" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='r']">
                available online
-                <img src="/opac-tmpl/lib/famfamfam/silk/drive_web.png" alt="remote" title="remote" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/drive_web.png" alt="remote" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='c'][substring(text(),2,1)='a']">
                 tape cartridge
@@ -197,16 +197,16 @@
             </xsl:if>
 
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='a']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/world.png" alt="celestial globe" title="celestial globe" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/world.png" alt="celestial globe" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='e']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/world.png" alt="earth moon globe" title="earth moon globe" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/world.png" alt="earth moon globe" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='b']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/world.png" alt="planetary or lunar globe" title="planetary or lunar globe" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/world.png" alt="planetary or lunar globe" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='d'][substring(text(),2,1)='c']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/world.png" alt="terrestrial globe" title="terrestrial globe" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/world.png" alt="terrestrial globe" class="format"/>
             </xsl:if>
 
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='o'][substring(text(),2,1)='o']">
@@ -269,19 +269,19 @@
                 film reel
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='n']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/chart_curve.png" alt="chart" title="chart" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/chart_curve.png" alt="chart" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='c']">
                 collage
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='d']">
-                 <img src="/opac-tmpl/lib/famfamfam/silk/pencil.png" alt="drawing" title="drawing" class="format"/>
+                 <img src="/opac-tmpl/lib/famfamfam/pencil.png" alt="drawing" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='o']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/note.png" alt="flash card" title="flash card" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/note.png" alt="flash card" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='e']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/paintbrush.png" alt="painting" title="painting" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/paintbrush.png" alt="painting" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='f']">
                 photomechanical print
@@ -293,7 +293,7 @@
                 photoprint
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='i']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/picture.png" alt="picture" title="picture" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/picture.png" alt="picture" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='k'][substring(text(),2,1)='j']">
                 print
@@ -302,7 +302,7 @@
                 technical drawing
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='q'][substring(text(),2,1)='q']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/script.png" alt="notated music" title="notated music" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/script.png" alt="notated music" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='d']">
                 filmslip
@@ -317,7 +317,7 @@
                 other filmstrip type
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='s']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/pictures.png" alt="slide" title="slide" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/pictures.png" alt="slide" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='g'][substring(text(),2,1)='t']">
                 transparency
@@ -338,7 +338,7 @@
                 sound cassette
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='d']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/cd.png" alt="sound disc" title="sound disc" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/cd.png" alt="sound disc" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='s'][substring(text(),2,1)='t']">
                 sound-tape reel
@@ -365,7 +365,7 @@
                 braille
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='b']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/magnifier.png" alt="large print" title="large print" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/magnifier.png" alt="large print" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='t'][substring(text(),2,1)='a']">
                 regular print
@@ -380,7 +380,7 @@
                 videocassette
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='d']">
-                <img src="/opac-tmpl/lib/famfamfam/silk/dvd.png" alt="videodisc" title="videodisc" class="format"/>
+                <img src="/opac-tmpl/lib/famfamfam/dvd.png" alt="videodisc" class="format"/>
             </xsl:if>
             <xsl:if test="marc:controlfield[@tag=007][substring(text(),1,1)='v'][substring(text(),2,1)='r']">
                 videoreel
@@ -613,23 +613,25 @@
     <span class="results_material_type">
         <span class="label">Material type: </span>
             <xsl:choose>
-                <xsl:when test="$leader19='a'"><img src="/opac-tmpl/lib/famfamfam/silk/book_link.png" alt="book" title="book" class="materialtype"/> Set</xsl:when>
+                <xsl:when test="$leader19='a'"><img src="/opac-tmpl/lib/famfamfam/ST.png" alt="Set" class="materialtype mt_icon_ST"/> Set</xsl:when>
                 <xsl:when test="$leader6='a'">
                     <xsl:choose>
-                        <xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'"><img src="/opac-tmpl/lib/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
-                        <xsl:when test="$leader7='i' or $leader7='s'"><img src="/opac-tmpl/lib/famfamfam/silk/newspaper.png" alt="serial" title="serial" class="materialtype"/> Continuing resource</xsl:when>
-                        <xsl:when test="$leader7='a' or $leader7='b'"><img src="/opac-tmpl/lib/famfamfam/silk/book_open.png" alt="article" title="article" class="materialtype"/> Article</xsl:when>
+                        <xsl:when test="$leader7='c' or $leader7='d' or $leader7='m'"><img src="/opac-tmpl/lib/famfamfam/BK.png" alt="Text" class="materialtype mt_icon_BK"/> Text</xsl:when>
+                        <xsl:when test="$leader7='i' or $leader7='s'"><img src="/opac-tmpl/lib/famfamfam/SE.png" alt="Continuing resource" class="materialtype mt_icon_SE"/> Continuing resource</xsl:when>
+                        <xsl:when test="$leader7='a' or $leader7='b'"><img src="/opac-tmpl/lib/famfamfam/AR.png" alt="Article" class="materialtype mt_icon_AR"/> Article</xsl:when>
                     </xsl:choose>
                 </xsl:when>
-                <xsl:when test="$leader6='t'"><img src="/opac-tmpl/lib/famfamfam/silk/book.png" alt="book" title="book" class="materialtype"/> Book</xsl:when>
-                <xsl:when test="$leader6='o'"><img src="/opac-tmpl/lib/famfamfam/silk/report_disk.png" alt="kit" title="kit" class="materialtype"/> Kit</xsl:when>
-                <xsl:when test="$leader6='p'"><img src="/opac-tmpl/lib/famfamfam/silk/report_disk.png" alt="mixed materials" title="mixed materials" class="materialtype"/>Mixed materials</xsl:when>
-                <xsl:when test="$leader6='m'"><img src="/opac-tmpl/lib/famfamfam/silk/computer_link.png" alt="computer file" title="computer file" class="materialtype"/> Computer file</xsl:when>
-                <xsl:when test="$leader6='e' or $leader6='f'"><img src="/opac-tmpl/lib/famfamfam/silk/map.png" alt="map" title="map" class="materialtype"/> Map</xsl:when>
-                <xsl:when test="$leader6='g' or $leader6='k' or $leader6='r'"><img src="/opac-tmpl/lib/famfamfam/silk/film.png" alt="visual material" title="visual material" class="materialtype"/> Visual material</xsl:when>
-                <xsl:when test="$leader6='c' or $leader6='d'"><img src="/opac-tmpl/lib/famfamfam/silk/music.png" alt="score" title="score" class="materialtype"/> Score</xsl:when>
-                <xsl:when test="$leader6='i'"><img src="/opac-tmpl/lib/famfamfam/silk/sound.png" alt="sound" title="sound" class="materialtype"/> Sound</xsl:when>
-                <xsl:when test="$leader6='j'"><img src="/opac-tmpl/lib/famfamfam/silk/sound.png" alt="music" title="music" class="materialtype"/> Music</xsl:when>
+                <xsl:when test="$leader6='t'"><img src="/opac-tmpl/lib/famfamfam/BK.png" alt="Text" class="materialtype mt_icon_BK"/> Text</xsl:when>
+                <xsl:when test="$leader6='o'"><img src="/opac-tmpl/lib/famfamfam/MM.png" alt="Kit" class="materialtype mt_icon_MM"/> Kit</xsl:when>
+                <xsl:when test="$leader6='p'"><img src="/opac-tmpl/lib/famfamfam/MM.png" alt="Mixed materials" class="materialtype mt_icon_MM"/>Mixed materials</xsl:when>
+                <xsl:when test="$leader6='m'"><img src="/opac-tmpl/lib/famfamfam/CF.png" alt="Computer file" class="materialtype mt_icon_CF"/> Computer file</xsl:when>
+                <xsl:when test="$leader6='e' or $leader6='f'"><img src="/opac-tmpl/lib/famfamfam/MP.png" alt="Map" class="materialtype mt_icon_MP"/> Map</xsl:when>
+                <xsl:when test="$leader6='g'"><img src="/opac-tmpl/lib/famfamfam/VM.png" alt="Film" class="materialtype mt_icon_VM"/> Film</xsl:when>
+                <xsl:when test="$leader6='k'"><img src="/opac-tmpl/lib/famfamfam/GR.png" alt="Picture" class="materialtype mt_icon_GR"/> Picture</xsl:when>
+                <xsl:when test="$leader6='r'"><img src="/opac-tmpl/lib/famfamfam/OB.png" alt="Object" class="materialtype mt_icon_OB"/> Object</xsl:when>
+                <xsl:when test="$leader6='c' or $leader6='d'"><img src="/opac-tmpl/lib/famfamfam/PR.png" alt="Score" class="materialtype mt_icon_PR"/> Score</xsl:when>
+                <xsl:when test="$leader6='i'"><img src="/opac-tmpl/lib/famfamfam/MU.png" alt="Sound" class="materialtype mt_icon_MU"/> Sound</xsl:when>
+                <xsl:when test="$leader6='j'"><img src="/opac-tmpl/lib/famfamfam/PR.png" alt="Music" class="materialtype mt_icon_PR"/> Music</xsl:when>
             </xsl:choose>
     </span>
     </xsl:if>
@@ -648,7 +650,7 @@
         </xsl:if>
             <xsl:choose>
                 <xsl:when test="$controlField008-21='d'">
-                     <img src="/opac-tmpl/lib/famfamfam/silk/database.png" alt="database" title="database" class="format"/>
+                    <img src="/opac-tmpl/lib/famfamfam/database.png" alt="database" class="format"/>
                 </xsl:when>
                 <xsl:when test="$controlField008-21='l'">
                     loose-leaf
@@ -663,7 +665,7 @@
                     periodical
                 </xsl:when>
                 <xsl:when test="$controlField008-21='w'">
-                     <img src="/opac-tmpl/lib/famfamfam/silk/world_link.png" alt="web site" title="web site" class="format"/>
+                     <img src="/opac-tmpl/lib/famfamfam/world_link.png" alt="web site" class="format"/>
                 </xsl:when>
             </xsl:choose>
         </span>
@@ -678,7 +680,7 @@
                 </xsl:when>
                 <xsl:when test="contains($controlField008-24,'b')">
                        bibliography
-                     <img src="/opac-tmpl/lib/famfamfam/silk/text_list_bullets.png" alt="bibliography" title="bibliography" class="natureofcontents"/>
+                     <img src="/opac-tmpl/lib/famfamfam/text_list_bullets.png" alt="bibliography" class="natureofcontents"/>
                 </xsl:when>
                 <xsl:when test="contains($controlField008-24,'c')">
                     catalog
@@ -726,7 +728,7 @@
                     statistics
                 </xsl:when>
                 <xsl:when test="contains($controlField008-24,'t')">
-                     <img src="/opac-tmpl/lib/famfamfam/silk/report.png" alt="technical report" title="technical report" class="natureofcontents"/>
+                     <img src="/opac-tmpl/lib/famfamfam/report.png" alt="technical report" class="natureofcontents"/>
                 </xsl:when>
                 <xsl:when test="contains($controlField008-24,'v')">
                     legal case and case notes
@@ -756,13 +758,13 @@
                     numeric data
                 </xsl:when>
                 <xsl:when test="$controlField008-26='e'">
-                     <img src="/opac-tmpl/lib/famfamfam/silk/database.png" alt="database" title="database" class="format"/>
+                     <img src="/opac-tmpl/lib/famfamfam/database.png" alt="database" class="format"/>
                 </xsl:when>
                 <xsl:when test="$controlField008-26='f'">
-                     <img src="/opac-tmpl/lib/famfamfam/silk/font.png" alt="font" title="font" class="format"/>
+                     <img src="/opac-tmpl/lib/famfamfam/font.png" alt="font" class="format"/>
                 </xsl:when>
                 <xsl:when test="$controlField008-26='g'">
-                     <img src="/opac-tmpl/lib/famfamfam/silk/controller.png" alt="game" title="game" class="format"/>
+                     <img src="/opac-tmpl/lib/famfamfam/controller.png" alt="game" class="format"/>
                 </xsl:when>
             </xsl:choose>
         </span>
@@ -779,7 +781,7 @@
                 festschrift
             </xsl:if>
             <xsl:if test="$controlField008-34='a' or $controlField008-34='b' or $controlField008-34='c' or $controlField008-34='d'">
-                 <img src="/opac-tmpl/lib/famfamfam/silk/user.png" alt="biography" title="biography" class="natureofcontents"/>
+                 <img src="/opac-tmpl/lib/famfamfam/user.png" alt="biography" class="natureofcontents"/>
             </xsl:if>
 
             <xsl:if test="$controlField008-33 and $controlField008-33!='|' and $controlField008-33!='u' and $controlField008-33!=' '">

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/OB.png b/koha-tmpl/opac-tmpl/lib/famfamfam/OB.png
new file mode 100644 (file)
index 0000000..0905f93
Binary files /dev/null and b/koha-tmpl/opac-tmpl/lib/famfamfam/OB.png differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/arrow_left.png b/koha-tmpl/opac-tmpl/lib/famfamfam/arrow_left.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/arrow_left.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/arrow_left.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/arrow_refresh.png b/koha-tmpl/opac-tmpl/lib/famfamfam/arrow_refresh.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/arrow_refresh.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/arrow_refresh.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/book_previous.png b/koha-tmpl/opac-tmpl/lib/famfamfam/book_previous.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/book_previous.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/book_previous.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/calendar.png b/koha-tmpl/opac-tmpl/lib/famfamfam/calendar.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/calendar.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/calendar.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/cancel.png b/koha-tmpl/opac-tmpl/lib/famfamfam/cancel.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/cancel.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/cancel.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/cd.png b/koha-tmpl/opac-tmpl/lib/famfamfam/cd.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/cd.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/cd.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/chart_curve.png b/koha-tmpl/opac-tmpl/lib/famfamfam/chart_curve.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/chart_curve.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/chart_curve.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/controller.png b/koha-tmpl/opac-tmpl/lib/famfamfam/controller.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/controller.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/controller.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/cross.png b/koha-tmpl/opac-tmpl/lib/famfamfam/cross.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/cross.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/cross.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/database.png b/koha-tmpl/opac-tmpl/lib/famfamfam/database.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/database.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/database.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/drive_web.png b/koha-tmpl/opac-tmpl/lib/famfamfam/drive_web.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/drive_web.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/drive_web.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/dvd.png b/koha-tmpl/opac-tmpl/lib/famfamfam/dvd.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/dvd.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/dvd.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/font.png b/koha-tmpl/opac-tmpl/lib/famfamfam/font.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/font.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/font.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/help.png b/koha-tmpl/opac-tmpl/lib/famfamfam/help.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/help.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/help.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/link.png b/koha-tmpl/opac-tmpl/lib/famfamfam/link.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/link.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/link.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/magnifier.png b/koha-tmpl/opac-tmpl/lib/famfamfam/magnifier.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/magnifier.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/magnifier.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/note.png b/koha-tmpl/opac-tmpl/lib/famfamfam/note.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/note.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/note.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/paintbrush.png b/koha-tmpl/opac-tmpl/lib/famfamfam/paintbrush.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/paintbrush.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/paintbrush.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/pencil.png b/koha-tmpl/opac-tmpl/lib/famfamfam/pencil.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/pencil.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/pencil.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/pictures.png b/koha-tmpl/opac-tmpl/lib/famfamfam/pictures.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/pictures.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/pictures.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/report.png b/koha-tmpl/opac-tmpl/lib/famfamfam/report.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/report.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/report.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/script.png b/koha-tmpl/opac-tmpl/lib/famfamfam/script.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/script.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/script.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/book.png b/koha-tmpl/opac-tmpl/lib/famfamfam/silk/book.png
deleted file mode 100644 (file)
index b0f4dd7..0000000
Binary files a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/book.png and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/book_link.png b/koha-tmpl/opac-tmpl/lib/famfamfam/silk/book_link.png
deleted file mode 100644 (file)
index dd0820e..0000000
Binary files a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/book_link.png and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/book_open.png b/koha-tmpl/opac-tmpl/lib/famfamfam/silk/book_open.png
deleted file mode 100644 (file)
index 7d863f9..0000000
Binary files a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/book_open.png and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/computer_link.png b/koha-tmpl/opac-tmpl/lib/famfamfam/silk/computer_link.png
deleted file mode 100644 (file)
index 3859db2..0000000
Binary files a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/computer_link.png and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/film.png b/koha-tmpl/opac-tmpl/lib/famfamfam/silk/film.png
deleted file mode 100644 (file)
index b0ce7bb..0000000
Binary files a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/film.png and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/keyboard.png b/koha-tmpl/opac-tmpl/lib/famfamfam/silk/keyboard.png
deleted file mode 100644 (file)
index 898d402..0000000
Binary files a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/keyboard.png and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/map.png b/koha-tmpl/opac-tmpl/lib/famfamfam/silk/map.png
deleted file mode 100644 (file)
index f90ef25..0000000
Binary files a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/map.png and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/music.png b/koha-tmpl/opac-tmpl/lib/famfamfam/silk/music.png
deleted file mode 100644 (file)
index a8b3ede..0000000
Binary files a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/music.png and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/newspaper.png b/koha-tmpl/opac-tmpl/lib/famfamfam/silk/newspaper.png
deleted file mode 100644 (file)
index 6a2ecce..0000000
Binary files a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/newspaper.png and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/picture.png b/koha-tmpl/opac-tmpl/lib/famfamfam/silk/picture.png
deleted file mode 100644 (file)
index 4a158fe..0000000
Binary files a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/picture.png and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/report_disk.png b/koha-tmpl/opac-tmpl/lib/famfamfam/silk/report_disk.png
deleted file mode 100644 (file)
index 1c856cd..0000000
Binary files a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/report_disk.png and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/sound.png b/koha-tmpl/opac-tmpl/lib/famfamfam/silk/sound.png
deleted file mode 100644 (file)
index 6056d23..0000000
Binary files a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/sound.png and /dev/null differ

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/stop.png b/koha-tmpl/opac-tmpl/lib/famfamfam/stop.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/stop.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/stop.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/text_list_bullets.png b/koha-tmpl/opac-tmpl/lib/famfamfam/text_list_bullets.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/text_list_bullets.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/text_list_bullets.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/user.png b/koha-tmpl/opac-tmpl/lib/famfamfam/user.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/user.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/user.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/world.png b/koha-tmpl/opac-tmpl/lib/famfamfam/world.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/world.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/world.png

diff --git a/koha-tmpl/opac-tmpl/lib/famfamfam/silk/world_link.png b/koha-tmpl/opac-tmpl/lib/famfamfam/world_link.png
similarity index 100%
rename from koha-tmpl/opac-tmpl/lib/famfamfam/silk/world_link.png
rename to koha-tmpl/opac-tmpl/lib/famfamfam/world_link.png