X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fmembers%2Fmemberentrygen.tt;h=49ddce89351661440a6b1d200d1c3bfd8dde2816;hb=59757c1f5b7de423241f91ef8c95822183786d00;hp=77b4df9ae689564406350329e04005da08ea8577;hpb=27770b7c8f9a0d75f7dc17c6b1face67c71533a3;p=koha.git

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
index 77b4df9ae6..49ddce8935 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1,225 +1,70 @@
+[% USE raw %]
+[% 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 %] 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 %])</title>
+<title>Koha &rsaquo; Patrons &rsaquo;
+    [% UNLESS blocking_error %]
+        [% IF ( opadd ) %]Add
+        [% ELSIF ( opduplicate ) %]Duplicate
+        [% ELSE %] Modify
+        [% END %] patron
+        [% IF (firstname) %][% firstname | html %] [% END %]
+        [% IF (surname) %][% surname | html %] [% END %]
+        ([%IF categoryname %][% categoryname | html %][% 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() {
-
-	[% 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 %]
-	$("#dateofbirth").datepicker({ maxDate: "-1D", yearRange: "c-120:" });
-	dateformat = $("#dateofbirth").siblings(".hint").first().html();
-    if( $('#dateofbirth').length ) {
-        write_age();
-    }
-	$("#entryform").validate({
-		rules: {
-			email: {
-				email: true
-			},
-			emailpro: {
-				email: true
-			},
-			B_email: {
-				email: true
-			}
-		},
-		submitHandler: function(form) {
-			$("body, form input[type='submit'], form button[type='submit'], form a").addClass('waiting');
-			if (form.beenSubmitted)
-				return false;
-			else
-				form.beenSubmitted = true;
-				form.submit();
-			}
-	});
-
-	var mrform = $("#manual_restriction_form");
-	var mrlink = $("#add_manual_restriction");
-	mrform.hide();
-	mrlink.on("click",function(e){
-		$(this).hide();
-		mrform.show();
-		e.preventDefault();
-	});
-	$("#cancel_manual_restriction").on("click",function(e){
-		$('#debarred_expiration').val('');
-		$('#add_debarment').val(0);
-		$('#debarred_comment').val('');
-		mrlink.show();
-		mrform.hide();
-		e.preventDefault();
-	});
-    $('#floating-save').css( { bottom: parseInt( $('#floating-save').css('bottom') ) + $('#changelanguage').height() + 'px' } );
-});
-
-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_entry").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();
-}
-
-function select_user(borrowernumber, borrower) {
-	var form = $('#entryform').get(0);
-	if (form.guarantorid.value) {
-		$("#contact-details").find('a').remove();
-		$("#contactname, #contactfirstname").parent().find('span').remove();
-	}
-
-	var id = borrower.borrowernumber;
-	form.guarantorid.value = id;
-	$('#contact-details')
-		.show()
-		.find('span')
-		.after('<a target="blank" href="/cgi-bin/koha/members/moremember.pl?borrowernumber=' + id + '">' + id + '</a>');
-
-	$(form.contactname)
-		.val(borrower.surname)
-		.before('<span>' + borrower.surname + '</span>').get(0).type = 'hidden';
-	$(form.contactfirstname)
-		.val(borrower.firstname)
-		.before('<span>' + borrower.firstname + '</span>').get(0).type = 'hidden';
-
-	form.streetnumber.value = borrower.streetnumber;
-	form.address.value = borrower.address;
-	form.address2.value = borrower.address2;
-	form.city.value = borrower.city;
-	form.state.value = borrower.state;
-	form.zipcode.value = borrower.zipcode;
-	form.country.value = borrower.country;
-	form.branchcode.value = borrower.branchcode;
-
-	form.guarantorsearch.value = _("Change");
-
-	return 0;
-}
-
-    function write_age() {
-        var hint = $("#dateofbirth").siblings(".hint").first();
-        hint.html(dateformat);
-
-        var age = CalculateAge(document.form.dateofbirth.value);
-
-        if (!age.year && !age.month) {
-            return;
-        }
-
-        var age_string;
-        if (age.year || age.month) {
-            age_string = _("Age: ");
-        }
-
-        if (age.year) {
-            age_string += age.year > 1 ? _("%s years ").format(age.year) : _("%s year ").format(age.year);
-        }
-
-        if (age.month) {
-            age_string += age.month > 1 ? _("%s months ").format(age.month) : _("%s month ").format(age.month);
-        }
-
-        hint.html(age_string);
-    }
-
-        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_PASSWORD_MISMATCH = _("The passwords entered do not match");
-        var MSG_PASSWORD_CONTAINS_TRAILING_SPACES = _("Password contains leading and/or trailing spaces.");
-        var LABEL_CHANGE = _("Change");
-        var LABEL_SET_TO_PATRON = _("Set to patron");
-//]]>
-</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 (firstname || surname ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% IF (firstname) %][% firstname %] [% END %][% IF (surname) %][% surname %] [% 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>
+<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 | html %]">[% 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 | html %][% 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>
         [% ELSE %]
