Attachment #13889 for bug #9009

View | Details | Raw Unified | Return to bug 9009
Collapse All | Expand All

Lines 388-390 INSERT INTO systempreferences (variable, value, options, explanation, type) VALU Link Here

(-)a/installer/data/mysql/sysprefs.sql (+2 lines)
388	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HoldsToPullStartDate','2','Set the default start date for the Holds to pull list to this many days ago',NULL,'Integer');	388	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('HoldsToPullStartDate','2','Set the default start date for the Holds to pull list to this many days ago',NULL,'Integer');
389	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('alphabet','A B C D E F G H I J K L M N O P Q R S T U V W X Y Z','Alphabet than can be expanded into browse links, e.g. on Home > Patrons',NULL,'free');	389	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('alphabet','A B C D E F G H I J K L M N O P Q R S T U V W X Y Z','Alphabet than can be expanded into browse links, e.g. on Home > Patrons',NULL,'free');
390	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RefundLostItemFeeOnReturn', '1', 'If enabled, the lost item fee charged to a borrower will be refunded when the lost item is returned.', NULL, 'YesNo');	390	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('RefundLostItemFeeOnReturn', '1', 'If enabled, the lost item fee charged to a borrower will be refunded when the lost item is returned.', NULL, 'YesNo');
		391	INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserCSS', '', NULL, 'Add CSS to be included in the SCO module in an embedded <style> tag.', 'free');
		392	INSERT INTO systempreferences (variable,value,options,explanation,type) VALUES ('SCOUserJS', '', NULL, 'Define custom javascript for inclusion in the SCO module', 'free');

Lines 6114-6119 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here

(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
6114	SetVersion($DBversion);	6114	SetVersion($DBversion);
6115	}	6115	}
6116		6116
		6117	$DBversion = "3.09.00.XXX";
		6118	if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
		6119	$dbh->do("INSERT INTO systempreferences ( variable, value, explanation, type ) VALUES ( 'SCOUserCSS', '', 'Add CSS to be included in the SCO module in an embedded <style> tag.', 'free' )");
		6120	$dbh->do("INSERT INTO systempreferences ( variable, value, explanation, type ) VALUES ( 'SCOUserJS', '', 'Define custom javascript for inclusion in the SCO module', 'free' )");
		6121	print "Upgrade to $DBversion done (Add SCOUserCSS and SCOUserJS sysprefs)\n";
		6122	SetVersion ($DBversion);
		6123	}
		6124
6117	=head1 FUNCTIONS	6125	=head1 FUNCTIONS
6118		6126
6119	=head2 TableExists($table)	6127	=head2 TableExists($table)




            - lost item fees charged to a borrower when the lost item is returned.
    Self Checkout:
        -
            - "Include the following JavaScript on all pages in the web-based self checkout:"
            - pref: SCOUserJS
              type: textarea
              class: code
        -
            - "Include the following CSS on all pages in the web-based self checkout:"
            - pref: SCOUserCSS
              type: textarea
              class: code
        -
            - pref: ShowPatronImageInWebBasedSelfCheck
              choices:
                  yes: Show

Lines 6-11 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/sco/help.tt (+3 lines)
6	<link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" />	6	<link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" />
7	<link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" />	7	<link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" />
8	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" />	8	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" />
		9	[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %]
		10
		11	[% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</script>[% END %]
9	</head>	12	</head>
10	<body>	13	<body>
11	<div id="doc" class="yui-t7">	14	<div id="doc" class="yui-t7">

Lines 26-31 function closeNow() Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/sco/receipt.tt (+2 lines)
26	}	26	}
27	</script>	27	</script>
28		28
		29	[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %]
		30	[% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</script>[% END %]
29		31
30	</head>	32	</head>
31		33





</script>
[% IF ( opacuserjs ) %]<script type="text/javascript">[% opacuserjs %]</script>[% END %]
[% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</script>[% END %]

<link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" />
<link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" />
<link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" />
[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]
[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %]

</head>
<body onload="dofocus();">

Lines 52-56 if (C4::Context->preference('SelfCheckHelpMessage')) { Link Here

(-)a/opac/sco/help.pl (+5 lines)
52	$template->param(SelfCheckHelpMessage => C4::Context->preference('SelfCheckHelpMessage'));	52	$template->param(SelfCheckHelpMessage => C4::Context->preference('SelfCheckHelpMessage'));
53	}	53	}
54		54
		55	$template->param(
		56	SCOUserJS => C4::Context->preference('SCOUserJS'),
		57	SCOUserCSS => C4::Context->preference('SCOUserCSS'),
		58	);
		59
55	output_html_with_http_headers $query, $cookie, $template->output;	60	output_html_with_http_headers $query, $cookie, $template->output;
56		61

Lines 263-266 if ($borrower->{cardnumber}) { Link Here

(-)a/opac/sco/sco-main.pl (-1 / +5 lines)
263	);	263	);
264	}	264	}
265		265
		266	$template->param(
		267	SCOUserJS => C4::Context->preference('SCOUserJS'),
		268	SCOUserCSS => C4::Context->preference('SCOUserCSS'),
		269	);
		270
266	output_html_with_http_headers $query, $cookie, $template->output;	271	output_html_with_http_headers $query, $cookie, $template->output;
267	-

Return to bug 9009

Lines 460-465 Circulation: Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref (+10 lines)
460	- lost item fees charged to a borrower when the lost item is returned.	460	- lost item fees charged to a borrower when the lost item is returned.
461	Self Checkout:	461	Self Checkout:
462	-	462	-
		463	- "Include the following JavaScript on all pages in the web-based self checkout:"
		464	- pref: SCOUserJS
		465	type: textarea
		466	class: code
		467	-
		468	- "Include the following CSS on all pages in the web-based self checkout:"
		469	- pref: SCOUserCSS
		470	type: textarea
		471	class: code
		472	-
463	- pref: ShowPatronImageInWebBasedSelfCheck	473	- pref: ShowPatronImageInWebBasedSelfCheck
464	choices:	474	choices:
465	yes: Show	475	yes: Show

Lines 95-106 $(document).ready(function() { Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/sco/sco-main.tt (-1 / +2 lines)
95		95
96	</script>	96	</script>
97	[% IF ( opacuserjs ) %]<script type="text/javascript">[% opacuserjs %]</script>[% END %]	97	[% IF ( opacuserjs ) %]<script type="text/javascript">[% opacuserjs %]</script>[% END %]
98		98	[% IF ( SCOUserJS ) %]<script type="text/javascript">[% SCOUserJS %]</script>[% END %]
99		99
100	<link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" />	100	<link rel="stylesheet" type="text/css" href="[% yuipath %]/reset-fonts-grids.css" />
101	<link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" />	101	<link rel="stylesheet" type="text/css" href="[% yuipath %]/skin.css" />
102	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" />	102	<link rel="stylesheet" type="text/css" href="[% themelang %]/css/sco.css" />
103	[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]	103	[% IF ( OPACUserCSS ) %]<style type="text/css">[% OPACUserCSS %]</style>[% END %]
		104	[% IF ( SCOUserCSS ) %]<style type="text/css">[% SCOUserCSS %]</style>[% END %]
104		105
105	</head>	106	</head>
106	<body onload="dofocus();">	107	<body onload="dofocus();">