X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fmembers%2Fmemberentrygen.tt;h=4309824da91632ad7d635d8634bb490af1e4e4b5;hb=e4cdd58b188e785a6d00cf3b7de0e9021d2489c6;hp=d470166b41e4cf8e6a6574615051e40a6e070f53;hpb=9c5c1bc9f104b125e06b3805ce510024e6ad34ac;p=koha.git
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index d470166b41..4309824da9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1,187 +1,22 @@
[% USE Koha %]
[% USE KohaDates %]
+[% USE Branches %]
+[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
-
Koha › Patrons › [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])
+Koha › Patrons › [% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF categoryname %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])
[% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-
-
+
[% INCLUDE 'header.inc' %]
[% INCLUDE 'patron-search.inc' %]
-
Home › Patrons ›
+[% IF (firstname || surname ) %] [% IF (firstname) %][% firstname | html %] [% END %][% IF (surname) %][% surname | html %] [% END %] ›[% END %]
[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron ([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])
[% IF ( opadd ) %]
[% ELSE %]
[% END %]
-
+
@@ -196,26 +31,25 @@ function select_user(borrowernumber, borrower) {
Email has been sent.
[% END %]
- [% IF ( no_add ) %]
Cannot add patron
- [% IF ( no_branches ) %]
There are no libraries defined. [% IF ( CAN_user_parameters ) %]Please add a library.[% ELSE %]An administrator must define at least one library.[% END %]
[% END %]
- [% IF ( no_categories ) %]
There are no patron categories defined. [% IF ( CAN_user_parameters ) %]Please add a patron category.[% ELSE %]An administrator must define at least one patron category.
[% END %][% END %]
[% END %]
+ [% INCLUDE 'noadd-warnings.inc' %]
[% UNLESS ( no_add ) %]
-
[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])
-
+
[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname | html %] [% END %][% IF (surname) %][% surname | html %] [% END %]([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])
[% END %]
@@ -233,12 +67,12 @@ function select_user(borrowernumber, borrower) {
Cardnumber length is incorrect.
[% END %]
[% IF ( ERROR_age_limitations ) %]
-
Patron's age is incorrect for their category.
+
Patron's age is incorrect for their category.
Ages allowed are [% age_low %]-[% age_high %].
[% END %]
[% IF ( ERROR_branch ) %]
Library is invalid.
- [% END %]
+ [% END %]
[% IF ( ERROR_dateofbirth ) %]
Date of birth is invalid.
[% END %]
@@ -248,14 +82,20 @@ function select_user(borrowernumber, borrower) {
[% IF ( ERROR_dateexpiry ) %]
Date of expiration is invalid.
[% END %]
- [% IF ( ERROR_short_password ) %]
-
Password must be at least [% minPasswordLength %] characters long.
- [% END %]
+ [% IF ( ERROR_password_too_short ) %]
+
Password must be at least [% minPasswordLength %] characters long.
+ [% END %]
+ [% IF ( ERROR_password_too_weak ) %]
+
Password must contain at least one digit, one lowercase and one uppercase.
+ [% END %]
+ [% IF ( ERROR_password_has_whitespaces ) %]
+
Password must not contain leading or trailing whitespaces.
+ [% END %]
[% IF ( ERROR_password_mismatch ) %]
Passwords do not match.
[% END %]
[% IF ( ERROR_extended_unique_id_failed ) %]
-
[% ERROR_extended_unique_id_failed_description %] attribute value [% ERROR_extended_unique_id_failed_value %] is already in use by another patron record.
+
[% ERROR_extended_unique_id_failed_description %]: Attribute value "[% ERROR_extended_unique_id_failed_value %]" is already in use by another patron record.
[% END %]
[% IF ERROR_bad_email %]
The primary email is invalid.
@@ -271,16 +111,35 @@ function select_user(borrowernumber, borrower) {
[% END %]
-[% UNLESS ( check_member ) %]