From 5e2e03b7aed83216ba6f18236861e01be26cba08 Mon Sep 17 00:00:00 2001 From: Jane Wagner Date: Thu, 22 Oct 2009 14:04:57 -0400 Subject: [PATCH] Bug-3719-create-syspref-to-rename-OPAC-Cart-feature Content-Type: text/plain; charset="utf-8" Allows libraries to set a syspref to rename the OPAC Cart feature from Cart to something else, like Bookbag or Personal Shelf. The syspref defaults to Cart, and if no text is entered, the code should also default to Cart. --- C4/Auth.pm | 3 +++ admin/systempreferences.pl | 1 + installer/data/mysql/en/mandatory/sysprefs.sql | 1 + .../1-Obligatoire/unimarc_standard_systemprefs.sql | 1 + .../ru-RU/mandatory/system_preferences_optimal.sql | 1 + installer/data/mysql/updatedatabase.pl | 7 +++++++ .../opac-tmpl/prog/en/includes/doc-head-close.inc | 16 ++++++++-------- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 2 +- .../opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl | 2 +- .../opac-tmpl/prog/en/modules/opac-basket.tmpl | 6 +++--- .../opac-tmpl/prog/en/modules/opac-detail.tmpl | 2 +- .../prog/en/modules/opac-results-grouped.tmpl | 4 ++-- .../opac-tmpl/prog/en/modules/opac-results.tmpl | 6 +++--- .../prog/en/modules/opac-sendbasketform.tmpl | 8 ++++---- 15 files changed, 38 insertions(+), 24 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 7574f9e..42b7c38 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -33,6 +33,7 @@ use POSIX qw/strftime/; # use utf8; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $debug $ldap); +my $opacbookbagName = C4::Context->preference('opacbookbagName') || "Cart"; BEGIN { $VERSION = 3.02; # set version for version checking $debug = $ENV{DEBUG} || 0 ; @@ -365,6 +366,7 @@ sub get_template_and_user { opaccolorstylesheet => "" . C4::Context->preference("opaccolorstylesheet"), opacstylesheet => "" . C4::Context->preference("opacstylesheet"), opacbookbag => "" . C4::Context->preference("opacbookbag"), + opacbookbagName => $opacbookbagName, opaccredits => "" . C4::Context->preference("opaccredits"), opacheader => "" . C4::Context->preference("opacheader"), opaclanguagesdisplay => "" . C4::Context->preference("opaclanguagesdisplay"), @@ -833,6 +835,7 @@ sub checkauth { opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"), opacuserjs => C4::Context->preference("opacuserjs"), opacbookbag => "" . C4::Context->preference("opacbookbag"), + opacbookbagName => $opacbookbagName, OpacCloud => C4::Context->preference("OpacCloud"), OpacTopissue => C4::Context->preference("OpacTopissue"), OpacAuthorities => C4::Context->preference("OpacAuthorities"), diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index e96c109..da3d4f4 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -328,6 +328,7 @@ $tabsysprefs{DisplayOPACiconsXSLT} = "OPAC"; $tabsysprefs{SearchMyLibraryFirst} = "OPAC"; $tabsysprefs{hidelostitems} = "OPAC"; $tabsysprefs{opacbookbag} = "OPAC"; +$tabsysprefs{opacbookbagName} = "OPAC"; $tabsysprefs{OpacPasswordChange} = "OPAC"; $tabsysprefs{opacreadinghistory} = "OPAC"; $tabsysprefs{virtualshelves} = "OPAC"; diff --git a/installer/data/mysql/en/mandatory/sysprefs.sql b/installer/data/mysql/en/mandatory/sysprefs.sql index 6f60fa7..a5b386e 100644 --- a/installer/data/mysql/en/mandatory/sysprefs.sql +++ b/installer/data/mysql/en/mandatory/sysprefs.sql @@ -262,3 +262,4 @@ INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES 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,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('opacbookbagName','Cart','Allows libraries to define a different name for the OPAC Cart feature, such as Bookbag or Personal Shelf. If no name is defined, it will default to Cart.','70|10','Textarea'); diff --git a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql index bee360a..b6f3381 100644 --- a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql +++ b/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql @@ -261,3 +261,4 @@ INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('H INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('DisplayOPACiconsXSLT', '1', '', 'Si activé, affiche le format, le type de public et les icônes de type en XSLT (MARC21)).', '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', 'Si activé, affiche la photo de l''adhérent lors de l''utilisation de la console de prêt auto-contrôlé', '', 'YesNo'); +INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('opacbookbagName','Panier','Permet de renommer la fonctionnalité de Panier à l'OPAC, par exemple en Etagère Personnelle. Si vous n'utilisez par cette préférence système, le terme de Panier sera utilisé par défaut',t.'70|10','Textarea'); diff --git a/installer/data/mysql/ru-RU/mandatory/system_preferences_optimal.sql b/installer/data/mysql/ru-RU/mandatory/system_preferences_optimal.sql index 61318c0..168a549 100644 --- a/installer/data/mysql/ru-RU/mandatory/system_preferences_optimal.sql +++ b/installer/data/mysql/ru-RU/mandatory/system_preferences_optimal.sql @@ -238,3 +238,4 @@ INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES(' INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('MergeAuthoritiesOnUpdate', '1', 'if ON, Updating authorities will automatically updates biblios',NULL,'YesNo'); INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowNotForLoanOverride', '0', 'if ON, enables the librarian to choose when they want to check out a notForLoan regular item',NULL,'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,explanation,options,type) VALUES('opacbookbagName','Cart','Allows libraries to define a different name for the OPAC Cart feature, such as Bookbag or Personal Shelf. If no name is defined, it will default to Cart.','70|10','Textarea'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 10c3451..1a926aa 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -2675,6 +2675,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = '3.01.00.062'; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('opacbookbagName', 'Cart', 'Allows libraries to define a different name for the OPAC Cart feature, such as Bookbag or Personal Shelf. If no name is defined, it will default to Cart.', '70|10', 'Textarea')"); + print "Upgrade to $DBversion done ( Added system preference to rename OPAC cart feature)\n"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) Drop all foreign keys of the table $table diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc index 8b148ca..9a78f89 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc @@ -41,16 +41,16 @@