[Koha-cvs] koha/admin systempreferences.pl [dev_week]

[Joshua Ferraro]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Joshua Ferraro <kados>	06/07/10 21:45:54

Modified files:
	admin          : systempreferences.pl 

Log message:
	merging with rel_2_2

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/admin/systempreferences.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.22.2.18&r2=1.22.2.18.2.1

Patches:
Index: systempreferences.pl
===================================================================
RCS file: /sources/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.22.2.18
retrieving revision 1.22.2.18.2.1
diff -u -b -r1.22.2.18 -r1.22.2.18.2.1
--- systempreferences.pl	27 Apr 2006 17:02:20 -0000	1.22.2.18
+++ systempreferences.pl	10 Jul 2006 21:45:54 -0000	1.22.2.18.2.1
@@ -70,6 +70,9 @@
 	$tabsysprefs{marcflavour}="Catalogue";
 	$tabsysprefs{serialsadditems}="Catalogue";
 	$tabsysprefs{sortbynonfiling}="Catalogue";
+	$tabsysprefs{MARCOrgCode}="Catalogue";
+	$tabsysprefs{z3950AuthorAuthFields}="Catalogue";
+	$tabsysprefs{z3950NormalizeAuthor}="Catalogue";
 # Circulation
 	$tabsysprefs{maxoutstanding}="Circulation";
 	$tabsysprefs{maxreserves}="Circulation";
@@ -77,6 +80,12 @@
 	$tabsysprefs{patronimages}="Circulation";
 	$tabsysprefs{printcirculationslips}="Circulation";
 	$tabsysprefs{ReturnBeforeExpiry}="Circulation";
+# Intranet
+	$tabsysprefs{TemplateEncoding}="Intranet";
+	$tabsysprefs{template}="Intranet";
+	$tabsysprefs{intranetstylesheet}="Intranet";
+	$tabsysprefs{IntranetNav}="Intranet";
+	$tabsysprefs{intranetcolorstylesheet}="Intranet";
 # Members
 	$tabsysprefs{automembernum}="Members";
 	$tabsysprefs{checkdigit}="Members";
@@ -107,6 +116,7 @@
 	$tabsysprefs{SubscriptionHistory}="OPAC";
 	$tabsysprefs{suggestion}="OPAC";
 	$tabsysprefs{virtualshelves}="OPAC";
+	$tabsysprefs{opacheader}="OPAC";
 
 sub StringSearch  {
 	my ($env,$searchstring,$type)=@_;