Attachment #1397 for bug #3535

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

Lines 310-315 $tabsysprefs{URLLinkText} = "OPAC"; Link Here

(-)a/admin/systempreferences.pl (+1 lines)
310	$tabsysprefs{OPACShelfBrowser} = "OPAC";	310	$tabsysprefs{OPACShelfBrowser} = "OPAC";
311	$tabsysprefs{OPACDisplayRequestPriority} = "OPAC";	311	$tabsysprefs{OPACDisplayRequestPriority} = "OPAC";
312	$tabsysprefs{OPACAllowHoldDateInFuture} = "OPAC";	312	$tabsysprefs{OPACAllowHoldDateInFuture} = "OPAC";
		313	$tabsysprefs{opacmsgtab} = "OPAC";
313		314
314	# OPAC	315	# OPAC
315	$tabsysprefs{SearchMyLibraryFirst} = "OPAC";	316	$tabsysprefs{SearchMyLibraryFirst} = "OPAC";

Lines 250-252 INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('F Link Here

(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (+1 lines)
250	INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('SpineLabelFormat', '<itemcallnumber><copynumber>', '30\|10', 'This preference defines the format for the quick spine label printer. Just list the fields you would like to see in the order you would like to see them, surrounded by <>, for example <itemcallnumber>.', 'Textarea');	250	INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('SpineLabelFormat', '<itemcallnumber><copynumber>', '30\|10', 'This preference defines the format for the quick spine label printer. Just list the fields you would like to see in the order you would like to see them, surrounded by <>, for example <itemcallnumber>.', 'Textarea');
251	INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('SpineLabelAutoPrint', '0', '', 'If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.', 'YesNo');	251	INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('SpineLabelAutoPrint', '0', '', 'If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.', 'YesNo');
252	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSPrivateKey','','See: http://aws.amazon.com. Note that this is required after 2009/08/15 in order to retrieve any enhanced content other than book covers from Amazon.','','free');	252	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSPrivateKey','','See: http://aws.amazon.com. Note that this is required after 2009/08/15 in order to retrieve any enhanced content other than book covers from Amazon.','','free');
		253	INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('opacmsgtab', '1', '', 'If on, enables display of My Messaging tab in OPAC patron account and the email/text message settings in OPAC user update tab.', 'YesNo');

Lines 252-254 INSERT INTO systempreferences (variable,value,explanation,options,type)VALUES('F Link Here

(-)a/installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql (+1 lines)
252	INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('SpineLabelFormat', '<itemcallnumber><copynumber>', '30\|10', 'This preference defines the format for the quick spine label printer. Just list the fields you would like to see in the order you would like to see them, surrounded by <>, for example <itemcallnumber>.', 'Textarea');	252	INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('SpineLabelFormat', '<itemcallnumber><copynumber>', '30\|10', 'This preference defines the format for the quick spine label printer. Just list the fields you would like to see in the order you would like to see them, surrounded by <>, for example <itemcallnumber>.', 'Textarea');
253	INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('SpineLabelAutoPrint', '0', '', 'If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.', 'YesNo');	253	INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('SpineLabelAutoPrint', '0', '', 'If this setting is turned on, a print dialog will automatically pop up for the quick spine label printer.', 'YesNo');
254	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSPrivateKey','','Voir: http://aws.amazon.com. Notez que cela est nécessaire après le 15 Aout 2009 pour pouvoir utiliser les webservices Amazon autre que les couvertures de livre.','','free');	254	INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('AWSPrivateKey','','Voir: http://aws.amazon.com. Notez que cela est nécessaire après le 15 Aout 2009 pour pouvoir utiliser les webservices Amazon autre que les couvertures de livre.','','free');
		255	INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('opacmsgtab', '1', '', 'Si activé, affiche l'onglet "Mes Messages" dans le compte de l'adhérent à l'OPAC, et la configuration de l'e-mail et du message dans les préférences de l'utilisateur à l'OPAC.', 'YesNo');

Lines 237-239 INSERT INTO `systempreferences` (variable,value,options,explanation,type) VALUES Link Here

(-)a/installer/data/mysql/ru-RU/mandatory/system_preferences_optimal.sql (+1 lines)
237	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowRenewalLimitOverride', '0', 'if ON, allows renewal limits to be overridden on the circulation screen',NULL,'YesNo');	237	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowRenewalLimitOverride', '0', 'if ON, allows renewal limits to be overridden on the circulation screen',NULL,'YesNo');
238	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('MergeAuthoritiesOnUpdate', '1', 'if ON, Updating authorities will automatically updates biblios',NULL,'YesNo');	238	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('MergeAuthoritiesOnUpdate', '1', 'if ON, Updating authorities will automatically updates biblios',NULL,'YesNo');
239	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowNotForLoanOverride', '0', 'if ON, enables the librarian to choose when they want to check out a notForLoan regular item',NULL,'YesNo');	239	INSERT INTO systempreferences (variable,value,explanation,options,type) VALUES('AllowNotForLoanOverride', '0', 'if ON, enables the librarian to choose when they want to check out a notForLoan regular item',NULL,'YesNo');
		240	INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('opacmsgtab', '1', '', 'If on, enables display of My Messaging tab in OPAC patron account and the email/text message settings in OPAC user update tab.', 'YesNo');

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

(-)a/installer/data/mysql/updatedatabase.pl (+8 lines)
2503	print "Upgrade to $DBversion done (added AWSPrivateKey syspref - note that if you use enhanced content from Amazon, this should be set right away.)";	2503	print "Upgrade to $DBversion done (added AWSPrivateKey syspref - note that if you use enhanced content from Amazon, this should be set right away.)";
2504	}	2504	}
2505		2505
		2506	$DBversion = '3.01.00.042';
		2507	if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
		2508	$dbh->do("INSERT INTO systempreferences (variable,value,options,explanation,type)VALUES('opacmsgtab', '1', '', 'If on, enables display of My Messaging tab in OPAC patron account and the email/text message settings in OPAC user update tab.', 'YesNo')");
		2509	SetVersion ($DBversion);
		2510	print "Upgrade to $DBversion done (added opacmsgtab sysprefs)\n";
		2511	}
		2512
		2513
