Bug 21222: (bug 20226 follow-up) Fix patron creation
[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / members / memberentrygen.tt
index 6b293f1..695b1e2 100644 (file)
+[% USE Asset %]
+[% USE Koha %]
+[% USE KohaDates %]
+[% USE Branches %]
+[% SET footerjs = 1 %]
 [% INCLUDE 'doc-head-open.inc' %]
-<title>Koha &rsaquo; Patrons &rsaquo; 
-[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] [% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %][% UNLESS ( opadd ) %] [% surname %], [% firstname %][% END %]</title>
+<title>Koha &rsaquo; Patrons &rsaquo;
+    [% UNLESS blocking_error %]
+        [% 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 %])
+    [% END %]
+</title>
 [% INCLUDE 'doc-head-close.inc' %]
-[% INCLUDE 'calendar.inc' %]
-<script type="text/javascript">
-//<![CDATA[
-    $(document).ready(function() {
-         $("fieldset.rows input").addClass("noEnterSubmit");
-        $("#guarantordelete").click(function() {
-            $("#contact-details").hide().find('a').remove();
-            $("#guarantorid, #contactname, #contactfirstname").each(function () { this.value = "" });
-            $("#contactname, #contactfirstname")
-                .each(function () { this.type = 'text' })
-                .parent().find('span').remove();
-            $("#guarantorsearch").val("Set to Patron");
-        });
-        $("#select_city").change(function(){
-            var myRegEx=new RegExp(/(.*)\|(.*)\|(.*)\|(.*)/);
-            document.form.select_city.value.match(myRegEx);
-            document.form.zipcode.value=RegExp.$1;
-            document.form.city.value=RegExp.$2;
-            document.form.state.value=RegExp.$3;
-            document.form.country.value=RegExp.$4;
-        });
-
-        [% IF categorycode %]
-            update_category_code( "[% categorycode %]" );
-        [% ELSE %]
-            if ( $("#categorycode").length > 0 ){
-                var category_code = $("#categorycode").find("option:selected").val();
-                update_category_code( category_code );
-            }
-        [% END %]
-        $("#dateofbirth").datepicker({ maxDate: "-1D" });
-        $("#entryform").preventDoubleFormSubmit();
-    });
-
-    function clear_entry(node) {
-        var original = $(node).parent();
-        $("textarea", original).attr('value', '');
-        $("select", original).attr('value', '');
-    }
-
-    function clone_entry(node) {
-        var original = $(node).parent();
-        var clone = original.clone();
-
-        var newId = 50 + parseInt(Math.random() * 100000);
-        $("input,select,textarea", clone).attr('id', function() {
-            return this.id.replace(/patron_attr_\d+/, 'patron_attr_' + newId);
-        });
-        $("input,select,textarea", clone).attr('name', function() {
-            return this.name.replace(/patron_attr_\d+/, 'patron_attr_' + newId);
-        });
-        $("label", clone).attr('for', function() {
-            return $(this).attr("for").replace(/patron_attr_\d+/, 'patron_attr_' + newId);
-        });
-        $("input#patron_attr_" + newId, clone).attr('value','');
-        $("select#patron_attr_" + newId, clone).attr('value','');
-        $(original).after(clone);
-        return false;
-    }
-
-    function update_category_code(category_code) {
-        if ( $(category_code).is("select") ) {
-            category_code = $("#categorycode").find("option:selected").val();
-        }
-        var mytables = $(".attributes_table");
-        $(mytables).find("li").hide();
-        $(mytables).find(" li[data-category_code="+category_code+"]").show();
-        $(mytables).find(" li[data-category_code='']").show();
-    }
-
-               var MSG_SEPARATOR = _("Separator must be / in field ");
-        var MSG_INCORRECT_DAY = _("Invalid day entered in field ");
-        var MSG_INCORRECT_MONTH = _("Invalid month entered in field ");
-        var MSG_INCORRECT_YEAR = _("Invalid year entered in field ");
-        var MSG_DUPLICATE_PATRON = _("Warning: Duplicate patron");
-        var MSG_DUPLICATE_ORGANIZATION = _("Warning: Duplicate organization");
-        var MSG_LATE_EXPIRY = _("Warning: Expiration date falls before enrollment date");
-        var MSG_MISSING_MANDATORY = _("The following fields are mandatory:");
-        var MSG_DUPLICATE_SUSPICION = _("Please confirm whether this is a duplicate patron");
-        var MSG_PASSWORD_MISMATCH = _("The passwords entered do not match");
-//]]>
-</script>
-<script type="text/javascript" src="[% themelang %]/js/members.js"></script>
 </head>
