@@ -, +, @@ XSLT default view in intranet and is activated by default. Compare descriptions between DisplayIconsXSLT and DisplayOPACiconsXSLT. before the corresponding description. Detail pages should be showing the 'Type:' as before. hidden from the result list. --- C4/XSLT.pm | 2 +- installer/data/mysql/sysprefs.sql | 3 +- installer/data/mysql/updatedatabase.pl | 6 ++++ .../prog/en/modules/admin/preferences/opac.pref | 7 ++--- .../en/modules/admin/preferences/staff_client.pref | 6 ++++ .../prog/en/xslt/MARC21slim2intranetDetail.xsl | 6 ++-- .../prog/en/xslt/MARC21slim2intranetResults.xsl | 30 +++++++++++--------- .../intranet-tmpl/prog/img/famfamfam/silk/book.png | Bin 0 -> 593 bytes .../prog/img/famfamfam/silk/book_link.png | Bin 0 -> 789 bytes .../prog/img/famfamfam/silk/book_open.png | Bin 0 -> 622 bytes .../prog/img/famfamfam/silk/computer_link.png | Bin 0 -> 792 bytes .../intranet-tmpl/prog/img/famfamfam/silk/film.png | Bin 0 -> 653 bytes .../intranet-tmpl/prog/img/famfamfam/silk/map.png | Bin 0 -> 804 bytes .../prog/img/famfamfam/silk/music.png | Bin 0 -> 385 bytes .../prog/img/famfamfam/silk/newspaper.png | Bin 0 -> 658 bytes .../prog/img/famfamfam/silk/report_disk.png | Bin 0 -> 760 bytes .../prog/img/famfamfam/silk/sound.png | Bin 0 -> 610 bytes 17 files changed, 39 insertions(+), 21 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/book.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/book_link.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/book_open.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/computer_link.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/film.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/map.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/music.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/newspaper.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/report_disk.png create mode 100644 koha-tmpl/intranet-tmpl/prog/img/famfamfam/silk/sound.png --- a/C4/XSLT.pm +++ a/C4/XSLT.pm @@ -188,7 +188,7 @@ sub XSLTParse4Display { UseAuthoritiesForTracings TraceSubjectSubdivisions Display856uAsImage OPACDisplay856uAsImage UseControlNumber IntranetBiblioDefaultView BiblioDefaultView - singleBranchMode OPACItemLocation + singleBranchMode OPACItemLocation DisplayIconsXSLT AlternateHoldingsField AlternateHoldingsSeparator TrackClicks / ) { --- a/installer/data/mysql/sysprefs.sql +++ a/installer/data/mysql/sysprefs.sql @@ -272,7 +272,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACMySummaryHTML','','Enter the HTML that will appear in a column on the \'my summary\' and \'my reading history\' tabs when a user is logged in to the OPAC. Enter {BIBLIONUMBER}, {TITLE}, {AUTHOR}, or {ISBN} in place of their respective variables in the HTML. Leave blank to disable.','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACPatronDetails','1','If OFF the patron details tab in the OPAC is disabled.','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('OPACFinesTab','1','If OFF the patron fines tab in the OPAC is disabled.','','YesNo'); -INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, type icons in XSLT MARC21 results and display pages.', 'YesNo'); +INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'If ON, displays the format, audience, and material type icons in XSLT MARC21 results and detail pages in the OPAC.', 'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowAllMessageDeletion','0','Allow any Library to delete any message','','YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('ShowPatronImageInWebBasedSelfCheck', '0', 'If ON, displays patron image when a patron uses web-based self-checkout', '', 'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES ('EnableOpacSearchHistory', '1', 'Enable or disable opac search history', 'YesNo',''); @@ -418,3 +418,4 @@ INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) V INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('UseQueryParser', '0', 'If enabled, try to use QueryParser for queries.', NULL, 'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('FinesIncludeGracePeriod','1','If enabled, fines calculations will include the grace period.',NULL,'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES ('UNIMARCAuthorsFacetsSeparator',', ', 'UNIMARC authors facets separator', NULL, 'short'); +INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('DisplayIconsXSLT', '1', '', 'If ON, displays the format, audience, and material type icons in XSLT MARC21 results and detail pages.', 'YesNo'); --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -6556,6 +6556,12 @@ if ( CheckVersion($DBversion) ) { print "Upgrade to $DBversion done (Bug 9827 - Remove 'insecure' system preference)\n"; SetVersion($DBversion); } +$DBversion = "3.11.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES('DisplayIconsXSLT', '1', '', 'If ON, displays the format, audience, and material type icons in XSLT MARC21 results and detail pages.', 'YesNo');"); + print "Upgrade to $DBversion done (Bug 9403: Add DisplayIconsXSLT)\n"; + SetVersion ($DBversion); +} =head1 FUNCTIONS --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -66,12 +66,11 @@ OPAC: class: file - '
Options:{langcode} will be replaced with current interface language' - - - On pages displayed with XSLT stylesheets on the OPAC, - pref: DisplayOPACiconsXSLT choices: - yes: show - no: "don't show" - - icons for itemtype and authorized values. + yes: Show + no: "Don't show" + - the format, audience, and material type icons in XSLT MARC21 results and detail pages in the OPAC. - - pref: COinSinOPACResults choices: --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref @@ -66,6 +66,12 @@ Staff Client: class: file - '
Options:{langcode} will be replaced with current interface language' - + - pref: DisplayIconsXSLT + choices: + yes: Show + no: "Don't show" + - the format, audience, and material type icons in XSLT MARC21 results and detail pages in the staff client. + - - Use the Yahoo UI libraries - pref: yuipath choices: --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl +++ a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl @@ -25,6 +25,7 @@ + { @@ -142,13 +143,14 @@ - + Type: /intranet-tmpl/prog/img/famfamfam/.png - + + --- a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl +++ a/koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetResults.xsl @@ -26,6 +26,7 @@ + @@ -447,29 +448,31 @@ + Type: - Set + book Set - Book - Continuing Resource - Article + book Book + serial Continuing Resource + article Article - Book - Kit - Mixed Materials - Computer File - Map - Visual Material - Score - Sound - Music + book Book + kit Kit + mixed materialsMixed Materials + computer file Computer File + map Map + visual material Visual Material + score Score + sound Sound + music Music + ; Format: @@ -768,6 +771,7 @@ +