From f73145fd45997fdcdda4f2657fbfff917144e4bb Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 4 Nov 2013 15:19:27 +0100 Subject: [PATCH] Bug 10951: The new pref NoLoginInstructions should be empty by default. We don't want to display an English message by default for everybody. The default message is in the template, so the pref should be empty. Signed-off-by: Jonathan Druart --- installer/data/mysql/sysprefs.sql | 2 +- installer/data/mysql/updatedatabase.pl | 2 +- koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 41973fb..bbba586 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -185,7 +185,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('NewItemsDefaultLocation','','','If set, all new items will have a location of the given Location Code ( Authorized Value type LOC )',''), ('noissuescharge','5','','Define maximum amount withstanding before check outs are blocked','Integer'), ('noItemTypeImages','0',NULL,'If ON, disables item-type images','YesNo'), -('NoLoginInstructions', '
Don\'t have a password yet?

If you don\'t have a password yet, stop by the circulation desk the next time you\'re in the library. We\'ll happily set one up for you.

Don\'t have a library card?

If you don\'t have a library card, stop by your local library to sign up.

', '60|10', 'Instructions when a person is not connected', 'Textarea'), +('NoLoginInstructions', '', '60|10', 'Instructions when a person is not connected', 'Textarea'), ('NotesBlacklist','',NULL,'List of notes fields that should not appear in the title notes/description separator of details','free'), ('NoticeCSS','',NULL,'Notices CSS url.','free'), ('NotifyBorrowerDeparture','30',NULL,'Define number of days before expiry where circulation is warned about patron account expiry','Integer'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index e9118a0..40506c6 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7745,7 +7745,7 @@ if(CheckVersion($DBversion)) { $DBversion ="3.13.00.XXX"; if ( CheckVersion($DBversion) ) { - $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('NoLoginInstructions', '
Don''t have a password yet?

If you don''t have a password yet, stop by the circulation desk the next time you''re in the library. We''ll happily set one up for you.

Don''t have a library card?

If you don''t have a library card, stop by your local library to sign up.

', '60|10', 'Instructions when a person is not connected', 'Textarea')"); + $dbh->do("INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES ('NoLoginInstructions', '', '60|10', 'Instructions when a person is not connected', 'Textarea')"); print "Upgrade to $DBversion done (Bug 10951: Add NoLoginInstructions pref)\n"; SetVersion($DBversion); } diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt index cdbb8e3..98cc462 100644 --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt +++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tt @@ -88,10 +88,10 @@ please choose against which one you would like to authenticate:

[% IF NoLoginInstructions %] [% NoLoginInstructions %] [% ELSE %] -
Don't have a password yet?
-

If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.

-
Don't have a library card?
- If you don't have a library card, stop by your local library to sign up. +
Don't have a password yet?
+

If you don't have a password yet, stop by the circulation desk the next time you're in the library. We'll happily set one up for you.

+
Don't have a library card?
+

If you don't have a library card, stop by your local library to sign up.

[% END %] [% IF PatronSelfRegistration && PatronSelfRegistrationDefaultCategory %]You may register here.[% END %]
-- 1.7.10.4