+
 <body id="pat_memberentrygen" class="pat">
 [% INCLUDE 'header.inc' %]
 [% INCLUDE 'patron-search.inc' %]
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; 
-[% IF ( opadd ) %]
-               Add[% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %]
-[% surname %] [% firstname %]
-[% ELSE %] 
-<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% firstname %] [% surname %]</a> &rsaquo; <strong>[% IF ( opduplicate ) %]Duplicate[% ELSE %]Modify[% END %][% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %]
-</strong>[% END %]</div>
+<div id="breadcrumbs">
+    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
+    [% UNLESS blocking_error %]
+    &rsaquo;[% IF (firstname || surname ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% IF (firstname) %][% firstname | html %] [% END %][% IF (surname) %][% surname | html %] [% END %]</a>  &rsaquo;[% END %]
+<strong>[% 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 %])</strong>
+    [% END %]
+</div>
 [% IF ( opadd ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
-   
+
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
-
+    [% INCLUDE 'blocking_errors.inc' %]
     [% IF error_alert %]
         [% IF ( error_alert == "no_email" ) %]
             <div class="error">This member has no email</div>
         <div class="dialog message">Email has been sent.</div>
     [% END %]
 
-       [% IF ( no_add ) %]<div class="dialog alert"><h3>Cannot add patron</h3>
-               [% IF ( no_branches ) %]<p>There are <strong>no libraries defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/branches.pl">add a library</a>.[% ELSE %]An administrator must define at least one library.[% END %]</p>[% END %]
-               [% IF ( no_categories ) %]<p>There are <strong>no patron categories defined</strong>. [% IF ( CAN_user_parameters ) %]Please <a href="/cgi-bin/koha/admin/categorie.pl">add a patron category</a>.[% ELSE %]An administrator must define at least one patron category.</p>[% END %][% END %]</div>[% END %]
+    [% INCLUDE 'noadd-warnings.inc' %]
 
        [% UNLESS ( no_add ) %]
-       [% IF ( opadd ) %]
-       <h1>
-               Add[% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %] [% firstname %] [% surname %] 
-       </h1>
-       [% ELSE %]
-       <h1>
-               [% IF ( opduplicate ) %]Duplicate[% ELSE %]Modify[% END %][% IF ( categoryname ) %] [% categoryname %] patron[% ELSE %][% IF ( I ) %] Organization patron[% END %][% IF ( A ) %] Adult patron[% END %][% IF ( C ) %] Child patron[% END %][% IF ( P ) %] Professional patron[% END %][% IF ( S ) %] Staff patron[% END %][% END %]
-[% firstname %] [% surname %] 
-       </h1>
-       [% END %]
-  
+    <h1>[% 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 %])</h1>
+
+    [% IF quickadd && opadd && !check_member %]
+        <a href="#" class="toggle_quick_add"><i class="fa fa-plus-square"></i> Show full form</a>
+        <a href="#" class="toggle_quick_add" style="display:none"><i class="fa fa-minus-square"></i> Show brief form</a>
+    [% END %]
+
        [% IF ( check_member ) %]
                        <div class="dialog alert">
                                <h3>Duplicate patron record?</h3>
-                               <p><a class="popup" href="javascript:Dopop('moremember.pl?print=brief&amp;borrowernumber=[% check_member %]');" >View existing record</a></p>
-                               <form action="/cgi-bin/koha/members/memberentry.pl" method="get"><input type="hidden" name="op" value="modify" /><input type="hidden" name="borrowernumber" value="[% check_member %]" /><input type="hidden" name="category_type" value="[% check_categorytype %]" /><input class="edit" type="submit" value="It is a duplicate. Edit existing record" /></form>
+                <p><a class="popup" href="#" onclick="Dopop('moremember.pl?print=brief&amp;borrowernumber=[% check_member %]');return false;" >View existing record</a></p>
+                <button id="duplicate" type="submit" class="new"><i class="fa fa-pencil"></i> It is a duplicate.
+                Edit existing record</button>
 
-                <form name="form_double" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off">
-                               <input type="hidden" name="nodouble" value="1" />
-                               <input class="new" type="submit" value="Not a duplicate. Save as new record" />
+                <button type="submit" id="not-duplicate" class="new"><i class="fa fa-plus"></i> Not a duplicate.
+                Save as new record</button>
                        </div>
        [% END %]
 
                        [% IF ( ERROR_login_exist ) %]
                                <li id="ERROR_login_exist">Username/password already exists.</li>
                        [% END %]
-                       [% IF ( ERROR_cardnumber ) %]
-                               <li id="ERROR_cardnumber">Cardnumber already in use.</li>
-                       [% END %]
+            [% IF ERROR_cardnumber_already_exists %]
+                <li id="ERROR_cardnumber">Cardnumber already in use.</li>
+            [% END %]
+            [% IF ERROR_cardnumber_length %]
+                <li id="ERROR_cardnumber">Cardnumber length is incorrect.</li>
+            [% END %]
                        [% IF ( ERROR_age_limitations ) %]
-                               <li id="ERROR_age_limitations">Patron's age is incorrect for their category.  
+            <li id="ERROR_age_limitations">Patron's age is incorrect for their category.
                     Ages allowed are [% age_low %]-[% age_high %].</li>
                        [% END %]
                        [% IF ( ERROR_branch ) %]
                                <li id="ERROR_branch">Library is invalid.</li>
-                       [% END %]   
+            [% END %]
                        [% IF ( ERROR_dateofbirth ) %]
                                <li id="ERROR_dateofbirth">Date of birth is invalid.</li>
                        [% END %]
                        [% IF ( ERROR_dateexpiry ) %]
                                <li id="ERROR_dateexpiry">Date of expiration is invalid.</li>
                        [% END %]
-                       [% IF ( ERROR_short_password ) %]
-                               <li id="ERROR_short_password">Password must be at least [% minPasswordLength %] characters long.</li>
-                       [% END %]
+            [% IF ( ERROR_password_too_short ) %]
+                <li id="ERROR_short_password">Password must be at least [% minPasswordLength %] characters long.</li>
+            [% END %]
+            [% IF ( ERROR_password_too_weak ) %]
+                <li id="ERROR_weak_password">Password must contain at least one digit, one lowercase and one uppercase.</li>
+            [% END %]
+            [% IF ( ERROR_password_has_whitespaces ) %]
+                <li id="ERROR_weak_password">Password must not contain leading or trailing whitespaces.</li>
+            [% END %]
                        [% IF ( ERROR_password_mismatch ) %]
                                <li id="ERROR_password_mismatch">Passwords do not match.</li>
                        [% END %]
             [% IF ( ERROR_extended_unique_id_failed ) %]
-                <li id="ERROR_extended_unique_id_failed">The attribute value 
-                    [% ERROR_extended_unique_id_failed %] is already is use by another patron record.</li>
+                <li id="ERROR_extended_unique_id_failed"><strong>[% ERROR_extended_unique_id_failed_description %]:</strong> Attribute value "[% ERROR_extended_unique_id_failed_value %]" is already in use by another patron record.</li>
                        [% END %]
+            [% IF ERROR_bad_email %]
+                <li id="ERROR_bad_email">The primary email is invalid.</li>
+            [% END %]
+            [% IF ERROR_bad_email_secondary %]
+                <li id="ERROR_bad_email_secondary">The secondary email is invalid.</li>
+            [% END %]
+            [% IF ERROR_bad_email_alternative %]
+                <li id="ERROR_bad_email_alternative">The alternative email is invalid.</li>
+            [% END %]
                        </ul>
                </div>
        [% END %]
 
 
-[% UNLESS ( check_member ) %]<form name="form" id="entryform"  action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off">
-<input type="hidden" name="nodouble"  value="[% nodouble %]" /> [% END %]
+<div id="toolbar" class="btn-toolbar">
+[% UNLESS ( check_member ) %]
+    [% IF quickadd && opadd %]
+        <button class="btn btn-default btn-sm toggler" id="save_quick_add" name="save"><i class="fa fa-save"></i> Save</button>
+    [% END %]
+    <button class="btn btn-default btn-sm toggler" id="saverecord" name="save" ><i class="fa fa-save"></i> Save</button>
+    [% IF opadd %]
+        <a class="btn btn-default btn-sm" href="/cgi-bin/koha/members/member.pl" class="toggler save_entryform">
+    [% ELSE %]
+        <a class="btn btn-default btn-sm" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">
+    [% END %]
+        <i class="fa fa-times"></i> Cancel
+    </a>
+[% END %]
+</div>
+
+<form name="form" id="entryform"  action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off" class="toggler" >
+[% UNLESS ( check_member ) %]
+    <input type="hidden" name="nodouble"  value="[% nodouble %]" />
+[% END %]
 <!--    field always hidden in different form (1,2,3) -->
 <input type="hidden" name="BorrowerMandatoryField" value="[% BorrowerMandatoryField %]" />
 <input type="hidden" name="category_type" value="[% category_type %]" />
 <input type="hidden" name="updtype" value="[% updtype %]" />
-<input type="hidden" name="select_roadtype" value="[% select_roadtype %]" />
 <input type="hidden" name="destination" value="[% destination %]" />
 <input type="hidden" name="check_member" value="[% check_member %]" />
-<input type="hidden" name="borrowernumber" value="[% IF ( opduplicate ) %][% ELSE %][% borrowernumber %][% END %]" />
-<input type="hidden" name="nodouble"  value="[% IF ( opduplicate ) %][% ELSE %][% nodouble %][% END %]" />
+<input type="hidden" name="borrowernumber" value="[% borrowernumber UNLESS opduplicate %]" />
+<input type="hidden" name="nodouble"  value="[% nodouble UNLESS opduplicate %]" />
+<input type="hidden" name="csrf_token" value="[% csrf_token %]" />
 [% IF ( step ) %]<input type="hidden" name="step"  value="[% step %]" />[% END %]
 [% IF ( opadd ) %]<input type="hidden" name="op" value="insert" />
 [% ELSIF ( opduplicate ) %]
 <input type="hidden" name="op" value="insert" />
 [% ELSE %]
 <input type="hidden" name="op" value="save" />
-[% IF step == 4 || step == 5 || step == 6 || step == 2 || step == 1 %]
+[% IF step == 4 || step == 5 || step == 6 || step == 2 || step == 1 || step == 7 %]
 [%# Only put the cardnumber if we arent showing it in the form later %]
 [% IF cardnumber %]
 <input type="hidden" name="cardnumber" value="[% cardnumber %]" />
                <ol>
                [% UNLESS ( I ) %]
         [% UNLESS notitle %]
-               [% IF ( title_cgipopup ) %]
+        [% IF Koha.Preference('BorrowersTitles') %]
             <li>
             [% IF ( mandatorytitle ) %]
                 <label for="btitle" class="required">
                 <label for="btitle">
             [% END %]
             Salutation: </label>
-            [% borrotitlepopup %]
+            <select id="btitle" name="title">
+                <option value=""></option>
+                [% FOREACH t IN Koha.Preference('BorrowersTitles').split('\|') %]
+                    [% IF btitle == t %]
+                        <option value="[% t %]" selected="selected">[% t %]</option>
+                    [% ELSE %]
+                        <option value="[% t %]">[% t %]</option>
+                    [% END %]
+                [% END %]
+            </select>
             [% IF ( mandatorytitle ) %]<span class="required">Required</span>[% END %]
             </li>
                [% END %]
                [% END %]
         [% UNLESS nosurname %]
                <li>
-               [% IF ( mandatorysurname ) %]
-               <label for="surname" class="required">
-               [% ELSE %]
-               <label for="surname">
-               [% END %]
-               Surname: </label>
+
+        [% IF ( I ) %]
+            <label for="surname" class="required">
+                Name:
+            </label>
+        [% ELSE %]
+            [% IF ( mandatorysurname ) %]
+                <label for="surname" class="required">
+            [% ELSE %]
+                <label for="surname">
+            [% END %]
+            Surname: </label>
+        [% END %]
+
                [% IF ( uppercasesurnames ) %]
-                       [% IF ( opduplicate ) %]
-                               <input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20"  value="[% surname %]" onclick="this.value=''" />
-                       [% ELSE %]
-                               <input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20"  value="[% surname %]" />
-                       [% END %]
+            <input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20"  value="[% surname %]" />
                [% ELSE %]
-                       [% IF ( opduplicate ) %]
-                               <input type="text" id="surname" name="surname" size="20"  value="[% surname %]" onclick="this.value=''" />
-                       [% ELSE %]
-                               <input type="text" id="surname" name="surname" size="20"  value="[% surname %]" />
-                       [% END %]
+            <input type="text" id="surname" name="surname" size="20"  value="[% surname %]" />
                [% END %]
                [% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %]
                </li>
                 <label for="firstname">
                 [% END %]
                 First name: </label>
-                <input type="text" id="firstname" name="firstname" size="20"  value="[% IF ( opduplicate ) %][% ELSE %][% firstname %][% END %]" />
+                <input type="text" id="firstname" name="firstname" size="20"  value="[% firstname | html UNLESS opduplicate %]" />
                 [% IF ( mandatoryfirstname ) %]<span class="required">Required</span>[% END %]
             </li>
         [% END %]
                 [% END %]
                 Date of birth: </label>
 
-        [% IF ( dateformat == "metric" ) %]
-                <input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="[% IF ( opduplicate ) %][% ELSE %][% dateofbirth %][% END %]" />
-        [% ELSE %]
-                <input type="text" id="dateofbirth" name="dateofbirth" size="20" value="[% IF ( opduplicate ) %][% ELSE %][% dateofbirth %][% END %]" />
-        [% END %]
+                <input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="write_age();" value="[% dateofbirth UNLESS opduplicate %]" class="datepicker" />
 
         [% IF ( mandatorydateofbirth ) %]<span class="required">Required</span>[% END %]
         [% IF ( ERROR_dateofbirth ) %]<span class="required">(Error)</span>[% END %]
                     <label for="initials">
                 [% END %]
                 Initials: </label>
-                [% IF ( opduplicate ) %]
-                                       <input type="text" id="initials" name="initials" size="20"  value="[% initials %]" onclick="this.value=''" />
-                [% ELSE %]
-                                       <input type="text" id="initials" name="initials" size="20"  value="[% initials %]" />
-                [% END %]
+                <input type="text" id="initials" name="initials" size="20"  value="[% initials | html UNLESS opduplicate %]" />
                 [% IF ( mandatoryinitials ) %]<span class="required">Required</span>[% END %]
             </li>
         [% END %]
                        [% ELSE %]
                        <label for="othernames">
                        [% END %]
-                       Other name: </label>
-                       [% IF ( opduplicate ) %]
-                               <input type="text" id="othernames" name="othernames" size="20"  value="[% othernames %]" onclick="this.value=''" />
-                       [% ELSE %]
-                               <input type="text" id="othernames" name="othernames" size="20"  value="[% othernames %]" />
-                       [% END %]
+            Other name: </label>
+            <input type="text" id="othernames" name="othernames" size="20"  value="[% othernames | html UNLESS opduplicate %]" />
 [% IF ( mandatoryothernames ) %]<span class="required">Required</span>[% END %]
                [% IF ( I ) %]<input type="hidden" name="sex" value="N" />[% END %]
                </li>
     [% UNLESS ( I ) %]
         [% UNLESS nosex %]
                <li class="radio">
-               
-               [% IF ( female ) %]
-                               <label for="sex-female">Female </label><input type="radio" name="sex" id="sex-female" value="F" checked="checked"  />
-[% ELSE %]
-                               <label for="sex-female">Female </label><input type="radio" name="sex" id="sex-female" value="F" />
-[% END %]
-               [% IF ( male ) %]
-               <label for="sex-male">Male </label><input type="radio" name="sex" id="sex-male" value="M" checked="checked" />
-[% ELSE %]
-                               <label for="sex-male">Male </label><input type="radio" name="sex" id="sex-male" value="M" />
-[% END %]
-[% IF ( none ) %]
-                               <label for="sex-none">N/A </label><input type="radio" name="sex" id="sex-none" value=""  checked="checked"  />
-[% ELSE %]
-                               <label for="sex-none">N/A </label><input type="radio" name="sex" id="sex-none" value="" />
-[% END %]
+
+            [% UNLESS ( opduplicate ) %]
+                [% IF ( female ) %]
+                    <label for="sex-female"><input type="radio" name="sex" id="sex-female" value="F" checked="checked" /> Female</label>
+                [% ELSE %]
+                    <label for="sex-female"><input type="radio" name="sex" id="sex-female" value="F" /> Female</label>
+                [% END %]
+                [% IF ( male ) %]
+                    <label for="sex-male"><input type="radio" name="sex" id="sex-male" value="M" checked="checked" /> Male</label>
+                [% ELSE %]
+                    <label for="sex-male"><input type="radio" name="sex" id="sex-male" value="M" /> Male</label>
+                [% END %]
+                [% IF ( none ) %]
+                    <label for="sex-none"><input type="radio" name="sex" id="sex-none" value=""  checked="checked" /> None specified</label>
+                [% ELSE %]
+                    <label for="sex-none"><input type="radio" name="sex" id="sex-none" value="" /> None specified</label>
+                [% END %]
+            [% ELSE %]
+                <label for="sex-female">Female </label><input type="radio" name="sex" id="sex-female" value="F" />
+                <label for="sex-male">Male </label><input type="radio" name="sex" id="sex-male" value="M" />
+                <label for="sex-none">None specified </label><input type="radio" name="sex" id="sex-none" value="" checked="checked" />
+            [% END %]
+
                </li>
         [% END %]
     [% END %]
        </fieldset>
 [% END # hide fieldset %]
 
-[% IF ( showguarantor ) %]<input type="hidden" id="guarantorid" name="guarantorid"   value="[% guarantorid %]" />
-    <fieldset class="rows">
-        <legend>Guarantor information</legend>
+[% IF ( showguarantor ) %]
+    <input type="hidden" id="guarantorid" name="guarantorid"   value="[% guarantorid %]" />
+    [% UNLESS step_6 %]
+        <input type="hidden" name="branchcode" value="[% branchcode %]" />
+    [% END %]
+    <fieldset id="memberentry_guarantor" class="rows">
+        <legend id="guarantor_lgd">Guarantor information</legend>
         <ol>
 [% IF ( P ) %]
                [% IF ( guarantorid ) %]
                    <label for="contactname">Organization name: </label>
                    [% IF ( guarantorid ) %]
                    <span>[% contactname %]</span>
-                   <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname %]" />
+                   <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname | html %]" />
                    [% ELSE %]
-                           [% IF ( opduplicate ) %]
-                                               <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" onclick="this.value=''" />
-                           [% ELSE %]
-                                               <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" />
-                           [% END %]
+                    <input name="contactname" id="contactname" type="text" size="20" value="[% contactname | html %]" />
                    [% END %]
                </li>
 [% ELSE %]
  [% ELSE %]
  <li id="contact-details" style="display: none">
  [% END %]
-     <span class="label">Patron #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid %]</a>[% END %]
+     <span class="label">Patron #:</span>
+     [% IF guarantorid %]
+        [% IF logged_in_user.can_see_patron_infos( guarantor ) %]
+            <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid | html %]</a>
+        [% ELSE %]
+            [% guarantorid | html %]
+        [% END %]
+    [% END %]
  </li>
         [% UNLESS nocontactname %]
  <li>
      <label for="contactname">Surname: </label>
      [% IF ( guarantorid ) %]
      <span>[% contactname %]</span>
