@@ -, +, @@
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 %]
-
+
[% 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
-
+
magnetic disc
@@ -180,11 +180,11 @@
magneto-optical disc
-
+
available online
-
+
tape cartridge
@@ -197,16 +197,16 @@
-
+
-
+
-
+
-
+
@@ -269,19 +269,19 @@
film reel
-
+
collage
-
+
-
+
-
+
photomechanical print
@@ -293,7 +293,7 @@
photoprint
-
+
print
@@ -302,7 +302,7 @@
technical drawing
-
+
filmslip
@@ -317,7 +317,7 @@
other filmstrip type
-
+
transparency
@@ -338,7 +338,7 @@
sound cassette
-
+
sound-tape reel
@@ -365,7 +365,7 @@
braille
-
+
regular print
@@ -380,7 +380,7 @@
videocassette
-
+
videoreel
@@ -613,23 +613,25 @@
Material type:
- Set
+ Set
- Book
- Continuing resource
- Article
+ Text
+ Continuing resource
+ Article
- Book
- Kit
- Mixed materials
- Computer file
- Map
- Visual material
- Score
- Sound
- Music
+ Text
+ Kit
+ Mixed materials
+ Computer file
+ Map
+ Film
+ Picture
+ Object
+ Score
+ Sound
+ Music
@@ -648,7 +650,7 @@
-
+
loose-leaf
@@ -663,7 +665,7 @@
periodical
-
+
@@ -678,7 +680,7 @@
bibliography
-
+
catalog
@@ -726,7 +728,7 @@
statistics
-
+
legal case and case notes
@@ -756,13 +758,13 @@
numeric data
-
+
-
+
-
+
@@ -779,7 +781,7 @@
festschrift
-
+