2506	=item DropAllForeignKeys($table)	2514	=item DropAllForeignKeys($table)
2507		2515
2508	Drop all foreign keys of the table $table	2516	Drop all foreign keys of the table $table

Lines 19-26 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/includes/usermenu.inc (+2 lines)
19	<!-- /TMPL_UNLESS -->	19	<!-- /TMPL_UNLESS -->
20	<!-- /TMPL_IF -->	20	<!-- /TMPL_IF -->
21	<!-- TMPL_IF NAME="EnhancedMessagingPreferences" -->	21	<!-- TMPL_IF NAME="EnhancedMessagingPreferences" -->
		22	<!-- TMPL_IF NAME="opacmsgtab" -->
22	<!-- TMPL_IF NAME="messagingview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-messaging.pl">my messaging</a></li>	23	<!-- TMPL_IF NAME="messagingview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-messaging.pl">my messaging</a></li>
23	<!-- /TMPL_IF -->	24	<!-- /TMPL_IF -->
		25	<!-- /TMPL_IF -->
24	<!-- TMPL_IF NAME="virtualshelves" -->	26	<!-- TMPL_IF NAME="virtualshelves" -->
25	<!-- TMPL_IF NAME="listsview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">my lists</a></li>	27	<!-- TMPL_IF NAME="listsview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/opac-shelves.pl?display=privateshelves">my lists</a></li>
26	<!-- /TMPL_IF -->	28	<!-- /TMPL_IF -->




</ol>
</fieldset>

<!-- TMPL_IF NAME="opacmsgtab" -->
<fieldset class="brief">
<legend>Items Borrowed Notifications</legend>
<ol>

</li>
</ol>
</fieldset>
  <!-- /TMPL_IF -->

<!-- TMPL_IF NAME="opacmsgtab" -->
<fieldset class="brief">
<legend>Items Returned Notifications</legend>
<ol>

</li>
</ol>
</fieldset>
  <!-- /TMPL_IF -->

</div>
<div class="yui-u">

Lines 194-199 foreach my $res (@reserves) { Link Here

(-)a/opac/opac-user.pl (+4 lines)
194	$template->param( RESERVES => \@reserves );	194	$template->param( RESERVES => \@reserves );
195	$template->param( reserves_count => $#reserves+1 );	195	$template->param( reserves_count => $#reserves+1 );
196	$template->param( showpriority=>1 ) if $OPACDisplayRequestPriority;	196	$template->param( showpriority=>1 ) if $OPACDisplayRequestPriority;
		197	$template->param( opacmsgtab => C4::Context->preference('opacmsgtab') );
197		198
198	my @waiting;	199	my @waiting;
199	my $wcount = 0;	200	my $wcount = 0;
Lines 259-264 if (C4::Context->preference("OPACAmazonCoverImages") or Link Here
259	$template->param(JacketImages=>1);	260	$template->param(JacketImages=>1);
260	}	261	}
261		262
		263
		264
		265
262	$template->param(	266	$template->param(
263	waiting_count => $wcount,	267	waiting_count => $wcount,
264	textmessaging => $borr->{textmessaging},	268	textmessaging => $borr->{textmessaging},

Lines 142-147 $borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} ); Link Here

(-)a/opac/opac-userupdate.pl (-1 / +1 lines)
142	$borr->{'dateexpiry'} = format_date( $borr->{'dateexpiry'} );	142	$borr->{'dateexpiry'} = format_date( $borr->{'dateexpiry'} );
143	$borr->{'dateofbirth'} = format_date( $borr->{'dateofbirth'} );	143	$borr->{'dateofbirth'} = format_date( $borr->{'dateofbirth'} );
144	$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );	144	$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
		145	$template->param( opacmsgtab => C4::Context->preference('opacmsgtab') );
145		146
146	if (C4::Context->preference('ExtendedPatronAttributes')) {	147	if (C4::Context->preference('ExtendedPatronAttributes')) {
147	my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber, 'opac');	148	my $attributes = C4::Members::Attributes::GetBorrowerAttributes($borrowernumber, 'opac');
148	-

Return to bug 3535

Lines 41-46 Link Here

(-)a/koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl (+4 lines)
41	</ol>	41	</ol>
42	</fieldset>	42	</fieldset>
43		43
		44	<!-- TMPL_IF NAME="opacmsgtab" -->
44	<fieldset class="brief">	45	<fieldset class="brief">
45	<legend>Items Borrowed Notifications</legend>	46	<legend>Items Borrowed Notifications</legend>
46	<ol>	47	<ol>
Lines 62-68 Link Here
62	</li>	63	</li>
63	</ol>	64	</ol>
64	</fieldset>	65	</fieldset>
		66	<!-- /TMPL_IF -->
65		67
		68	<!-- TMPL_IF NAME="opacmsgtab" -->
66	<fieldset class="brief">	69	<fieldset class="brief">
67	<legend>Items Returned Notifications</legend>	70	<legend>Items Returned Notifications</legend>
68	<ol>	71	<ol>
Lines 84-89 Link Here
84	</li>	87	</li>
85	</ol>	88	</ol>
86	</fieldset>	89	</fieldset>
		90	<!-- /TMPL_IF -->
87		91
88	</div>	92	</div>
89	<div class="yui-u">	93	<div class="yui-u">