X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fsystempreferences.pl;h=76a08d27e2c995db9a7304c6742bcb9ece2f828e;hb=472787bf17d131b9cae5698a3967889a003173de;hp=558d6feddb96d9ae68c99f664721a8a330a134d3;hpb=7be6d1f12bd765b669e9cc0ac73793ded4cf56c5;p=koha.git

diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl
index 558d6feddb..76a08d27e2 100755
--- a/admin/systempreferences.pl
+++ b/admin/systempreferences.pl
@@ -49,13 +49,20 @@ use C4::Languages qw(getTranslatedLanguages);
 use C4::ClassSource;
 use C4::Log;
 use C4::Output;
-use C4::Context;
 
 # use Smart::Comments;
 
 
 # FIXME, shouldnt we store this stuff in the systempreferences table? 
 
+# FIXME: This uses hash in a backwards way.  What we really want is:
+# 		$tabsysprefs{key} = $array_ref;
+# 				like
+# 		$tabsysprefs{Cataloguing} = [qw(autoBarcode ISBD marc ...)];
+#
+# 	Because some things *should* be on more than one tab.
+# 	And the tabname is the unique part (the key).
+
 my %tabsysprefs;
 # Acquisitions
     $tabsysprefs{acquisitions}="Acquisitions";
@@ -168,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";
@@ -200,14 +198,36 @@ 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";
+# Tags
+   $tabsysprefs{TagsEnabled}            = 'EnhancedContent';
+   $tabsysprefs{TagsExternalDictionary} = 'EnhancedContent';
+   $tabsysprefs{TagsInputOnDetail}      = 'EnhancedContent';
+   $tabsysprefs{TagsInputOnList}        = 'EnhancedContent';
+   $tabsysprefs{TagsShowOnDetail}       = 'EnhancedContent';
+   $tabsysprefs{TagsShowOnList}         = 'EnhancedContent';
+   $tabsysprefs{TagsModeration}         = 'EnhancedContent';
+   $tabsysprefs{GoogleJackets} 			= 'EnhancedContent';
 
 # OPAC
     $tabsysprefs{BiblioDefaultView}="OPAC";
@@ -259,13 +279,13 @@ my %tabsysprefs;
     $tabsysprefs{OpacRenewalAllowed} = "OPAC";
 
 # LOGFeatures
-    $tabsysprefs{CataloguingLog}  = "LOGFeatures";
-    $tabsysprefs{BorrowersLog}    = "LOGFeatures";
-    $tabsysprefs{SubscriptionLog} = "LOGFeatures";
-    $tabsysprefs{IssueLog}        = "LOGFeatures";
-    $tabsysprefs{ReturnLog}       = "LOGFeatures";
-    $tabsysprefs{LetterLog}       = "LOGFeatures";
-    $tabsysprefs{FinesLog}        = "LOGFeatures";
+    $tabsysprefs{CataloguingLog}  = "Logs";
+    $tabsysprefs{BorrowersLog}    = "Logs";
+    $tabsysprefs{SubscriptionLog} = "Logs";
+    $tabsysprefs{IssueLog}        = "Logs";
+    $tabsysprefs{ReturnLog}       = "Logs";
+    $tabsysprefs{LetterLog}       = "Logs";
+    $tabsysprefs{FinesLog}        = "Logs";
     
 # OAI-PMH variables
    $tabsysprefs{'OAI-PMH'}           = "OAI-PMH";
@@ -274,7 +294,6 @@ my %tabsysprefs;
    $tabsysprefs{'OAI-PMH:Set'}       = "OAI-PMH";
    $tabsysprefs{'OAI-PMH:Subset'}    = "OAI-PMH";
 
-
 sub StringSearch  {
     my ($searchstring,$type)=@_;
     my $dbh = C4::Context->dbh;