-     <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname %]" />
+     <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname | html %]" />
      [% ELSE %]
-               [% IF ( opduplicate ) %]
-                       <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" onclick="this.value=''" />
-               [% ELSE %]
-                       <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" />
-               [% END %]
+        <input name="contactname" id="contactname" type="text" size="20" value="[% contactname | html %]" />
      [% END %]
  </li>
         [% END %]
      <label for="contactfirstname">First name: </label>
      [% IF ( guarantorid ) %]
      <span>[% contactfirstname %]</span>
-     <input name="contactfirstname" id="contactfirstname" type="hidden" size="20" value="[% contactfirstname %]" />
+     <input name="contactfirstname" id="contactfirstname" type="hidden" size="20" value="[% contactfirstname | html %]" />
      [% ELSE %]
-            [% IF ( opduplicate ) %]
-                               <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname %]" onclick="this.value=''" />
-            [% ELSE %]
-                               <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname %]" />
-            [% END %]
+        <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname | html %]" />
      [% END %]
  </li>
         [% END %]
         <li>
             <span class="label">&nbsp;</span>
             [% IF ( guarantorid ) %]
-            <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl?category_type=[% category_type %]');" />
+            <input id="guarantorsearch" type="button" value="Change" onclick="Dopopguarantor('guarantor_search.pl');" />
             [% ELSE %]
-            <input id="guarantorsearch" type="button" value="Set to patron" onclick="Dopopguarantor('guarantor_search.pl?category_type=[% category_type %]');" />
+            <input id="guarantorsearch" type="button" value="Set to patron" onclick="Dopopguarantor('guarantor_search.pl');" />
             [% END %]
             <input id="guarantordelete" type="button" value="Delete" />
         </li>
