From 3c6599a34212752c0ed50d84317abb092f6efd87 Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Tue, 22 Apr 2008 18:17:14 -0500 Subject: [PATCH] NOTE TO DOC TEAM: Moved FRBR, Amazon.com and Baker and Taylor tabs in system preferences over to a new tab in sysprefs called Enhanced Content --- admin/systempreferences.pl | 45 +++++++++---------- .../prog/en/includes/sysprefs-menu.inc | 4 +- 2 files changed, 22 insertions(+), 27 deletions(-) diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index df1414c13e..1dd54f6e7d 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -175,15 +175,6 @@ my %tabsysprefs; $tabsysprefs{NotifyBorrowerDeparture}="Patrons"; $tabsysprefs{PatronsPerPage}="Patrons"; -# FRBR - $tabsysprefs{FRBRizeEditions}="FRBR"; - $tabsysprefs{XISBN}="FRBR"; - $tabsysprefs{OCLCAffiliateID}="FRBR"; - $tabsysprefs{XISBNDailyLimit}="FRBR"; - $tabsysprefs{PINESISBN}="FRBR"; - $tabsysprefs{ThingISBN}="FRBR"; - $tabsysprefs{OPACFRBRizeEditions}="FRBR"; - # I18N/L10N $tabsysprefs{dateformat}="I18N/L10N"; $tabsysprefs{opaclanguages}="I18N/L10N"; @@ -207,14 +198,27 @@ my %tabsysprefs; $tabsysprefs{QueryAutoTruncate}="Searching"; $tabsysprefs{QueryRemoveStopwords}="Searching"; -# Amazon.com - $tabsysprefs{AmazonContent}="Amazon"; - $tabsysprefs{AWSAccessKeyID}="Amazon"; - $tabsysprefs{AmazonLocale}="Amazon"; - $tabsysprefs{AmazonAssocTag}="Amazon"; - $tabsysprefs{AmazonSimilarItems}="Amazon"; - $tabsysprefs{OPACAmazonContent}="Amazon"; - $tabsysprefs{OPACAmazonSimilarItems}="Amazon"; +# EnhancedContent + $tabsysprefs{AmazonContent}="EnhancedContent"; + $tabsysprefs{AWSAccessKeyID}="EnhancedContent"; + $tabsysprefs{AmazonLocale}="EnhancedContent"; + $tabsysprefs{AmazonAssocTag}="EnhancedContent"; + $tabsysprefs{AmazonSimilarItems}="EnhancedContent"; + $tabsysprefs{OPACAmazonContent}="EnhancedContent"; + $tabsysprefs{OPACAmazonSimilarItems}="EnhancedContent"; +# Baker & Taylor + $tabsysprefs{BakerTaylorBookstoreURL} = 'EnhancedContent'; + $tabsysprefs{BakerTaylorEnabled} = 'EnhancedContent'; + $tabsysprefs{BakerTaylorPassword} = 'EnhancedContent'; + $tabsysprefs{BakerTaylorUsername} = 'EnhancedContent'; +# FRBR + $tabsysprefs{FRBRizeEditions}="EnhancedContent"; + $tabsysprefs{XISBN}="EnhancedContent"; + $tabsysprefs{OCLCAffiliateID}="EnhancedContent"; + $tabsysprefs{XISBNDailyLimit}="EnhancedContent"; + $tabsysprefs{PINESISBN}="EnhancedContent"; + $tabsysprefs{ThingISBN}="EnhancedContent"; + $tabsysprefs{OPACFRBRizeEditions}="EnhancedContent"; # OPAC $tabsysprefs{BiblioDefaultView}="OPAC"; @@ -290,13 +294,6 @@ my %tabsysprefs; $tabsysprefs{TagsShowOnList} = 'Tags'; $tabsysprefs{TagsModeration} = 'Tags'; -# Baker & Taylor - $tabsysprefs{BakerTaylorBookstoreURL} = 'BakerTaylor'; - $tabsysprefs{BakerTaylorEnabled} = 'BakerTaylor'; - $tabsysprefs{BakerTaylorPassword} = 'BakerTaylor'; - $tabsysprefs{BakerTaylorUsername} = 'BakerTaylor'; - - sub StringSearch { my ($searchstring,$type)=@_; my $dbh = C4::Context->dbh; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc index 6b83ce5275..e7c68665a1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/sysprefs-menu.inc @@ -2,12 +2,10 @@