[Koha-cvs] koha C4/Auth.pm admin/systempreferences.pl upda... [dev_week]

[Owen Leonard]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Owen Leonard <oleonard>	06/09/21 20:04:22

Modified files:
	C4             : Auth.pm 
	admin          : systempreferences.pl 
	updater        : updatedatabase 

Log message:
	- adding system preferences for opacuserjs and intranetuserjs. Allows libraries to add custom javascript to be included in page headers
	- consolidating OPAC javascript includes and enabling opacuserjs in templates
	- removing NPL-specific markup from opac-main.tmpl
	- minor visual changes in stylesheets

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Auth.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.36.2.18.2.6&r2=1.36.2.18.2.7
http://cvs.savannah.gnu.org/viewcvs/koha/admin/systempreferences.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.22.2.18.2.3&r2=1.22.2.18.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&only_with_tag=dev_week&r1=1.100.2.43.2.3&r2=1.100.2.43.2.4

Patches:
Index: C4/Auth.pm
===================================================================
RCS file: /sources/koha/koha/C4/Auth.pm,v
retrieving revision 1.36.2.18.2.6
retrieving revision 1.36.2.18.2.7
diff -u -b -r1.36.2.18.2.6 -r1.36.2.18.2.7
--- C4/Auth.pm	10 Aug 2006 02:10:20 -0000	1.36.2.18.2.6
+++ C4/Auth.pm	21 Sep 2006 20:04:21 -0000	1.36.2.18.2.7
@@ -201,7 +201,7 @@
 			intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
 			intranetstylesheet => C4::Context->preference("intranetstylesheet"),
 			IntranetNav => C4::Context->preference("IntranetNav"),
-
+			intranetuserjs => C4::Context->preference("intranetuserjs"),
 	);
 
 	}
@@ -221,6 +221,9 @@
 				opacbookbag => C4::Context->preference("opacbookbag"),
 				default_facets => C4::Context->preference("default_facets"),
 				opacfacets => C4::Context->preference("opacfacets"),
+				OpacPasswordChange => C4::Context->preference("OpacPasswordChange"),
+                opacreadinghistory => C4::Context->preference("opacreadinghistory"),
+				opacuserjs => C4::Context->preference("opacuserjs"),
 		);
 	}
 	$template->param(
@@ -506,10 +509,12 @@
                 opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
                 opaccolorstylesheet => C4::Context->preference("opaccolorstylesheet"),
                 opaclanguagesdisplay => C4::Context->preference("opaclanguagesdisplay"),
+				opacuserjs => C4::Context->preference("opacuserjs"),
 	
 			intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
 			intranetstylesheet => C4::Context->preference("intranetstylesheet"),
 			IntranetNav => C4::Context->preference("IntranetNav"),
+			intranetuserjs => C4::Context->preference("intranetuserjs"),
 			TemplateEncoding => C4::Context->preference("TemplateEncoding"),
 
 			);

Index: admin/systempreferences.pl
===================================================================
RCS file: /sources/koha/koha/admin/systempreferences.pl,v
retrieving revision 1.22.2.18.2.3
retrieving revision 1.22.2.18.2.4
diff -u -b -r1.22.2.18.2.3 -r1.22.2.18.2.4
--- admin/systempreferences.pl	19 Sep 2006 13:40:57 -0000	1.22.2.18.2.3
+++ admin/systempreferences.pl	21 Sep 2006 20:04:21 -0000	1.22.2.18.2.4
@@ -87,6 +87,7 @@
 	$tabsysprefs{intranetstylesheet}="Intranet";
 	$tabsysprefs{IntranetNav}="Intranet";
 	$tabsysprefs{intranetcolorstylesheet}="Intranet";
+	$tabsysprefs{intranetuserjs}="Intranet";
 # Members
 	$tabsysprefs{automembernum}="Members";
 	$tabsysprefs{checkdigit}="Members";
@@ -114,6 +115,7 @@
 	$tabsysprefs{opacsmallimage}="OPAC";
 	$tabsysprefs{opacstylesheet}="OPAC";
 	$tabsysprefs{opacthemes}="OPAC";
+	$tabsysprefs{opacuserjs}="OPAC";
 	$tabsysprefs{opacuserlogin}="OPAC";
 	$tabsysprefs{SubscriptionHistory}="OPAC";
 	$tabsysprefs{suggestion}="OPAC";

Index: updater/updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.100.2.43.2.3
retrieving revision 1.100.2.43.2.4
diff -u -b -r1.100.2.43.2.3 -r1.100.2.43.2.4
--- updater/updatedatabase	19 Sep 2006 13:40:57 -0000	1.100.2.43.2.3
+++ updater/updatedatabase	21 Sep 2006 20:04:21 -0000	1.100.2.43.2.4
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: updatedatabase,v 1.100.2.43.2.3 2006/09/19 13:40:57 oleonard Exp $
+# $Id: updatedatabase,v 1.100.2.43.2.4 2006/09/21 20:04:21 oleonard Exp $
 
 # Database Updater
 # This script checks for required updates to the database.
@@ -446,6 +446,26 @@
             explanation         => 'Turn on/off display of Patron Reading History in Intranet',
             type                => 'YesNo',
         },
+		{
+            uniquefieldrequired => 'variable',
+            variable            => 'opacuserjs',
+            value               => '',
+            forceupdate         => { 'explanation' => 1,
+                                     'type' => 1},
+            explanation         => 'Custom javascript for inclusion in OPAC',
+            type        => 'Textarea',
+            options => '50|10'
+        },
+		{
+            uniquefieldrequired => 'variable',
+            variable            => 'intranetuserjs',
+            value               => '',
+            forceupdate         => { 'explanation' => 1,
+                                     'type' => 1},
+            explanation         => 'Custom javascript for inclusion in Intranet',
+            type        => 'Textarea',
+            options => '50|10'
+        },
     ],
 
 );
@@ -1605,6 +1625,12 @@
 exit;
 
 # $Log: updatedatabase,v $
+# Revision 1.100.2.43.2.4  2006/09/21 20:04:21  oleonard
+# - adding system preferences for opacuserjs and intranetuserjs. Allows libraries to add custom javascript to be included in page headers
+# - consolidating OPAC javascript includes and enabling opacuserjs in templates
+# - removing NPL-specific markup from opac-main.tmpl
+# - minor visual changes in stylesheets
+#
 # Revision 1.100.2.43.2.3  2006/09/19 13:40:57  oleonard
 # Enabling intranetreadinghistory system preference for showing/hiding reading history in moremember.pl
 #