From 5eb7f73a71194387ffc3ae334ba57e08eb2f96a3 Mon Sep 17 00:00:00 2001 From: Elliott Davis Date: Thu, 30 Jun 2011 11:38:23 -0500 Subject: [PATCH 2/2] bug 5079 --- installer/data/mysql/en/mandatory/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/opac.pref | 2 +- .../prog/en/xslt/MARC21slim2OPACResults.xsl | 132 ++++++++++++++++--- 3 files changed, 113 insertions(+), 23 deletions(-) diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 7419908..268ad0d 100755 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -92,7 +92,7 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacPublic',1,'Turn on/off public OPAC',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserjs','','Define custom javascript for inclusion in OPAC','70|10','Textarea'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacuserlogin',1,'Enable or disable display of user login features',NULL,'YesNo'); -INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacItemLocation',1,'Show the shelving location of items in the opac',NULL,'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('OpacItemLocation',2,'Show the shelving location of items in the opac',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('patronimages',0,'Enable patron images for the Staff Client',NULL,'YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('printcirculationslips',1,'If ON, enable printing circulation receipts','','YesNo'); INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('RequestOnOpac',1,'If ON, globally enables patron holds on OPAC',NULL,'YesNo'); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref index 88aa7ca..c14fa7a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref @@ -196,7 +196,7 @@ OPAC: choices: yes: Show no: "Don't Show" - - Show the shelving location of items in opac results. + - the shelving location of items in opac results. - - pref: OpacPasswordChange choices: diff --git a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl index 5805aea..6d35de3 100644 --- a/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl +++ b/koha-tmpl/opac-tmpl/prog/en/xslt/MARC21slim2OPACResults.xsl @@ -986,7 +986,7 @@ - Copy available for loan at Copies available for loan at + copy available for loan at copies available for loan at @@ -995,7 +995,7 @@ . , - + @@ -1003,7 +1003,7 @@ - Copy available for reference at Copies available for reference at + copy available for reference at copies available for reference at @@ -1059,27 +1059,117 @@ ). + + Location(s): - - - - - . , - - | - - - - - . , - - + + + + + + + + . , + + + + + + + + + + + + + . , + + + + + + + + + + + + . , + + + + + + + + + + . , + + + + + + + + + + . , + + + + + + + + + + . , + + + + + + + + + + . , + + + + + + + + + + . , + + + + + + + + + + . , + + + - - + -- 1.7.2.5