@@ -, +, @@ MARC21slim2OPACResults.xsl - 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" --- koha-tmpl/opac-tmpl/bootstrap/css/sci.css | 12 ++-- koha-tmpl/opac-tmpl/bootstrap/css/sco.css | 12 ++-- .../opac-tmpl/bootstrap/en/includes/calendar.inc | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-reserve.tt | 2 +- .../bootstrap/en/xslt/MARC21slim2OPACDetail.xsl | 21 ++++-- .../bootstrap/en/xslt/MARC21slim2OPACResults.xsl | 78 +++++++++++---------- koha-tmpl/opac-tmpl/lib/famfamfam/OB.png | Bin 0 -> 825 bytes .../lib/famfamfam/{silk => }/arrow_left.png | Bin .../lib/famfamfam/{silk => }/arrow_refresh.png | Bin .../lib/famfamfam/{silk => }/book_previous.png | Bin .../lib/famfamfam/{silk => }/calendar.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/cancel.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/cd.png | Bin .../lib/famfamfam/{silk => }/chart_curve.png | Bin .../lib/famfamfam/{silk => }/controller.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/cross.png | Bin .../lib/famfamfam/{silk => }/database.png | Bin .../lib/famfamfam/{silk => }/drive_web.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/dvd.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/font.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/help.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/link.png | Bin .../lib/famfamfam/{silk => }/magnifier.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/note.png | Bin .../lib/famfamfam/{silk => }/paintbrush.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/pencil.png | Bin .../lib/famfamfam/{silk => }/pictures.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/report.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/script.png | Bin koha-tmpl/opac-tmpl/lib/famfamfam/silk/book.png | Bin 593 -> 0 bytes .../opac-tmpl/lib/famfamfam/silk/book_link.png | Bin 789 -> 0 bytes .../opac-tmpl/lib/famfamfam/silk/book_open.png | Bin 622 -> 0 bytes .../opac-tmpl/lib/famfamfam/silk/computer_link.png | Bin 792 -> 0 bytes koha-tmpl/opac-tmpl/lib/famfamfam/silk/film.png | Bin 653 -> 0 bytes .../opac-tmpl/lib/famfamfam/silk/keyboard.png | Bin 570 -> 0 bytes koha-tmpl/opac-tmpl/lib/famfamfam/silk/map.png | Bin 804 -> 0 bytes koha-tmpl/opac-tmpl/lib/famfamfam/silk/music.png | Bin 385 -> 0 bytes .../opac-tmpl/lib/famfamfam/silk/newspaper.png | Bin 658 -> 0 bytes koha-tmpl/opac-tmpl/lib/famfamfam/silk/picture.png | Bin 606 -> 0 bytes .../opac-tmpl/lib/famfamfam/silk/report_disk.png | Bin 760 -> 0 bytes koha-tmpl/opac-tmpl/lib/famfamfam/silk/sound.png | Bin 610 -> 0 bytes .../opac-tmpl/lib/famfamfam/{silk => }/stop.png | Bin .../lib/famfamfam/{silk => }/text_list_bullets.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/user.png | Bin .../opac-tmpl/lib/famfamfam/{silk => }/world.png | Bin .../lib/famfamfam/{silk => }/world_link.png | Bin 46 files changed, 69 insertions(+), 58 deletions(-) create mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/OB.png rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/arrow_left.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/arrow_refresh.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/book_previous.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/calendar.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/cancel.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/cd.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/chart_curve.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/controller.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/cross.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/database.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/drive_web.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/dvd.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/font.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/help.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/link.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/magnifier.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/note.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/paintbrush.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/pencil.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/pictures.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/report.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/script.png (100%) delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/book.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/book_link.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/book_open.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/computer_link.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/film.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/keyboard.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/map.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/music.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/newspaper.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/picture.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/report_disk.png delete mode 100644 koha-tmpl/opac-tmpl/lib/famfamfam/silk/sound.png rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/stop.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/text_list_bullets.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/user.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/world.png (100%) rename koha-tmpl/opac-tmpl/lib/famfamfam/{silk => }/world_link.png (100%) --- a/koha-tmpl/opac-tmpl/bootstrap/css/sci.css +++ a/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 { --- a/koha-tmpl/opac-tmpl/bootstrap/css/sco.css +++ a/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 { --- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/calendar.inc +++ a/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, --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -353,7 +353,7 @@ [% ELSE %] - Cannot be put on hold + Cannot be put on hold [% END %] [% IF ( itemLoo.copynumber ) %] --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl +++ a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACDetail.xsl @@ -63,8 +63,11 @@ MX CF MP - VM - MU + VM + PK + OB + SO + MU PR @@ -73,7 +76,7 @@ Set - Book + Text Continuing resource @@ -83,12 +86,14 @@ Article - Book + Text Kit Mixed materials Computer file Map - Visual material + Film + Picture + Object Music Sound Score @@ -185,7 +190,11 @@ Material type: - /opac-tmpl/lib/famfamfam/.pngmaterialTypeLabelmaterialtype + + /opac-tmpl/lib/famfamfam/.png + + materialtype mt_icon_ + --- a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl +++ a/koha-tmpl/opac-tmpl/bootstrap/en/xslt/MARC21slim2OPACResults.xsl @@ -171,7 +171,7 @@ chip cartridge - computer optical disc cartridge + computer optical disc cartridge magnetic disc @@ -180,11 +180,11 @@ magneto-optical disc - optical disc + optical disc available online - remote + remote tape cartridge @@ -197,16 +197,16 @@ - celestial globe + celestial globe - earth moon globe + earth moon globe - planetary or lunar globe + planetary or lunar globe - terrestrial globe + terrestrial globe @@ -269,19 +269,19 @@ film reel - chart + chart collage - drawing + drawing - flash card + flash card - painting + painting photomechanical print @@ -293,7 +293,7 @@ photoprint - picture + picture print @@ -302,7 +302,7 @@ technical drawing - notated music + notated music filmslip @@ -317,7 +317,7 @@ other filmstrip type - slide + slide transparency @@ -338,7 +338,7 @@ sound cassette - sound disc + sound disc sound-tape reel @@ -365,7 +365,7 @@ braille - large print + large print regular print @@ -380,7 +380,7 @@ videocassette - videodisc + videodisc videoreel @@ -613,23 +613,25 @@ Material type: - book Set + Set Set - book Book - serial Continuing resource - article Article + Text Text + Continuing resource Continuing resource + Article Article - book Book - kit Kit - mixed materialsMixed materials - computer file Computer file - map Map - visual material Visual material - score Score - sound Sound - music Music + Text Text + Kit Kit + Mixed materialsMixed materials + Computer file Computer file + Map Map + Film Film + Picture Picture + Object Object + Score Score + Sound Sound + Music Music @@ -648,7 +650,7 @@ - database + database loose-leaf @@ -663,7 +665,7 @@ periodical - web site + web site @@ -678,7 +680,7 @@ bibliography - bibliography + bibliography catalog @@ -726,7 +728,7 @@ statistics - technical report + technical report legal case and case notes @@ -756,13 +758,13 @@ numeric data - database + database - font + font - game + game @@ -779,7 +781,7 @@ festschrift - biography + biography