+    [% IF guarantorid && Koha.Preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') %]
+        <li>
+            <label for="privacy_guarantor_checkouts">Show checkouts to guarantor</label>
+            <select name="privacy_guarantor_checkouts" id="privacy_guarantor_checkouts">
+                [% IF privacy_guarantor_checkouts %]
+                    <option value="0">No</option>
+                    <option value="1" selected>Yes</option>
+                [% ELSE %]
+                    <option value="0" selected>No</option>
+                    <option value="1">Yes</option>
+                [% END %]
+            </select>
+            <div class="hint">Allow guarantor of this patron to view this patron's checkouts from the OPAC</div>
+        </li>
+    [% END %]
         </ol>
     </fieldset>
 
 [% END %]
 [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
-<fieldset class="rows">
-    <legend id="main_address_lgd">Main address</legend><ol>
-        [% UNLESS nostreetnumber %]
-    <li>
-      [% IF ( mandatorystreetnumber ) %]
-      <label for="streetnumber" class="required">
-      [% ELSE %]
-      <label for="streetnumber">
-      [% END %]
-      Street number: </label>
-      [% IF ( opduplicate ) %]
-               <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" onclick="this.value=''" />
-      [% ELSE %]
-               <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
-      [% END %]
-[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
-    </li>
-        [% END %]
-        [% UNLESS nostreettype %]
-    [% IF ( road_cgipopup ) %]
-      <li>
-      [% IF ( mandatorystreettype ) %]
-      <label for="streettype" class="required">
-      [% ELSE %]
-      <label for="streettype">
-      [% END %]
-      Street type: </label>
-      [% roadpopup %]
-         [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
-      </li>
-    [% END %] 
-        [% END %]
-        [% UNLESS noaddress %]
-    <li>
-      [% IF ( mandatoryaddress ) %]
-      <label for="address" class="required">
-      [% ELSE %]
-      <label for="address">
-      [% END %]
-      Address: </label>
-      [% IF ( opduplicate ) %]
-                       <input type="text" id="address" name="address" size="35" value="[% address %]" onclick="this.value=''" />
-      [% ELSE %]
-                       <input type="text" id="address" name="address" size="35" value="[% address %]" />
-      [% END %]
-         [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
-    </li>
-        [% END %]
-        [% UNLESS noaddress2 %]
-    <li>
-      [% IF ( mandatoryaddress2 ) %]
-      <label for="address2" class="required">
-      [% ELSE %]
-      <label for="address2">
-      [% END %]
-      Address 2: </label>
-      [% IF ( opduplicate ) %]
-                       <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" onclick="this.value=''" />
-      [% ELSE %]
-                       <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" />
-      [% END %]
-         [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
-    </li>  
-        [% END %]
-        [% UNLESS nocity %]
-    <li>
-      [% IF ( mandatorycity ) %]
-        <label for="city" class="required">
-      [% ELSE %]
-        <label for="city">
-      [% END %]
-      City: </label>
-        [% IF ( opduplicate ) %]
-                       <input type="text" id="city" name="city" size="20" value="[% city %]" onclick="this.value=''" />
-        [% ELSE %]
-                       <input type="text" id="city" name="city" size="20" value="[% city %]" />
-        [% END %]
-        [% IF ( city_cgipopup ) %]or <strong>choose</strong>
-        <select id="select_city" name="select_city">
-        [% FOREACH city_loo IN city_loop %]
-            [% IF ( city_loo.selected ) %]
-            <option value="[% city_loo.city_zipcode %]|[% city_loo.city_name %]|[% city_loo.city_state %]|[% city_loo.city_country %]" selected="selected">
-            [% ELSE %]
-            <option value="[% city_loo.city_zipcode %]|[% city_loo.city_name %]|[% city_loo.city_state %]|[% city_loo.city_country %]">
-            [% END %]
-                [% city_loo.city_name %] [% city_loo.city_state %] [% city_loo.city_zipcode %]
-            </option>
-        [% END %]
-        </select>
-        [% END %]
-         [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
-    </li>
-        [% END %]
-        [% UNLESS nostate %]
-    <li> 
-      [% IF ( mandatorystate ) %]
-        <label for="state" class="required">
-      [% ELSE %]
-        <label for="state">
-      [% END %]
-      State: </label>
-      <input type="text" name="state" id="state" size="20" value="[% state %]" />
-         [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
-    </li>
-        [% END %]
-        [% UNLESS nozipcode %]
-    <li> 
-      [% IF ( mandatoryzipcode ) %]
-        <label for="zipcode" class="required">
-      [% ELSE %]
-        <label for="zipcode">
-      [% END %]
-      Zip/Postal code: </label>
-      [% IF ( opduplicate ) %]
-                       <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" onclick="this.value=''" />
-      [% ELSE %]
-                       <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" />
-      [% END %]
-         [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
-    </li>
-        [% END %]
-        [% UNLESS nocountry %]
-    <li> 
-      [% IF ( mandatorycountry ) %]
-        <label for="country" class="required">
-      [% ELSE %]
-        <label for="country">
-      [% END %]
-      Country: </label>
-      [% IF ( opduplicate ) %]
-                       <input type="text" name="country" id="country" size="20" value="[% country %]" onclick="this.value=''" />
-      [% ELSE %]
-                       <input type="text" name="country" id="country" size="20" value="[% country %]" />
-      [% END %]
-         [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
-    </li>    
-        [% END %]
-       </ol>
-    </fieldset>
+    [% IF Koha.Preference( 'AddressFormat' ) %]
+        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+    [% ELSE %]
+        [% INCLUDE 'member-main-address-style-us.inc' %]
+    [% END %]
 [% END # nostreet && nocity etc group%]
 
 [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
     <legend id="contact_lgd">Contact</legend><ol>
         [% UNLESS nophone %]
       <li>
-      [% IF ( mandatoryphone ) %] 
+      [% IF ( mandatoryphone ) %]
       <label for="phone" class="required">
       [% ELSE %]
       <label for="phone">
       [% END %]
       Primary phone: </label>
-      [% IF ( opduplicate ) %]
-                       <input type="text" id="phone" name="phone" value="[% phone %]" onclick="this.value=''" />
-      [% ELSE %]
-                       <input type="text" id="phone" name="phone" value="[% phone %]" />
-      [% END %]
+        <input type="text" id="phone" name="phone" value="[% phone | html %]" />
          [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
 
     </li>
       <label for="phonepro">
       [% END %]
       Secondary phone: </label>
-      [% IF ( opduplicate ) %]
-                       <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]" onclick="this.value=''" />
-      [% ELSE %]
-                       <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]" />
-      [% END %]
+    <input type="text" id="phonepro" name="phonepro" value="[% phonepro | html %]" />
          [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
       <label for="mobile">
       [% END %]
       Other phone: </label>
-      [% IF ( opduplicate ) %]
-               <input type="text" id="mobile" name="mobile" value="[% mobile %]" onclick="this.value=''" />
-      [% ELSE %]
-               <input type="text" id="mobile" name="mobile" value="[% mobile %]" />
-      [% END %]
+        <input type="text" id="mobile" name="mobile" value="[% mobile | html %]" />
          [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
       <label for="email">
       [% END %]
       Primary email: </label>
-      [% IF ( opduplicate ) %]
-               <input type="text" id="email" name="email" size="45" value="[% email %]" onclick="this.value=''" />
-      [% ELSE %]
-               <input type="text" id="email" name="email" size="45" value="[% email %]" />
-      [% END %]
+        <input type="text" id="email" name="email" size="45" value="[% email | html %]" />
          [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
 
     </li>
         [% END %]
         [% UNLESS noemailpro %]
     <li>
-      [% IF ( mandatoryemailpro ) %] 
+      [% IF ( mandatoryemailpro ) %]
       <label for="emailpro" class="required">
       [% ELSE %]
       <label for="emailpro">
       [% END %]
       Secondary email: </label>
-      [% IF ( opduplicate ) %]
-               <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro %]" onclick="this.value=''" />
-      [% ELSE %]
-               <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro %]" />
-      [% END %]
+        <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro | html %]" />
          [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
       <label for="fax">
       [% END %]
       Fax: </label>
-      [% IF ( opduplicate ) %]
-               <input type="text" id="fax" name="fax" value="[% fax %]" onclick="this.value=''" />
-      [% ELSE %]
-               <input type="text" id="fax" name="fax" value="[% fax %]" />
-      [% END %]
+        <input type="text" id="fax" name="fax" value="[% fax | html %]" />
          [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
 [% IF ( step_6 ) %]
 
     [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
-               <fieldset class="rows" id="memberentry_address">
-               <legend id="alt_address_lgd">Alternate address</legend><ol>
-        [% UNLESS noB_address %]
-                       <li>
-                               [% IF ( mandatoryB_address ) %]
-                                       <label for="B_address" class="required">
-                               [% ELSE %]
-                                       <label for="B_address">
-                               [% END %]
-                               Address: </label>
-                               [% IF ( opduplicate ) %]
-                                       <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" onclick="this.value=''" />
-                               [% ELSE %]
-                                       <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" />
-                               [% END %]
-         [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noB_address2 %]
-                       <li>
-                               [% IF ( mandatoryB_address2 ) %]
-                                       <label for="B_address2" class="required">
-                               [% ELSE %]
-                                       <label for="B_address2">
-                               [% END %]
-                               Address 2: </label>
-                               [% IF ( opduplicate ) %]
-                                       <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" onclick="this.value=''" />
-                               [% ELSE %]
-                                       <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" />
-                               [% END %]
-         [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noB_city %]
-                       <li>
-                               [% IF ( mandatoryB_city ) %]
-                                       <label for="B_city" class="required" >
-                               [% ELSE %]
-                                       <label for="B_city">
-                               [% END %]
-                               City: </label>
-                               <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
-         [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noB_state %]
-                       <li>
-                               [% IF ( mandatoryB_state ) %]
-                                       <label for="B_state" class="required" >
-                               [% ELSE %]
-                                       <label for="B_state">
-                               [% END %]
-                               State: </label>
-                               <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
-         [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noB_zipcode %]
-                       <li>
-                               [% IF ( mandatoryB_zipcode ) %]
-                                       <label for="B_zipcode" class="required">
-                               [% ELSE %]
-                                       <label for="B_zipcode">
-                               [% END %]
-                               Zip/Postal code: </label>
-                               [% IF ( opduplicate ) %]
-                                       <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" onclick="this.value=''" />
-                               [% ELSE %]
-                                       <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" />
-                               [% END %]
-         [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noB_country %]
-                       <li>
-                               [% IF ( mandatoryB_country ) %]
-                                       <label for="B_country" class="required">
-                               [% ELSE %]
-                                       <label for="B_country">
-                               [% END %]
-                               Country: </label>
-                               [% IF ( opduplicate ) %]
-                                       <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" onclick="this.value=''" />
-                               [% ELSE %]
-                                       <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" />
-                               [% END %]
-         [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noB_phone %]
-            <li>
-                [% IF ( mandatoryB_phone ) %]
-                <label for="B_phone" class="required">
-                [% ELSE %]
-                <label for="B_phone">
-                [% END %]
-                Phone: </label>
-                [% IF ( opduplicate ) %]
-                                       <input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" onclick="this.value=''" />
-                [% ELSE %]
-                                       <input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" />
-                [% END %]
-                [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
-            </li>
-        [% END %]
-        [% UNLESS noB_email %]
-                       <li> 
-        [% IF ( mandatoryB_email ) %]
-          <label for="B_email" class="required">
+        [% IF Koha.Preference( 'AddressFormat' ) %]
+            [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
         [% ELSE %]
-          <label for="B_email">
+            [% INCLUDE 'member-alt-address-style-us.inc' %]
         [% END %]
-        Email: </label>
-        [% IF ( opduplicate ) %]
-                       <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" onclick="this.value=''" />
-        [% ELSE %]
-                       <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" />
-               [% END %]
-               [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
-        [% END %]
-        [% UNLESS nocontactnote %]
-            <li>
-                [% IF ( mandatorycontactnote ) %]
-                <label for="contactnote" class="required">
-                [% ELSE %]
-                <label for="contactnote">
-                [% END %]
-                Contact note: </label>
-                <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea>
-        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
-            </li>
-        [% END %]
-                       </ol>
-               </fieldset>
     [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
 [% END %]
 [% IF ( step_2 ) %]
     [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
-               <fieldset class="rows" id="memberentry_altaddress">       
-            <legend id="alt_contact_lgd">Alternate contact</legend><ol>
-        [% UNLESS noaltcontactsurname %]
-                       <li>
-                           [% IF ( mandatoryaltcontactsurname ) %]
-                               <label for="altcontactsurname" class="required">
-                               [% ELSE %]
-                               <label for="altcontactsurname">
-                               [% END %]
-                               Surname:</label>
-                               [% IF ( opduplicate ) %]
-                                       <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" onclick="this.value=''" />
-                               [% ELSE %]
-                                       <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" />
-                               [% END %]
-                               [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noaltcontactfirstname %]
-                       <li>
-                           [% IF ( mandatoryaltcontactfirstname ) %]
-                               <label for="altcontactfirstname" class="required">
-                               [% ELSE %]
-                               <label for="altcontactfirstname">
-                               [% END %]
-                               First name:</label>
-                               [% IF ( opduplicate ) %]
-                                       <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" onclick="this.value=''" />
-                               [% ELSE %]
-                                       <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" />
-                               [% END %]
-                               [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noaltcontactaddress1 %]
-                       <li>
-                           [% IF ( mandatoryaltcontactaddress1 ) %]
-                               <label for="altcontactaddress1" class="required">
-                               [% ELSE %]
-                               <label for="altcontactaddress1">
-                               [% END %]
-                               Address:</label>
-                               [% IF ( opduplicate ) %]
-                                       <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" onclick="this.value=''" size="40" />
-                               [% ELSE %]
-                                       <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" />
-                               [% END %]
-                               [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noaltcontactaddress2 %]
-                       <li>
-                           [% IF ( mandatoryaltcontactaddress2 ) %]
-                               <label for="altcontactaddress2" class="required">
-                               [% ELSE %]
-                               <label for="altcontactaddress2">
-                               [% END %]
-                               Address 2:</label>
-                               [% IF ( opduplicate ) %]
-                                       <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" onclick="this.value=''" size="40" />
-                               [% ELSE %]
-                                       <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" />
-                               [% END %]
-                               [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noaltcontactaddress3 %]
-                       <li>
-                           [% IF ( mandatoryaltcontactaddress3 ) %]
-                               <label for="altcontactaddress3" class="required">
-                               [% ELSE %]
-                               <label for="altcontactaddress3">
-                               [% END %]
-                               City:</label>
-                               <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
-                               [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noaltcontactstate %]
-                       <li>
-                           [% IF ( mandatoryaltcontactstate ) %]
-                               <label for="altcontactstate" class="required">
-                               [% ELSE %]
-                               <label for="altcontactstate">
-                               [% END %]
-                               State:</label>
-                               <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
-                               [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noaltcontactzipcode %]
-                       <li>
-                           [% IF ( mandatoryaltcontactzipcode ) %]
-                               <label for="altcontactzipcode" class="required">
-                               [% ELSE %]
-                               <label for="altcontactzipcode">
-                               [% END %]
-                               Zip/Postal code:</label>
-                               [% IF ( opduplicate ) %]
-                                       <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" onclick="this.value=''" size="5" />
-                               [% ELSE %]
-                                       <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" />
-                               [% END %]
-                               [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
-                       </li>
-        [% END %]
-        [% UNLESS noaltcontactcountry %]
-                       <li>
-                           [% IF ( mandatoryaltcontactcountry ) %]
-                               <label for="altcontactcountry" class="required">
-                               [% ELSE %]
-                               <label for="altcontactcountry">
-                               [% END %]
-                               Country:</label>
-                               [% IF ( opduplicate ) %]
-                                       <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" onclick="this.value=''" size="20" />
-                               [% ELSE %]
-                                       <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" />
-                               [% END %]
-                               [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
-                       </li>                   
-        [% END %]
-        [% UNLESS noaltcontactphone %]
-                       <li>
-                           [% IF ( mandatoryaltcontactphone ) %]
-                               <label for="altcontactphone" class="required">
-                               [% ELSE %]
-                               <label for="altcontactphone">
-                               [% END %]
-                               Phone:</label>
-                               [% IF ( opduplicate ) %]
-                                       <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" onclick="this.value=''" />
-                               [% ELSE %]
-                                       <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" />
-                               [% END %]
-                               [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
-                       </li>
+        [% IF Koha.Preference( 'AddressFormat' ) %]
+            [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+        [% ELSE %]
+            [% INCLUDE 'member-alt-contact-style-us.inc' %]
         [% END %]
-            </ol>
-        </fieldset>
     [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
 
 [% END %]
 [% IF ( step_3 ) %]
 
+  [% SET autoMemberNum = Koha.Preference('autoMemberNum') %]
   <fieldset class="rows" id="memberentry_library_management">
     <legend id="library_management_lgd">Library management</legend><ol>
-        [% UNLESS nocardnumber %]
-   <li> [% IF ( mandatorycardnumber ) %]
-      <label for="cardnumber" class="required">
-    [% ELSE %]
-      <label for="cardnumber">
-    [% END %] 
-    Card number: </label>
-       <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" />
-         [% IF ( mandatorycardnumber ) %]<span class="required">Required</span>[% END %]</li>
-        [% END %]
-        [% UNLESS nobranchcode %]
+      [% UNLESS nocardnumber %]
+        <li>
+          [% IF mandatorycardnumber %]
+            <label for="cardnumber" class="required">
+          [% ELSE %]
+            <label for="cardnumber" class="validated">
+          [% END %]
+            Card number: </label>
+
+          <!-- NOTE: div.hint closing tag isn't on the same line -->
+          [% IF minlength_cardnumber == maxlength_cardnumber %]
+                <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" minlength="[% minlength_cardnumber %]" maxlength="[% maxlength_cardnumber %]" />
+                [% IF mandatorycardnumber %]<span class="required">Required</span>[% END %]<span id="cn_max" class="required">Card number must not be more than [% maxlength_cardnumber %] characters.</span>
+                <div class="hint">Card number must be exactly [% minlength_cardnumber %] characters.
+          [% ELSIF minlength_cardnumber && maxlength_cardnumber %]
+                <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" minlength="[% minlength_cardnumber %]" maxlength="[% maxlength_cardnumber %]" />
+                [% IF mandatorycardnumber %]<span class="required">Required</span>[% END %]<span id="cn_max" class="required">Card number must not be more than [% maxlength_cardnumber %] characters.</span>
+                <div class="hint">Card number must be between [% minlength_cardnumber %] and [% maxlength_cardnumber %] characters.
+          [% ELSIF maxlength_cardnumber %]
+                <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" maxlength="[% maxlength_cardnumber %]" />
+                [% IF mandatorycardnumber %]<span class="required">Required</span>[% END %]<span id="cn_max" class="required">Card number must not be more than [% maxlength_cardnumber %] characters.</span>
+                <div class="hint">Card number can be up to [% maxlength_cardnumber %] characters.
+          [% ELSE %]
+                <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" />
+                [% IF mandatorycardnumber %]<span class="required">Required</span>[% END %]
+                <div class="hint">There is no minimum or maximum character length.
+          [% END %]
+          [% IF autoMemberNum %]
+                [% IF mandatorycardnumber %]
+                    <br/><span class="error">AutoMemberNum is set to enabled, but cardnumber is marked as mandatory in BorrowerMandatoryField: auto calc has been disabled.</span>
+                [% ELSE %]
+                    <br/>Leave blank for auto calc during registration
+                [% END %]
+          [% END %]
+                </div><!--/hint div -->
+        </li>
+      [% END %]
+      [% UNLESS nobranchcode %]
     <li>
-      [%- IF ( mandatorybranchcode ) -%]
-        <label for="branchcode" class="required">
-      [%- ELSE -%]
-        <label for="branchcode">
-      [%- END -%]
-      Library:</label>
-      <select name="branchcode" size="1" id="branchcode">
-        [%- FOREACH branchloo IN branchloop %]
-          [% IF ( branchloo.selected ) -%]
-            <option value="[% branchloo.branchcode %]" selected="selected">[% branchloo.branchname %]</option>
-          [%- ELSE -%]
-            <option value="[% branchloo.branchcode %]">[% branchloo.branchname %]</option>
-          [%- END -%]
-        [%- END %]
-      </select>
-      [% IF ( mandatorybranchcode ) -%]
-      <span class="required">Required</span>
-      [%- END %]
+        <label for="libraries" class="required">Library:</label>
+        <select name="branchcode" size="1" id="libraries">
+            [% PROCESS options_for_libraries libraries => Branches.all( selected => userbranch, only_from_group => 1 ) %]
+        </select>
+        <span class="required">Required</span>
     </li>
         [% END %]
     <li>
-        <label for="categorycode">Category: </label>
-        <select id="categorycode" name="categorycode" onchange="update_category_code(this);">
+        <label for="categorycode_entry" class="required">Category: </label>
+        <select id="categorycode_entry" name="categorycode" onchange="update_category_code(this);">
         [% FOREACH typeloo IN typeloop %]
             [% FOREACH categoryloo IN typeloo.categoryloop %]
                 [% IF ( loop.first ) %]
-                    [% IF ( typeloo.typename_C ) %]<optgroup label="Child"        value="C">[% END %]
-                    [% IF ( typeloo.typename_A ) %]<optgroup label="Adult"        value="A">[% END %]
-                    [% IF ( typeloo.typename_S ) %]<optgroup label="Staff"        value="S">[% END %]
-                    [% IF ( typeloo.typename_I ) %]<optgroup label="Organization" value="I">[% END %]
-                    [% IF ( typeloo.typename_P ) %]<optgroup label="Professional" value="P">[% END %]
-                    [% IF ( typeloo.typename_X ) %]<optgroup label="Statistical"  value="X">[% END %]
+                    [% IF ( typeloo.typename_C ) %]<optgroup label="Child">[% END %]
+                    [% IF ( typeloo.typename_A ) %]<optgroup label="Adult">[% END %]
+                    [% IF ( typeloo.typename_S ) %]<optgroup label="Staff">[% END %]
+                    [% IF ( typeloo.typename_I ) %]<optgroup label="Organization">[% END %]
+                    [% IF ( typeloo.typename_P ) %]<optgroup label="Professional">[% END %]
+                    [% IF ( typeloo.typename_X ) %]<optgroup label="Statistical">[% END %]
                 [% END %]
                 [% IF ( categoryloo.categorycodeselected ) %]
                     <option value="[% categoryloo.categorycode %]" selected="selected" data-typename="[% typeloo.typename %]">[% categoryloo.categoryname %]</option>
             [% END %]
        [% END %]
        </select>
+       <span class="required">Required</span>
     </li>
         [% UNLESS nosort1 %]
     <li>
         <label for="sort1">
       [% END %]
       Sort 1: </label>
-      [% IF ( CGIsort1 ) %] 
-        [% CGIsort1 %]
-      [% ELSE %]
-          [% IF ( opduplicate ) %]
-            <input  type="text" id="sort1" name="sort1" size="20"  value="[% sort1 %]" onclick="this.value=''" />
-          [% ELSE %]
-            <input  type="text" id="sort1" name="sort1" size="20"  value="[% sort1 %]" />
-          [% END %]
-         [% IF ( mandatorysort1 ) %]<span class="required">Required</span>[% END %]
-      [% END %]   
+      [% PROCESS 'av-build-dropbox.inc' name="sort1", category="Bsort1", default=sort1, size = 20 %]
+      [% IF ( mandatorysort1 ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
         [% UNLESS nosort2 %]
     <label for="sort2">
     [% END %]
     Sort 2: </label>
-    [% IF ( CGIsort2 ) %] 
-      [% CGIsort2 %]
-    [% ELSE %]
-      [% IF ( opduplicate ) %]
-               <input  type="text" id="sort2" name="sort2" size="20"  value="[% sort2 %]" onclick="this.value=''" />
-      [% ELSE %]
-               <input  type="text" id="sort2" name="sort2" size="20"  value="[% sort2 %]" />
-      [% END %]
-         [% IF ( mandatorysort2 ) %]<span class="required">Required</span>[% END %]
-    [% END %] 
+    [% PROCESS 'av-build-dropbox.inc' name="sort2", category="Bsort2", default=sort2, size = 20 %]
+    [% IF ( mandatorysort2 ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
-       </ol>
+    [% IF ( Koha.Preference( 'NorwegianPatronDBEnable' ) == 1 ) %]
+        <li>
+            <label for="sort2">Sync with the Norwegian national patron database:</label>
+            [% IF ( sync == 0 ) %]
+                <input type="radio" id="sync" name="sync" value="1"> Yes
+                <input type="radio" id="sync" name="sync" value="0" checked> No
+            [% ELSE %]
+                <input type="radio" id="sync" name="sync" value="1" checked> Yes
+                <input type="radio" id="sync" name="sync" value="0"> No
+            [% END %]
+        </li>
+    [% END %]
+    [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %]
+      <li><label for="checkprevcheckout">Check for previous checkouts: </label>
+        <select name="checkprevcheckout" id="checkprevcheckout">
+        [% IF ( checkprevcheckout == 'yes' ) %]
+          <option value="yes" selected="selected">Yes if settings allow it</option>
+          <option value="no">No if settings allow it</option>
+          <option value="inherit">Inherit from settings</option>
+        [% ELSIF ( checkprevcheckout == 'no' ) %]
+          <option value="yes">Yes if settings allow it</option>
+          <option value="no" selected="selected">No if settings allow it</option>
+          <option value="inherit">Inherit from settings</option>
+        [% ELSE %]
+          <option value="yes">Yes if settings allow it</option>
+          <option value="no">No if settings allow it</option>
+          <option value="inherit" selected="selected">Inherit from settings</option>
+        [% END %]
+        </select>
+       </li>
+     [% END %]
+    [% IF Koha.Preference('TranslateNotices') %]
+        <li>
+            <label for="lang">Preferred language for notices: </label>
+            <select id="lang" name="lang">
+                <option value="default">Default</option>
+                [% FOR language IN languages %]
+                    [% FOR sublanguage IN language.sublanguages_loop %]
+                        [% IF language.plural %]
+                            [% IF sublanguage.rfc4646_subtag == lang %]
+                                <option value="[% sublanguage.rfc4646_subtag %]" selected="selected">[% sublanguage.native_description %] [% sublanguage.region_description %] ([% sublanguage.rfc4646_subtag %])</option>
+                            [% ELSE %]
+                                <option value="[% sublanguage.rfc4646_subtag %]">[% sublanguage.native_description %] [% sublanguage.region_description %] ([% sublanguage.rfc4646_subtag %])</option>
+                            [% END %]
+                        [% ELSE %]
+                            [% IF sublanguage.rfc4646_subtag == lang %]
+                                <option value="[% sublanguage.rfc4646_subtag %]" selected="selected">[% sublanguage.native_description %] ([% sublanguage.rfc4646_subtag %])</option>
+                            [% ELSE %]
+                                <option value="[% sublanguage.rfc4646_subtag %]">[% sublanguage.native_description %] ([% sublanguage.rfc4646_subtag %])</option>
+                            [% END %]
+                        [% END %]
+                    [% END %]
+                [% END %]
+            </select>
+        </li>
+    [% END %]
+   </ol>
   </fieldset>
     [% UNLESS nodateenrolled &&  noopacnote && noborrowernotes %]
        <fieldset class="rows" id="memberentry_subscription">
                        [% ELSE %]
             <label for="to">
                        [% END %]
-                       Expiry date (leave blank for auto calc) </label>
+                       Expiry date (leave blank for auto calc): </label>
             [% IF ( dateformat == "metric" ) %]
                                [% UNLESS ( opadd ) %]
-                    <input type="text" id="to" name="dateexpiry" maxlength="10"  size="10" onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="[% dateexpiry %]" class="datepickerto" />
+                    <input type="text" id="to" name="dateexpiry" maxlength="10"  size="10" onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="[% dateexpiry UNLESS opduplicate %]" class="datepickerto" />
                                [% ELSE %]
                     <input type="text" id="to" name="dateexpiry" maxlength="10"  size="10" onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" class="datepickerto" />
                                [% END %]
                        [% ELSE %]
                                [% UNLESS ( opadd ) %]
-                <input type="text" id="to" name="dateexpiry" maxlength="10"  size="10" value="[% dateexpiry %]" class="datepickerto" />
+                <input type="text" id="to" name="dateexpiry" maxlength="10"  size="10" value="[% dateexpiry UNLESS opduplicate %]" class="datepickerto" />
                                [% ELSE %]
-                <input type="text" id="to" name="dateexpiry" maxlength="10"  size="10" class="datepickerto" />
+                <input type="text" id="to" name="dateexpiry" maxlength="10"  size="10" value="[% dateexpiry %]" class="datepickerto" />
                                [% END %]
                        [% END %]
                [% IF ( mandatorydateexpiry ) %]<span class="required">Required</span>[% END %]
                                <label for="opacnote" class="required">
                        [% ELSE %]
                                <label for="opacnote">
-                       [% END %]       
+            [% END %]
                        OPAC note: </label>
-                       <textarea id="opacnote" name="opacnote" cols="55" rows="5">[% opacnote %]</textarea>
+            <textarea id="opacnote" name="opacnote" cols="55" rows="5">[% opacnote | html UNLESS opduplicate %]</textarea>
                        <div class="hint">This message appears on this patron's user page in the OPAC</div>
          [% IF ( mandatoryopacnote ) %]<span class="required">Required</span>[% END %]
                </li>
         [% END %]
         [% UNLESS noborrowernotes %]
                <li>
-                       [% IF ( mandatoryborrowernotes ) %]     
+            [% IF ( mandatoryborrowernotes ) %]
                                <label for="borrowernotes" class="required">
                        [% ELSE %]
                                <label for="borrowernotes">
                        [% END %]
                        Circulation note: </label>
-                       <textarea id="borrowernotes" name="borrowernotes" cols="55" rows="5">[% borrowernotes %]</textarea>
+            <textarea id="borrowernotes" name="borrowernotes" cols="55" rows="5">[% borrowernotes | html UNLESS opduplicate %]</textarea>
                        <div class="hint">This message displays when checking out to this patron</div>
          [% IF ( mandatoryborrowernotes ) %]<span class="required">Required</span>[% END %]
                </li>
        [% END %]
 [% END %]
 
+[%# Dummy input to avoid Firefox from using userid/password saved for authentication %]
+<input type="text" disabled="disabled" style="display:none" />
+
          [% IF ( mandatoryuserid ) %]<span class="required">Required</span>[% END %]
                </li>
         [%END %]
                                [% END %]
                        [% END %]
                        [% END %]
-         [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_short_password ) %]<span class="required">Password is too short</span>[% END %]
-[% IF ( minPasswordLength ) %]<div class="hint">Minimum password length: [% minPasswordLength %]</div>[% END %]
+            [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %]
+            [% IF ( ERROR_password_too_short ) %]<span class="required">Password is too short</span>[% END %]
+            [% IF ( ERROR_password_too_weak ) %]<span class="required">Password is too weak</span>[% END %]
+            [% IF ( ERROR_password_has_whitespaces ) %]<span class="required">Password has leading or trailing whitespaces</span>[% END %]
+            <div class="hint">Minimum password length: [% minPasswordLength %]</div>
                </li>
                <li>
                        [% IF ( mandatorypassword ) %]
                </fieldset>
         [% END # hide fieldset %][% END %]
                <!--this zones are not necessary in modif mode -->
-               [% UNLESS ( opadd ) %]
-               <fieldset class="rows">
-            <legend>Patron account flags</legend>
+        [% UNLESS ( opadd || opduplicate ) %]
+        <fieldset class="rows" id="memberentry_account_flags">
+            <legend id="account_flags_lgd">Patron account flags</legend>
                        <ol class="radio">
                        [% FOREACH flagloo IN flagloop %]
                                <li><label class="radio" for="yes[% flagloo.name %]">
                 [% IF ( flagloo.key == 'gonenoaddress' ) %]Gone no address:[% END %]
-                               [% IF ( flagloo.key == 'debarred' ) %]Restricted:[% END %]
                 [% IF ( flagloo.key == 'lost' ) %]Lost card:[% END %]
                 </label>
-                               <label for="yes[% flagloo.name %]">Yes </label>
+                [% IF CAN_user_circulate_manage_restrictions %]
+                            <label for="yes[% flagloo.name %]">
                                [% IF ( flagloo.yes ) %]
                                <input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" checked="checked" />
                                [% ELSE %]
                                <input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" />
                                [% END %]
-                               <label for="no[% flagloo.name %]">No </label>
+                            Yes </label>
+                            <label for="no[% flagloo.name %]">
                                [% IF ( flagloo.no ) %]
                                <input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" checked="checked"/>
                                [% ELSE %]
                                <input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" />
                                [% END %]
+                            No </label>
+                [% ELSE %]
+                  [% IF flagloo.yes %]Yes[% ELSE %]No[% END %]
+                [% END %]
 
             </li>
                        [% END %]
-                       <li>
-                               <label for="yesdebarred" class="radio">Restricted: </label>
-                               [% IF ( debarred ) %]
-                               <label for="yesdebarred">Yes </label>
-                               <input type="radio" id="yesdebarred" name="debarred" value="1" checked="checked"/>
-                <label for="nodebarred">No </label>
-                <input type="radio" id="nodebarred" name="debarred" value="0"/>
-                               [% ELSE %]
-                               <label for="yesdebarred">Yes </label>
-                               <input type="radio" id="yesdebarred" name="debarred" value="1" />
-                <label for="nodebarred">No </label>
-                <input type="radio" id="nodebarred" name="debarred" value="0" checked="checked"/>
-                               [% END %]
-
-                <span id="debarreduntil"><label for="datedebarred" class="inline">Until:</label>
-                                [% IF opduplicate %]
-                                    <input type="text" name="datedebarred" id="datedebarred" class="debarred datepicker" value="[% datedebarred %]" onclick="this.value=''" />
-                                [% ELSE %]
-                                    <input type="text" name="datedebarred" id="datedebarred" class="debarred datepicker" value="[% datedebarred %]" />
-                                [% END %]
-                <span class="hint">(optional)</span> </span>
-                </li>
-                <li>
-                       <label for="debarredcomment" class="radio">Comment:</label>
-                              [% IF ( opduplicate ) %] 
-                                  <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3" onclick="this.value=''">[% debarredcomment %]</textarea>
-                              [% ELSE %]
-                                  <textarea id="debarredcomment" name="debarredcomment" cols="55" rows="3">[% debarredcomment %]</textarea>
-                              [% END %]
-               </li>
 
                        </ol>
                        </fieldset>
-    
+
+              <fieldset class="rows" id="memberentry_restrictions">
+                <legend id="restrictions_lgd">Patron restrictions</legend>
+
+                [% IF ( debarments ) %]
+                    <table>
+                        <thead>
+                            <tr>
+                                 <th>Type</th>
+                                 <th>Comment</th>
+                                 <th>Expiration</th>
+                                 <th>Created</th>
+                                 [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
+                                   <th>Remove?</th>
+                                 [% END %]
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            [% FOREACH d IN debarments %]
+                                <tr>
+                                    <td>[% d.type %]</td>
+                                    <td>
+                                    [% IF d.comment.search('OVERDUES_PROCESS') %]
+                                        Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') %]
+                                    [% ELSE %]
+                                        [% d.comment %]
+                                    [% END %]
+                                    </td>
+                                    <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
+                                    <td>[% d.created | $KohaDates %]</td>
+                                    [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
+                                      <td>
+                                        <input type="checkbox" id="debarment_[% d.borrower_debarment_id %]" name="remove_debarment" value="[% d.borrower_debarment_id %]" />
+                                      </td>
+                                    [% END %]
+                                </tr>
+                            [% END %]
+                        </tbody>
+                    </table>
+                [% ELSE %]
+                    <p>Patron is currently unrestricted.</p>
+                [% END %]
+
+                [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
+                    <p><a href="#" id="add_manual_restriction">Add manual restriction</a></p>
+                    <fieldset id="manual_restriction_form">
+                        <input type="hidden" id="add_debarment" name="add_debarment" value="0" />
+                        <legend id="manual_restriction_lgd">Add manual restriction</legend>
+                        <ol>
+                            <li><label for="debarred_comment">Comment: </label><input type="text" id="debarred_comment" name="debarred_comment" onchange="$('#add_debarment').val(1);" /></li>
+                            <li><label for="debarred_expiration">Expiration: </label><input name="debarred_expiration" id="debarred_expiration" size="10" value="" class="datepicker" onchange="$('#add_debarment').val(1);" />
+                                    <a href='javascript:void(0)' onclick="$('#debarred_expiration').val('');">Clear date</a></li>
+
+                        </ol>
+                        <p>
+                            <a class="cancel" id="cancel_manual_restriction" href="#">Cancel</a>
+                        </p>
+                    </fieldset>
+                [% END %]
+            </fieldset>
                [% END %]
 
 [% END %]
 
-[% IF ( step_4 ) %][% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
+[% IF ( step_7 ) %]
+[% IF Koha.Preference('HouseboundModule') %]
+  <fieldset class="rows" id="memberentry_housebound_roles">
+    <legend id="housebound_roles">Housebound roles</legend>
+    <ol class="radio">
+      <li>
+        <label class="radio" for="housebound_chooser">
+          Chooser:
+        </label>
+        [% IF ( housebound_role.housebound_chooser == 1 ) %]
+        <label for="yes_housebound_chooser">Yes </label>
+        <input type="radio" id="yes_housebound_chooser"
+               name="housebound_chooser" value="1"
+               checked="checked" />
+        <label for="no_housebound_chooser">No </label>
+        <input type="radio" id="no_housebound_chooser"
+               name="housebound_chooser" value="0" />
+        [% ELSE %]
+        <label for="yes_housebound_chooser">Yes </label>
+        <input type="radio" id="yes_housebound_chooser"
+               name="housebound_chooser" value="1" />
+        <label for="no_housebound_chooser">No </label>
+        <input type="radio" id="no_housebound_chooser"
+               name="housebound_chooser" value="0"
+               checked="checked" />
+        [% END %]
+      </li>
+      <li>
+        <label class="radio" for="housebound_deliverer">Deliverer:</label>
+        [% IF ( housebound_role.housebound_deliverer == 1 ) %]
+        <label for="yes_housebound_deliverer">Yes </label>
+        <input type="radio" id="yes_housebound_deliverer"
+               name="housebound_deliverer" value="1"
+               checked="checked" />
+        <label for="no_housebound_deliverer">No </label>
+        <input type="radio" id="no_housebound_deliverer"
+               name="housebound_deliverer" value="0" />
+        [% ELSE %]
+        <label for="yes_housebound_deliverer">Yes </label>
+        <input type="radio" id="yes_housebound_deliverer"
+               name="housebound_deliverer" value="1" />
+        <label for="no_housebound_deliverer">No </label>
+        <input type="radio" id="no_housebound_deliverer"
+               name="housebound_deliverer" value="0"
+               checked="checked" />
+        [% END %]
+      </li>
+    </ol>
+  </fieldset>
+[% END # hide fieldset %]
+[% END # IF step_7 %]
+
+[% IF ( step_4 ) %]
+[% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
   <fieldset class="rows" id="memberentry_patron_attributes">
+    <legend id="patron_attributes_lgd">Additional attributes and identifiers</legend>
     <input type="hidden" name="setting_extended_patron_attributes" value="1" />
-    <legend>Additional attributes and identifiers</legend>
     [% FOREACH pa_loo IN patron_attributes %]
         [% IF pa_loo.class %]
             <fieldset id="aai_[% pa_loo.class %]">
-            <legend>[% pa_loo.lib %]</legend>
+            <legend id="[% pa_loo.class %]_lgd">[% pa_loo.lib %]</legend>
         [% END %]
         <ol class="attributes_table">
             [% FOREACH patron_attribute IN pa_loo.items %]
                 <li data-category_code="[% patron_attribute.category_code %]">
                     <label for="[% patron_attribute.form_id %]">[% patron_attribute.description %]: </label>
-                        <input type="hidden" id="[% patron_attribute.form_id %]_code" name="[% patron_attribute.form_id %]_code" value="[% patron_attribute.code |html %]" />
                         [% IF ( patron_attribute.use_dropdown ) %]
                             <select id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]">
-                                <option value="" />
+                                <option value=""></option>
                                 [% FOREACH auth_val_loo IN patron_attribute.auth_val_loop %]
-                                    [% IF ( auth_val_loo.selected ) %]
+                                    [% IF auth_val_loo.authorised_value == patron_attribute.value %]
                                         <option value="[% auth_val_loo.authorised_value %]" selected="selected">
                                             [% auth_val_loo.lib %]
                                         </option>
                                 [% END %]
                             </select>
                         [% ELSE %]
-                            [% IF ( opduplicate ) %]
-                            <textarea rows="2" cols="30" id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]" onclick="this.value=''" >[% patron_attribute.value %]</textarea>
-                            [% ELSE %]
                             <textarea rows="2" cols="30" id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]">[% patron_attribute.value %]</textarea>
-                            [% END %]
-                        [% END %]
-                        [% IF ( patron_attribute.password_allowed ) %]
-                            (<label class="yesno" for="[% patron_attribute.form_id %]_password">Password:</label> <input type="password" maxlength="64" value="[% patron_attribute.password %]"
-                                   id="[% patron_attribute.form_id %]_password" name="[% patron_attribute.form_id %]_password" />)
                         [% END %]
-                        <a href="#" class="clear-field" onclick="clear_entry(this); return false;">Clear</a>
+                        <input type="hidden" id="[% patron_attribute.form_id %]_code" name="[% patron_attribute.form_id %]_code" value="[% patron_attribute.code |html %]" />
+                        <a href="#" onclick="clear_entry(this); return false;"><i class="fa fa-fw fa-trash"></i> Clear</a>
                         [% IF ( patron_attribute.repeatable ) %]
-                        <a href="#" class="clone-field" onclick="clone_entry(this); return false;">New</a>
+                        <a href="#" onclick="clone_entry(this); return false;"><i class="fa fa-fw fa-plus"></i> New</a>
                         [% END %]
                 </li>
             [% END %]
 
 [% IF ( step_5 ) %][% IF ( EnhancedMessagingPreferences ) %]
   <fieldset class="rows" id="memberentry_messaging_prefs">
+    <legend id="patron_messaging_prefs_lgd">Patron messaging preferences</legend>
     [% IF ( opadd ) %]
     <!-- handle changing prefs if creating new patron and changing
          the patron category
             $('#memberentry_messaging_prefs > *').change(function() {
                 message_prefs_dirty = true;
             });
-            $('#categorycode').change(function() {
+            $('#categorycode_entry').change(function() {
                 var categorycode = $(this).val();
                 if (message_prefs_dirty) {
-                    if (!confirm('Change messaging preferences to default for this category?')) {
+                    if (!confirm(_("Change messaging preferences to default for this category?"))) {
                         return;
                     }
                 }
                             var transports = ['email', 'rss', 'sms'];
                             $.each(transports, function(j, transport) {
                                 if (item['transports_' + transport] == 1) {
-                                    $('#' + transport + attrid).attr('checked', 'checked');
+                                    $('#' + transport + attrid).prop('checked', true);
                                 } else {
-                                    $('#' + transport + attrid).removeAttr('checked');
+                                    $('#' + transport + attrid).prop('checked', false);
                                 }
                             });
                             if (item.digest && item.digest != ' ') {
-                                $('#digest' + attrid).attr('checked', item.digest);
+                                $('#digest' + attrid).prop('checked', true);
                             } else {
-                                $('#digest' + attrid).removeAttr('checked');
+                                $('#digest' + attrid).prop('checked', false);
                             }
                             if (item.takes_days == '1') {
                                 $('[name=' + attrid + '-DAYS]').val('' + item.days_in_advance);
     </script>
     [% END %]
     <input type="hidden" name="setting_messaging_prefs" value="1" />
-    <legend id="patron_messaging_prefs_lgd">Patron messaging preferences</legend>
-    [% IF type_only %]
-        <p>If no preferences are selected, the default preferences for the category chosen will be applied on save, otherwise your selection here is saved</p>
-    [% END %]
     [% INCLUDE 'messaging-preference-form.inc' %]
     [% IF ( SMSSendDriver ) %]
         <p><label for="SMSnumber">SMS number:</label>
-          [% IF ( opduplicate ) %]
-            <input type="text" id="SMSnumber" name="SMSnumber" value="[% SMSnumber %]" onclick="this.value=''" />
-          [% ELSE %]
             <input type="text" id="SMSnumber" name="SMSnumber" value="[% SMSnumber %]" />
-        [% END %]
         </p>
+        [% UNLESS nosms_provider_id %]
+        <p>
+            <label for="sms_provider_id">SMS provider:</label>
+            <select id="sms_provider_id" name="sms_provider_id"/>
+                <option value="">Unknown</option>
+                [% FOREACH s IN sms_providers %]
+                    [% IF s.id == sms_provider_id %]
+                        <option value="[% s.id %]" selected="selected">[% s.name %]</option>
+                    [% ELSE %]
+                        <option value="[% s.id %]">[% s.name %]</option>
+                    [% END %]
+                [% END %]
+            </select>
+        </p>
+        [% END %]
     [% END %]
   </fieldset>
 [% END %] [% END %]
 
-[% UNLESS ( check_member ) %]
-    <fieldset class="action">
-        <input type="submit" name="save" onclick="return check_form_borrowers();" value="Save" />
-      [% IF ( opadd ) %]
-       <a class="cancel" href="/cgi-bin/koha/members/member.pl">Cancel</a>
-          [% ELSE %]
-         <a class="cancel" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">Cancel</a>
-          [% END %]
-    </fieldset>
-[% END %]
 </form>
-  
+
+[% IF quickadd && opadd  && !check_member %]
+    <form id="quick_add_form" class="toggler">
+        <fieldset class="rows quick_add"><legend>Quick add</legend>
+            <ol id="quick_add_list">
+            </ol>
+        </fieldset>
+    </form>
+[% END %]
 </div>
 </div>
 
 </div>[% END %]
 [% END %]
 </div>
-[% INCLUDE 'intranet-bottom.inc' %]
 
+[% MACRO jsinclude BLOCK %]
+    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %]
+    [% INCLUDE 'calendar.inc' %]
+    [% INCLUDE 'str/members-menu.inc' %]
+    [% Asset.js("js/members-menu.js") %]
+    <script type="text/javascript">
+        $(document).ready(function() {
+
+                $("#saverecord").css({ 'margin-left': 0 });
+                var original_offset = $("#toolbar").position().top;
+                var additional_height = $("#filters").height();
+                $('#toolbar').fixFloat({ 'originalOffset': original_offset });
+                $("#filteraction_on").on("click", function(){
+                    $(window).off('scroll');
+                    $("#toolbar").css({ top: original_offset + additional_height });
+                    $('#toolbar').fixFloat({ 'originalOffset': original_offset + additional_height });
+                });
+                $("#filteraction_off").on("click", function(){
+                    $(window).off('scroll');
+                    $("#toolbar").css({ top: original_offset });
+                    $('#toolbar').fixFloat({ 'originalOffset': original_offset });
+                })
+
+            [% IF categorycode %]
+                update_category_code( "[% categorycode %]" );
+            [% ELSE %]
+                if ( $("#categorycode_entry").length > 0 ){
+                    var category_code = $("#categorycode_entry").find("option:selected").val();
+                    update_category_code( category_code );
+                }
+            [% END %]
+        });
+
+        function update_cardnumber_warning(size){
+            var max_len = [% maxlength_cardnumber %];
+            if ( size >= max_len ) {
+                $("#cn_max").show();
+            } else {
+                $("#cn_max").hide();
+            }
+        }
+
+        $(document).ready(function() {
+            $("#cn_max").hide();
+            var content;
+            $("#cardnumber").on("keydown", function(e){
+                content = $(this).val();
+            });
+            $("#cardnumber").on("keyup", function(e){
+                // .val() will return the value of the input after the key has been released
+                var l = $(this).val().length;
+                if ( l == content.length + 1 ) { l--; }
+                update_cardnumber_warning(l);
+            });
+            $("#cardnumber").bind("paste", function(e){
+                var pastedData = e.originalEvent.clipboardData.getData('text');
+                update_cardnumber_warning(pastedData.length - 1);
+            } );
+            var toggle_quick_add = $(".toggle_quick_add");
+            $(toggle_quick_add).click(function(e){
+                toggle_quick_add.toggle();
+                e.preventDefault();
+                var toggle_to = '';
+                var toggle_from = '';
+                if( $("#entryform:visible").length ) {
+                    toggle_to = "#quick_add_form label";
+                    toggle_from = "#entryform label";
+                } else {
+                    toggle_to="#entryform label";
+                    toggle_from = "#quick_add_form label";
+                }
+                $(toggle_from).each(function() {
+                    var input_label = $(this).attr('for');
+                    if ( input_label == 'sex-male' || input_label == 'sex-none' || input_label == 'sex-female' ) {
+                        $(toggle_to+"[for='"+input_label+"']").next().prop('checked', $(this).next().prop('checked') );
+                        return;
+                    }
+                    $(toggle_to+"[for='"+input_label+"']").next().val(  $(this).next().val() );
+                });
+
+                $(".toggler").toggle();
+            });
+
+            $("#save_quick_add").click(function(){
+                $("#quick_add_form").validate();
+                if( $("#quick_add_form").valid()){
+                    $('.toggle_quick_add').click();
+                    $('#saverecord').click();
+                }
+                else {return false;}
+            });
+
+            $("#saverecord").click(function(){
+                if( check_form_borrowers() ){
+                    $("#entryform").submit();
+                }
+            });
+
+            $('#duplicate').on('click', function() {
+                $("input[name='op']").val('modify');
+                $("input[name='borrowernumber']").val('[% check_member %]');
+                $("input[name='check_member']").val('');
+                $('#entryform').submit();
+            });
+
+            $('#not-duplicate').on('click', function() {
+                $("input[name='nodouble']").val('1');
+                $('#entryform').submit();
+            });
+        });
+
+        var MSG_SEPARATOR = _("Separator must be / in field %s");
+        var MSG_INCORRECT_DAY = _("Invalid day entered in field %s");
+        var MSG_INCORRECT_MONTH = _("Invalid month entered in field %s");
+        var MSG_INCORRECT_YEAR = _("Invalid year entered in field %s");
+        var MSG_DUPLICATE_PATRON = _("Warning: Duplicate patron");
+        var MSG_DUPLICATE_ORGANIZATION = _("Warning: Duplicate organization");
+        var MSG_LATE_EXPIRY = _("Warning: Expiration date falls before enrollment date");
+        var MSG_DUPLICATE_SUSPICION = _("Please confirm whether this is a duplicate patron");
+        var MSG_MONTH = _("%s month")
+        var MSG_MONTHS = _("%s months")
+        var MSG_YEAR = _("%s year")
+        var MSG_YEARS = _("%s years")
+        var LABEL_CHANGE = _("Change");
+        var LABEL_SET_TO_PATRON = _("Set to patron");
+        var LABEL_AGE = _("Age");
+
+        [% IF quickadd && opadd  && !check_member %]
+            $(document).ready(function () {
+
+                $("#entryform,#saverecord").hide();
+                [% q_add_f = Koha.Preference('PatronQuickAddFields').split('\|') %]
+                var qaddfields = [[% FOREACH field IN q_add_f.unique %]"[% field %]",[% END %]];
+                var skipped_fields = ["contactname","contactfirstname","relationship"]; //Guarantor form is pulled as a whole, ignore individual fields
+                $("#entryform label").each(function () {
+                    var input_label = $(this).attr('for');
+                    if ( input_label == 'sex-female' ) {
+                        input_label='sex';
+                    }
+                    else if ( input_label == 'btitle' ) {
+                        input_label='title';
+                    }
+                    if ( skipped_fields.indexOf( input_label ) != -1 ) { input_label=""; }
+                    if( qaddfields.indexOf( input_label ) != -1 || $(this).attr('class') == 'required' ){
+                       $(this).parent().clone().appendTo("#quick_add_list");
+                       [% UNLESS mandatorypassword %]
+                             if( input_label == 'password' ) $("#entryform label[for='password2']").parent().clone().appendTo("#quick_add_list");
+                       [% END %]
+                    }
+                });
+                    if( $("#memberentry_guarantor").length ) {
+                        $("#memberentry_guarantor").clone().appendTo("#quick_add_list").css("margin",0);
+                        $("#quick_add_form #memberentry_guarantor").append("<p>" + _("Note: Quick add guarantor form populates address fields in full form") + "</p>");
+                        $("#quick_add_list #guarantordelete").prop('id','qagd');
+                    }
+                $("#qagd").click(function() { $("#guarantordelete").click(); });
+                $("#quick_add_form").show();
+            });
+        [% END %]
+
+    </script>
+    [% Asset.js("js/members.js") %]
+    [% Asset.js("js/messaging-preference-form.js") %]
+[% END %]
+
+[% INCLUDE 'intranet-bottom.inc' %]
+[% PROCESS 'password_check.inc' %]
+[% PROCESS 'add_password_check' new_password => 'password' %]