-            <div class="error">[% error_alert %]</div>
+            <div class="error">[% error_alert | html %]</div>
         [% END %]
     [% END %]
     [% IF info_alert %]
         <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><strong>There are no libraries defined.</strong> [% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/branches.pl">Please add a library.</a>[% ELSE %]An administrator must define at least one library.[% END %]</p>[% END %]
-            [% IF ( no_categories ) %]<p><strong>There are no patron categories defined.</strong> [% IF ( CAN_user_parameters ) %]<a href="/cgi-bin/koha/admin/categories.pl">Please 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 ) %]
-    <h1>[% 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 %])</h1>
-  
+    <h1>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron [% IF (firstname) %][% firstname | html %] [% END %][% IF (surname) %][% surname | html %] [% END %]([%IF ( categoryname ) %][% categoryname | html %][% 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="#" onclick="Dopop('moremember.pl?print=brief&amp;borrowernumber=[% check_member %]');return false;" >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 %]" />
-                    <button type="submit" class="new"><i class="fa fa-pencil"></i> It is a duplicate.
-                    Edit existing record</button>
-                </form>
+                <p><a class="popup" href="#" onclick="Dopop('moremember.pl?print=brief&amp;borrowernumber=[% check_member | html %]');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" action="/cgi-bin/koha/members/memberentry.pl" method="post" autocomplete="off">
-				<input type="hidden" name="nodouble" value="1" />
-                <button type="submit" class="new"><i class="fa fa-plus"></i> Not a duplicate.
+                <button type="submit" id="not-duplicate" class="new"><i class="fa fa-plus"></i> Not a duplicate.
                 Save as new record</button>
 			</div>
 	[% END %]
@@ -238,12 +83,12 @@ function select_user(borrowernumber, borrower) {
                 <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.  
-                    Ages allowed are [% age_low %]-[% age_high %].</li>
+            <li id="ERROR_age_limitations">Patron's age is incorrect for their category.
+                    Ages allowed are [% age_low | html %]-[% age_high | html %].</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 %]
@@ -253,14 +98,20 @@ function select_user(borrowernumber, borrower) {
 			[% 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 | html %] 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"><strong>[% ERROR_extended_unique_id_failed_description %]</strong> attribute value <i>[% ERROR_extended_unique_id_failed_value %]</i> is already in use by another patron record.</li>
+                <li id="ERROR_extended_unique_id_failed"><strong>[% ERROR_extended_unique_id_failed_description | html %]:</strong> Attribute value "[% ERROR_extended_unique_id_failed_value | html %]" 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>
@@ -276,26 +127,45 @@ function select_user(borrowernumber, borrower) {
 	[% 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 | html %]">
+    [% 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 | html %]" />
+[% 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="destination" value="[% destination %]" />
-<input type="hidden" name="check_member" value="[% check_member %]" />
-<input type="hidden" name="borrowernumber" value="[% UNLESS opduplicate %][% borrowernumber %][% END %]" />
-<input type="hidden" name="nodouble"  value="[% UNLESS opduplicate %][% nodouble %][% END %]" />
-[% IF ( step ) %]<input type="hidden" name="step"  value="[% step %]" />[% END %]
+<input type="hidden" name="BorrowerMandatoryField" value="[% BorrowerMandatoryField | html %]" />
+<input type="hidden" name="category_type" value="[% category_type | html %]" />
+<input type="hidden" name="updtype" value="[% updtype | html %]" />
+<input type="hidden" name="destination" value="[% destination | html %]" />
+<input type="hidden" name="check_member" value="[% check_member | html %]" />
+<input type="hidden" name="borrowernumber" value="[% borrowernumber | html UNLESS opduplicate %]" />
+<input type="hidden" name="nodouble"  value="[% nodouble | html UNLESS opduplicate %]" />
+<input type="hidden" name="csrf_token" value="[% csrf_token | html %]" />
+[% IF ( step ) %]<input type="hidden" name="step"  value="[% step | html %]" />[% 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 %]" />
+<input type="hidden" name="cardnumber" value="[% cardnumber | html %]" />
 [% END %]
 [% END %]
 [% END %]
@@ -307,7 +177,7 @@ function select_user(borrowernumber, borrower) {
 		<ol>
 		[% UNLESS ( I ) %]
         [% UNLESS notitle %]
-		[% IF ( title_cgipopup ) %]
+        [% IF Koha.Preference('BorrowersTitles') %]
             <li>
             [% IF ( mandatorytitle ) %]
                 <label for="btitle" class="required">
@@ -315,7 +185,16 @@ function select_user(borrowernumber, borrower) {
                 <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 | html %]" selected="selected">[% t | html %]</option>
+                    [% ELSE %]
+                        <option value="[% t | html %]">[% t | html %]</option>
+                    [% END %]
+                [% END %]
+            </select>
             [% IF ( mandatorytitle ) %]<span class="required">Required</span>[% END %]
             </li>
 		[% END %]
@@ -323,16 +202,24 @@ function select_user(borrowernumber, borrower) {
 		[% 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 ) %]
-            <input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20"  value="[% surname %]" />
+            <input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20"  value="[% surname | html %]" />
 		[% ELSE %]
-            <input type="text" id="surname" name="surname" size="20"  value="[% surname %]" />
+            <input type="text" id="surname" name="surname" size="20"  value="[% surname | html %]" />
 		[% END %]
 		[% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %]
 		</li>
@@ -346,7 +233,7 @@ function select_user(borrowernumber, borrower) {
                 <label for="firstname">
                 [% END %]
                 First name: </label>
-                <input type="text" id="firstname" name="firstname" size="20"  value="[% UNLESS opduplicate %][% 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 %]
@@ -359,7 +246,7 @@ function select_user(borrowernumber, borrower) {
                 [% END %]
                 Date of birth: </label>
 
-                <input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="write_age();" value="[% UNLESS opduplicate %][% dateofbirth %][% END %]" />
+                <input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="write_age();" value="[% dateofbirth | html UNLESS opduplicate %]" class="datepicker" />
 
         [% IF ( mandatorydateofbirth ) %]<span class="required">Required</span>[% END %]
         [% IF ( ERROR_dateofbirth ) %]<span class="required">(Error)</span>[% END %]
@@ -374,7 +261,7 @@ function select_user(borrowernumber, borrower) {
                     <label for="initials">
                 [% END %]
                 Initials: </label>
-                <input type="text" id="initials" name="initials" size="20"  value="[% UNLESS opduplicate %][% 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 %]
@@ -387,7 +274,7 @@ function select_user(borrowernumber, borrower) {
 			<label for="othernames">
 			[% END %]
             Other name: </label>
-            <input type="text" id="othernames" name="othernames" size="20"  value="[% UNLESS opduplicate %][% othernames %][% END %]" />
+            <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>
@@ -398,19 +285,19 @@ function select_user(borrowernumber, borrower) {
 
             [% UNLESS ( opduplicate ) %]
                 [% IF ( female ) %]
-                    <label for="sex-female">Female </label><input type="radio" name="sex" id="sex-female" value="F" checked="checked"  />
+                    <label for="sex-female"><input type="radio" name="sex" id="sex-female" value="F" checked="checked" /> Female</label>
                 [% ELSE %]
-                    <label for="sex-female">Female </label><input type="radio" name="sex" id="sex-female" value="F" />
+                    <label for="sex-female"><input type="radio" name="sex" id="sex-female" value="F" /> Female</label>
                 [% END %]
                 [% IF ( male ) %]
-                    <label for="sex-male">Male </label><input type="radio" name="sex" id="sex-male" value="M" checked="checked" />
+                    <label for="sex-male"><input type="radio" name="sex" id="sex-male" value="M" checked="checked" /> Male</label>
                 [% ELSE %]
-                    <label for="sex-male">Male </label><input type="radio" name="sex" id="sex-male" value="M" />
+                    <label for="sex-male"><input type="radio" name="sex" id="sex-male" value="M" /> Male</label>
                 [% END %]
                 [% IF ( none ) %]
-                    <label for="sex-none">None specified </label><input type="radio" name="sex" id="sex-none" value=""  checked="checked"  />
+                    <label for="sex-none"><input type="radio" name="sex" id="sex-none" value=""  checked="checked" /> None specified</label>
                 [% ELSE %]
-                    <label for="sex-none">None specified </label><input type="radio" name="sex" id="sex-none" value="" />
+                    <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" />
@@ -425,9 +312,13 @@ function select_user(borrowernumber, borrower) {
 	</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 | html %]" />
+    [% UNLESS step_6 %]
+        <input type="hidden" name="branchcode" value="[% branchcode | html %]" />
+    [% END %]
+    <fieldset id="memberentry_guarantor" class="rows">
+        <legend id="guarantor_lgd">Guarantor information</legend>
         <ol>
 [% IF ( P ) %]
 	        [% IF ( guarantorid ) %]
@@ -435,15 +326,15 @@ function select_user(borrowernumber, borrower) {
 	        [% ELSE %]
 	        <li id="contact-details" style="display: none">
 	        [% END %]
-	            <span class="label">Organization #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid %]</a>[% END %]
+	            <span class="label">Organization #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid | html %]" target="blank">[% guarantorid | html %]</a>[% END %]
 	        </li>
 	        <li>
 	            <label for="contactname">Organization name: </label>
 	            [% IF ( guarantorid ) %]
-	            <span>[% contactname %]</span>
-	            <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname %]" />
+	            <span>[% contactname | html %]</span>
+	            <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname | html %]" />
 	            [% ELSE %]
-                    <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" />
+                    <input name="contactname" id="contactname" type="text" size="20" value="[% contactname | html %]" />
 	            [% END %]
 	        </li>
 [% ELSE %]
@@ -453,16 +344,23 @@ function select_user(borrowernumber, borrower) {
  [% 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 | html %]" 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 %]" />
+     <span>[% contactname | html %]</span>
+     <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname | html %]" />
      [% ELSE %]
-        <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]" />
+        <input name="contactname" id="contactname" type="text" size="20" value="[% contactname | html %]" />
      [% END %]
  </li>
         [% END %]
@@ -470,10 +368,10 @@ function select_user(borrowernumber, borrower) {
  <li>
      <label for="contactfirstname">First name: </label>
      [% IF ( guarantorid ) %]
-     <span>[% contactfirstname %]</span>
-     <input name="contactfirstname" id="contactfirstname" type="hidden" size="20" value="[% contactfirstname %]" />
+     <span>[% contactfirstname | html %]</span>
+     <input name="contactfirstname" id="contactfirstname" type="hidden" size="20" value="[% contactfirstname | html %]" />
      [% ELSE %]
-        <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname %]" />
+        <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname | html %]" />
      [% END %]
  </li>
         [% END %]
@@ -483,9 +381,9 @@ function select_user(borrowernumber, borrower) {
      <select name="relationship" id="relationship" >
          [% FOREACH relshiploo IN relshiploop %]
          [% IF ( relshiploo.selected ) %]
-         <option value="[% relshiploo.relationship %]" selected="selected" >[% relshiploo.relationship %]</option>
+         <option value="[% relshiploo.relationship | html %]" selected="selected" >[% relshiploo.relationship | html %]</option>
          [% ELSE %]
-         <option value="[% relshiploo.relationship %]">[% relshiploo.relationship %]</option>
+         <option value="[% relshiploo.relationship | html %]">[% relshiploo.relationship | html %]</option>
          [% END %]
          [% END %]
      </select>
@@ -522,11 +420,12 @@ function select_user(borrowernumber, borrower) {
 
 [% END %]
 [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
-    [% IF Koha.Preference( 'AddressFormat' ) %]
-        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
-    [% ELSE %]
-        [% INCLUDE 'member-main-address-style-us.inc' %]
-    [% END %]
+    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
+        [% CASE 'de' %]
+            [% INCLUDE 'member-main-address-style-de.inc' %]
+        [% CASE # us %]
+            [% INCLUDE 'member-main-address-style-us.inc' %]
+     [% END %]
 [% END # nostreet && nocity etc group%]
 
 [% UNLESS nophone && nophonepro && nomobile && noemail && noemailpro && nofax %]
@@ -534,13 +433,13 @@ function select_user(borrowernumber, borrower) {
     <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>
-        <input type="text" id="phone" name="phone" value="[% phone %]" />
+        <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>
@@ -553,7 +452,7 @@ function select_user(borrowernumber, borrower) {
       <label for="phonepro">
       [% END %]
       Secondary phone: </label>
-    <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]" />
+    <input type="text" id="phonepro" name="phonepro" value="[% phonepro | html %]" />
 	  [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -565,7 +464,7 @@ function select_user(borrowernumber, borrower) {
       <label for="mobile">
       [% END %]
       Other phone: </label>
-        <input type="text" id="mobile" name="mobile" value="[% mobile %]" />
+        <input type="text" id="mobile" name="mobile" value="[% mobile | html %]" />
 	  [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -577,20 +476,20 @@ function select_user(borrowernumber, borrower) {
       <label for="email">
       [% END %]
       Primary email: </label>
-        <input type="text" id="email" name="email" size="45" value="[% email %]" />
+        <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>
-        <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro %]" />
+        <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro | html %]" />
 	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -602,7 +501,7 @@ function select_user(borrowernumber, borrower) {
       <label for="fax">
       [% END %]
       Fax: </label>
-        <input type="text" id="fax" name="fax" value="[% fax %]" />
+        <input type="text" id="fax" name="fax" value="[% fax | html %]" />
 	  [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -615,67 +514,75 @@ function select_user(borrowernumber, borrower) {
 [% IF ( step_6 ) %]
 
     [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
-        [% IF Koha.Preference( 'AddressFormat' ) %]
-            [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
-        [% ELSE %]
+    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
+        [% CASE 'de' %]
+            [% INCLUDE 'member-alt-address-style-de.inc' %]
+        [% CASE # us %]
             [% INCLUDE 'member-alt-address-style-us.inc' %]
-        [% END %]
+     [% END %]
+
     [% 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 %]
-        [% IF Koha.Preference( 'AddressFormat' ) %]
-            [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
-        [% ELSE %]
+    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
+        [% CASE 'de' %]
+            [% INCLUDE 'member-alt-contact-style-de.inc' %]
+        [% CASE # us %]
             [% INCLUDE 'member-alt-contact-style-us.inc' %]
-        [% END %]
+     [% END %]
     [% 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 ) %]
+          [% IF mandatorycardnumber %]
             <label for="cardnumber" class="required">
           [% ELSE %]
             <label for="cardnumber" class="validated">
           [% END %]
-          Card number: </label>
+            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 %]" minlength="[% minlength_cardnumber %]" maxlength="[% maxlength_cardnumber %]" />
-                [% IF ( mandatorycardnumber ) %]<span class="required">Required</span>[% END %]
-                <div class="hint">Card number must be exactly [% minlength_cardnumber %] characters.</div>
+                <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" minlength="[% minlength_cardnumber | html %]" maxlength="[% maxlength_cardnumber | html %]" />
+                [% IF mandatorycardnumber %]<span class="required">Required</span>[% END %]<span id="cn_max" class="required">Card number must not be more than [% maxlength_cardnumber | html %] characters.</span>
+                <div class="hint">Card number must be exactly [% minlength_cardnumber | html %] characters.
           [% ELSIF minlength_cardnumber && maxlength_cardnumber %]
-                <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" minlength="[% minlength_cardnumber %]" maxlength="[% maxlength_cardnumber %]" />
-                [% IF ( mandatorycardnumber ) %]<span class="required">Required</span>[% END %]
-                <div class="hint">Card number must be between [% minlength_cardnumber %] and [% maxlength_cardnumber %] characters.</div>
+                <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" minlength="[% minlength_cardnumber | html %]" maxlength="[% maxlength_cardnumber | html %]" />
+                [% IF mandatorycardnumber %]<span class="required">Required</span>[% END %]<span id="cn_max" class="required">Card number must not be more than [% maxlength_cardnumber | html %] characters.</span>
+                <div class="hint">Card number must be between [% minlength_cardnumber | html %] and [% maxlength_cardnumber | html %] characters.
           [% ELSIF maxlength_cardnumber %]
-                <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" maxlength="[% maxlength_cardnumber %]" />
-                [% IF ( mandatorycardnumber ) %]<span class="required">Required</span>[% END %]
-                <div class="hint">Card number can be up to [% maxlength_cardnumber %] characters.</div>
+                <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber | html %]" maxlength="[% maxlength_cardnumber | html %]" />
+                [% IF mandatorycardnumber %]<span class="required">Required</span>[% END %]<span id="cn_max" class="required">Card number must not be more than [% maxlength_cardnumber | html %] characters.</span>
+                <div class="hint">Card number can be up to [% maxlength_cardnumber | html %] characters.
           [% ELSE %]
-                <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" />
-                [% IF ( mandatorycardnumber ) %]<span class="required">Required</span>[% END %]
-                <div class="hint">There is no minimum or maximum character length.</div>
+                <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>
         <label for="libraries" class="required">Library:</label>
         <select name="branchcode" size="1" id="libraries">
-        [%- 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>
-      <span class="required">Required</span>
+            [% PROCESS options_for_libraries libraries => Branches.all( selected => userbranch, only_from_group => 1 ) %]
+        </select>
+        <span class="required">Required</span>
     </li>
         [% END %]
     <li>
@@ -692,9 +599,9 @@ function select_user(borrowernumber, borrower) {
                     [% 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>
+                    <option value="[% categoryloo.categorycode | html %]" selected="selected" data-typename="[% typeloo.typename | html %]">[% categoryloo.categoryname | html %]</option>
                 [% ELSE %]
-                    <option value="[% categoryloo.categorycode %]" data-typename="[% typeloo.typename %]">[% categoryloo.categoryname %]</option>
+                    <option value="[% categoryloo.categorycode | html %]" data-typename="[% typeloo.typename | html %]">[% categoryloo.categoryname | html %]</option>
                 [% END %]
                 [% IF ( loop.last ) %]
                     </optgroup>
@@ -728,19 +635,51 @@ function select_user(borrowernumber, borrower) {
     [% IF ( mandatorysort2 ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
-    [% IF ( Koha.Preference( 'NorwegianPatronDBEnable' ) == 1 ) %]
+    [% 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="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 %]
+            <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 | html %]" selected="selected">[% sublanguage.native_description | html %] [% sublanguage.region_description | html %] ([% sublanguage.rfc4646_subtag | html %])</option>
+                            [% ELSE %]
+                                <option value="[% sublanguage.rfc4646_subtag | html %]">[% sublanguage.native_description | html %] [% sublanguage.region_description | html %] ([% sublanguage.rfc4646_subtag | html %])</option>
+                            [% END %]
+                        [% ELSE %]
+                            [% IF sublanguage.rfc4646_subtag == lang %]
+                                <option value="[% sublanguage.rfc4646_subtag | html %]" selected="selected">[% sublanguage.native_description | html %] ([% sublanguage.rfc4646_subtag | html %])</option>
+                            [% ELSE %]
+                                <option value="[% sublanguage.rfc4646_subtag | html %]">[% sublanguage.native_description | html %] ([% sublanguage.rfc4646_subtag | html %])</option>
+                            [% END %]
+                        [% END %]
+                    [% END %]
+                [% END %]
+            </select>
         </li>
     [% END %]
-	</ol>
+   </ol>
   </fieldset>
     [% UNLESS nodateenrolled &&  noopacnote && noborrowernotes %]
 	<fieldset class="rows" id="memberentry_subscription">
@@ -754,9 +693,9 @@ function select_user(borrowernumber, borrower) {
 			[% END %]
 			Registration date: </label>
             [% IF ( dateformat == "metric" ) %]
-                <input type="text" id="from" name="dateenrolled"  maxlength="10" size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="[% dateenrolled %]" class="datepickerfrom" />
+                <input type="text" id="from" name="dateenrolled"  maxlength="10" size="10" onchange="CheckDate(document.form.dateenrolled);check_manip_date('verify');" value="[% dateenrolled | html %]" class="datepickerfrom" />
             [% ELSE %]
-                <input type="text" id="from" name="dateenrolled"  maxlength="10" size="10" value="[% dateenrolled %]" class="datepickerfrom" />
+                <input type="text" id="from" name="dateenrolled"  maxlength="10" size="10" value="[% dateenrolled | html %]" class="datepickerfrom" />
             [% END %]
 		[% IF ( mandatorydateenrolled ) %]<span class="required">Required</span>[% END %]
 		[% IF ( ERROR_dateenrolled ) %]<span class="required">(Error)</span>[% END %]
@@ -776,15 +715,15 @@ function select_user(borrowernumber, borrower) {
 			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="[% UNLESS opduplicate %][% dateexpiry %][% END %]" class="datepickerto" />
+                    <input type="text" id="to" name="dateexpiry" maxlength="10"  size="10" onchange="CheckDate(document.form.dateexpiry);check_manip_date('verify');" value="[% dateexpiry | html 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="[% UNLESS opduplicate %][% dateexpiry %][% END %]" class="datepickerto" />
+                <input type="text" id="to" name="dateexpiry" maxlength="10"  size="10" value="[% dateexpiry | html 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 | html %]" class="datepickerto" />
 				[% END %]
 			[% END %]
 		[% IF ( mandatorydateexpiry ) %]<span class="required">Required</span>[% END %]
@@ -797,22 +736,22 @@ function select_user(borrowernumber, borrower) {
 				<label for="opacnote" class="required">
 			[% ELSE %]
 				<label for="opacnote">
-			[% END %]	
+            [% END %]
 			OPAC note: </label>
-            <textarea id="opacnote" name="opacnote" cols="55" rows="5">[% UNLESS opduplicate %][% opacnote %][% END %]</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">[% UNLESS opduplicate %][% borrowernotes %][% END %]</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>
@@ -837,13 +776,13 @@ function select_user(borrowernumber, borrower) {
 	[% IF ( opduplicate ) %]
 		<input type="text" id="userid" name="userid" size="20" disabled="disabled" />
 	[% ELSE %]
-		<input type="text" id="userid" name="userid" size="20" disabled="disabled" value="[% userid %]" />
+		<input type="text" id="userid" name="userid" size="20" disabled="disabled" value="[% userid | html %]" />
 	[% END %]
 [% ELSE %]
 	[% IF ( opduplicate ) %]
 		<input type="text" id="userid" name="userid" size="20" value="" />
 	[% ELSE %]
-		<input type="text" id="userid" name="userid" size="20" value="[% userid %]" />
+		<input type="text" id="userid" name="userid" size="20" value="[% userid | html %]" />
 	[% END %]
 [% END %]
 
@@ -866,13 +805,13 @@ function select_user(borrowernumber, borrower) {
 				[% IF ( opduplicate ) %]
 					<input type="password" id="password" name="password" size="20"  disabled="disabled" />
 				[% ELSE %]
-					<input type="password" id="password" name="password" size="20"  disabled="disabled" value="[% password %]" />
+					<input type="password" id="password" name="password" size="20"  disabled="disabled" value="[% password | html %]" />
 				[% END %]
 [% ELSE %]
 				[% IF ( opduplicate ) %]
 					<input type="password" id="password" name="password" size="20" />
 				[% ELSE %]
-					<input type="password" id="password" name="password" size="20" value="[% password %]" />
+					<input type="password" id="password" name="password" size="20" value="[% password | html %]" />
 				[% END %]
 [% END %]
 			[% ELSE %]
@@ -894,8 +833,11 @@ function select_user(borrowernumber, borrower) {
 				[% 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 | html %]</div>
 		</li>
 		<li>
 			[% IF ( mandatorypassword ) %]
@@ -909,13 +851,13 @@ function select_user(borrowernumber, borrower) {
 				[% IF ( opduplicate ) %]
 					<input type="password" id="password2" name="password2" size="20"  disabled="disabled" />
 				[% ELSE %]
-					<input type="password" id="password2" name="password2" size="20"  disabled="disabled" value="[% password %]" />
+					<input type="password" id="password2" name="password2" size="20"  disabled="disabled" value="[% password | html %]" />
 				[% END %]
 [% ELSE %]
 				[% IF ( opduplicate ) %]
 					<input type="password" id="password2" name="password2" size="20" />
 				[% ELSE %]
-					<input type="password" id="password2" name="password2" size="20" value="[% password %]" />
+					<input type="password" id="password2" name="password2" size="20" value="[% password | html %]" />
 				[% END %]
 [% END %]
 			[% ELSE %]
@@ -944,27 +886,29 @@ function select_user(borrowernumber, borrower) {
         [% END # hide fieldset %][% END %]
 		<!--this zones are not necessary in modif mode -->
         [% UNLESS ( opadd || opduplicate ) %]
-		<fieldset class="rows">
-            <legend>Patron account flags</legend>
+        <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 %]">
+				<li><label class="radio" for="yes[% flagloo.name | html %]">
                 [% IF ( flagloo.key == 'gonenoaddress' ) %]Gone no address:[% END %]
                 [% IF ( flagloo.key == 'lost' ) %]Lost card:[% END %]
                 </label>
                 [% IF CAN_user_circulate_manage_restrictions %]
-				<label for="yes[% flagloo.name %]">Yes </label>
+                            <label for="yes[% flagloo.name | html %]">
 				[% IF ( flagloo.yes ) %]
-				<input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" checked="checked" />
+				<input type="radio" id="yes[% flagloo.name | html %]" name="[% flagloo.name | html %]" value="1" checked="checked" />
 				[% ELSE %]
-				<input type="radio" id="yes[% flagloo.name %]" name="[% flagloo.name %]" value="1" />
+				<input type="radio" id="yes[% flagloo.name | html %]" name="[% flagloo.name | html %]" value="1" />
 				[% END %]
-				<label for="no[% flagloo.name %]">No </label>
+                            Yes </label>
+                            <label for="no[% flagloo.name | html %]">
 				[% IF ( flagloo.no ) %]
-				<input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" checked="checked"/>
+				<input type="radio" id="no[% flagloo.name | html %]" name="[% flagloo.name | html %]" value="0" checked="checked"/>
 				[% ELSE %]
-				<input type="radio" id="no[% flagloo.name %]" name="[% flagloo.name %]" value="0" />
+				<input type="radio" id="no[% flagloo.name | html %]" name="[% flagloo.name | html %]" value="0" />
 				[% END %]
+                            No </label>
                 [% ELSE %]
                   [% IF flagloo.yes %]Yes[% ELSE %]No[% END %]
                 [% END %]
@@ -975,8 +919,8 @@ function select_user(borrowernumber, borrower) {
 			</ol>
 			</fieldset>
 
-              <fieldset class="rows">
-                <legend>Patron restrictions</legend>
+              <fieldset class="rows" id="memberentry_restrictions">
+                <legend id="restrictions_lgd">Patron restrictions</legend>
 
                 [% IF ( debarments ) %]
                     <table>
@@ -985,7 +929,8 @@ function select_user(borrowernumber, borrower) {
                                  <th>Type</th>
                                  <th>Comment</th>
                                  <th>Expiration</th>
-                                 [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
+                                 <th>Created</th>
+                                 [% IF CAN_user_borrowers_edit_borrowers && CAN_user_circulate_manage_restrictions %]
                                    <th>Remove?</th>
                                  [% END %]
                             </tr>
@@ -994,12 +939,19 @@ function select_user(borrowernumber, borrower) {
                         <tbody>
                             [% FOREACH d IN debarments %]
                                 <tr>
-                                    <td>[% d.type %]</td>
-                                    <td>[% d.comment %]</td>
+                                    <td>[% d.type | html %]</td>
+                                    <td>
+                                    [% IF d.comment.search('OVERDUES_PROCESS') %]
+                                        Restriction added by overdues process [% d.comment.remove('OVERDUES_PROCESS ') | $raw %]
+                                    [% ELSE %]
+                                        [% d.comment | $raw %]
+                                    [% END %]
+                                    </td>
                                     <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
-                                    [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
+                                    <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 %]" />
+                                        <input type="checkbox" id="debarment_[% d.borrower_debarment_id | html %]" name="remove_debarment" value="[% d.borrower_debarment_id | html %]" />
                                       </td>
                                     [% END %]
                                 </tr>
@@ -1010,14 +962,14 @@ function select_user(borrowernumber, borrower) {
                     <p>Patron is currently unrestricted.</p>
                 [% END %]
 
-                [% IF CAN_user_borrowers && CAN_user_circulate_manage_restrictions %]
+                [% 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>Add manual restriction</legend>
+                        <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" readonly="readonly" value="" class="datepicker" onchange="$('#add_debarment').val(1);" />
+                            <li><label for="debarred_expiration">Expiration: </label><input name="debarred_expiration" id="debarred_expiration" size="10" value="" class="datepicker" onchange="$('#add_debarment').val(1);" type="text" />
                                     <a href='javascript:void(0)' onclick="$('#debarred_expiration').val('');">Clear date</a></li>
 
                         </ol>
@@ -1031,38 +983,91 @@ function select_user(borrowernumber, borrower) {
 
 [% 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>Additional attributes and identifiers</legend>
+    <legend id="patron_attributes_lgd">Additional attributes and identifiers</legend>
     <input type="hidden" name="setting_extended_patron_attributes" value="1" />
     [% FOREACH pa_loo IN patron_attributes %]
         [% IF pa_loo.class %]
-            <fieldset id="aai_[% pa_loo.class %]">
-            <legend>[% pa_loo.lib %]</legend>
+            <fieldset id="aai_[% pa_loo.class | html %]">
+            <legend id="[% pa_loo.class | html %]_lgd">[% pa_loo.lib | html %]</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 %]" />
+                <li data-category_code="[% patron_attribute.category_code | html %]">
+                    <label for="[% patron_attribute.form_id | html %]">[% patron_attribute.description | html %]: </label>
                         [% IF ( patron_attribute.use_dropdown ) %]
-                            <select id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]">
+                            <select id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]">
                                 <option value=""></option>
                                 [% FOREACH auth_val_loo IN patron_attribute.auth_val_loop %]
                                     [% IF auth_val_loo.authorised_value == patron_attribute.value %]
-                                        <option value="[% auth_val_loo.authorised_value %]" selected="selected">
-                                            [% auth_val_loo.lib %]
+                                        <option value="[% auth_val_loo.authorised_value | html %]" selected="selected">
+                                            [% auth_val_loo.lib | html %]
                                         </option>
                                     [% ELSE %]
-                                        <option value="[% auth_val_loo.authorised_value %]" >
-                                            [% auth_val_loo.lib %]
+                                        <option value="[% auth_val_loo.authorised_value | html %]" >
+                                            [% auth_val_loo.lib | html %]
                                         </option>
                                     [% END %]
                                 [% END %]
                             </select>
                         [% ELSE %]
-                            <textarea rows="2" cols="30" id="[% patron_attribute.form_id %]" name="[% patron_attribute.form_id %]">[% patron_attribute.value %]</textarea>
+                            <textarea rows="2" cols="30" id="[% patron_attribute.form_id | html %]" name="[% patron_attribute.form_id | html %]">[% patron_attribute.value | html %]</textarea>
                         [% END %]
+                        <input type="hidden" id="[% patron_attribute.form_id | html %]_code" name="[% patron_attribute.form_id | html %]_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="#" onclick="clone_entry(this); return false;"><i class="fa fa-fw fa-plus"></i> New</a>
@@ -1128,48 +1133,211 @@ function select_user(borrowernumber, borrower) {
     [% INCLUDE 'messaging-preference-form.inc' %]
     [% IF ( SMSSendDriver ) %]
         <p><label for="SMSnumber">SMS number:</label>
-            <input type="text" id="SMSnumber" name="SMSnumber" value="[% SMSnumber %]" />
+            <input type="text" id="SMSnumber" name="SMSnumber" value="[% SMSnumber | html %]" />
         </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>
+                        <option value="[% s.id | html %]" selected="selected">[% s.name | html %]</option>
                     [% ELSE %]
-                        <option value="[% s.id %]">[% s.name %]</option>
+                        <option value="[% s.id | html %]">[% s.name | html %]</option>
                     [% END %]
                 [% END %]
             </select>
         </p>
+        [% END %]
     [% END %]
   </fieldset>
 [% END %] [% END %]
 
-<fieldset class="rows" id="floating-save">
-[% UNLESS ( check_member ) %]
-    <fieldset class="action">
-        <button type="submit" name="save" onclick="return check_form_borrowers();">
-            <i class="fa fa-save"></i> Save
-        </button>
-      [% 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 %]
-</fieldset>
 </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>
 
 [% UNLESS ( opadd ) %]<div class="yui-b">
-[% INCLUDE 'members-menu.inc' %]
+[% INCLUDE 'circ-menu.inc' %]
 </div>[% END %]
 [% END %]
 </div>
-[% INCLUDE 'intranet-bottom.inc' %]
 
+[% MACRO jsinclude BLOCK %]
+    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") | $raw %]
+    [% INCLUDE 'calendar.inc' %]
+    [% INCLUDE 'str/members-menu.inc' %]
+    [% Asset.js("js/members-menu.js") | $raw %]
+    <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 | html %]" );
+            [% 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 | html %];
+            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 | html %]');
+                $("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 | html %]",[% 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") | $raw %]
+    [% Asset.js("js/messaging-preference-form.js") | $raw %]
+[% END %]
+
+[% INCLUDE 'intranet-bottom.inc' %]
+[% PROCESS 'password_check.inc' %]
+[% PROCESS 'add_password_check' new_password => 'password' %]