X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fmembers%2Fmemberentrygen.tt;h=b1585564ef0cdf62af628a827757b7d341f71ea4;hb=0532bdc95616f80c24f935d1bb5875b2f5e267dd;hp=7ffefd3ca9df715fdb997bf7e05bb83bbb5409f5;hpb=5cea05831a59dbae12e60437870908221708b47d;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 7ffefd3ca9..b1585564ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1,12 +1,14 @@
+[% IF ( opduplicate ) %][% SET focusAction = "clearDupe" %][% END %]
+[% USE KohaDates %]
 [% 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>
 [% INCLUDE 'doc-head-close.inc' %]
 [% INCLUDE 'calendar.inc' %]
-<script type="text/JavaScript">
+<script type="text/javascript">
 //<![CDATA[
     $(document).ready(function() {
-		$("fieldset.rows input").keydown(function(e){ return checkEnter(e); });
+         $("fieldset.rows input").addClass("noEnterSubmit");
         $("#guarantordelete").click(function() {
             $("#contact-details").hide().find('a').remove();
             $("#guarantorid, #contactname, #contactfirstname").each(function () { this.value = "" });
@@ -23,6 +25,9 @@
             document.form.state.value=RegExp.$3;
             document.form.country.value=RegExp.$4;
         });
+        $(".clearDupe").on("focus",function(){
+            $(this).val("");
+        })
 
         [% IF categorycode %]
             update_category_code( "[% categorycode %]" );
@@ -33,6 +38,33 @@
             }
         [% END %]
         $("#dateofbirth").datepicker({ maxDate: "-1D" });
+        $("#entryform").validate({
+            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').prop('checked', false);
+            $('#debarred_comment').val('');
+            mrlink.show();
+            mrform.hide();
+            e.preventDefault();
+        });
     });
 
     function clear_entry(node) {
@@ -78,7 +110,6 @@
         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");
 //]]>
@@ -101,7 +132,6 @@
    <div id="bd">
 	<div id="yui-main">
 	<div class="yui-b">
-
     [% IF error_alert %]
         [% IF ( error_alert == "no_email" ) %]
             <div class="error">This member has no email</div>
@@ -141,11 +171,6 @@
 			</div>
 	[% END %]
 
-	[% IF ( debug ) %]
-		<div id="debug">
-				<div>Debug is on (level [% debug %])</div>
-		</div>
-	[% END %]
 	[% IF ( nok ) %]
 		<div class="dialog alert">
 			<p>The following fields are wrong. Please fix them.</p>
@@ -180,7 +205,7 @@
 			[% 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>
+                    [% ERROR_extended_unique_id_failed_value %] is already in use by another patron record.</li>
 			[% END %]
 			</ul>
 		</div>
@@ -242,17 +267,9 @@
 		[% END %]
 		Surname: </label>
 		[% 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 %]" class="[% focusAction %]" />
 		[% 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 %]" class="[% focusAction %]" />
 		[% END %]
 		[% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %]
 		</li>
@@ -278,12 +295,12 @@
                 <label for="dateofbirth">
                 [% END %]
                 Date of birth: </label>
-				
-	[% IF ( metric ) %]			
+
+        [% IF ( dateformat == "metric" ) %]
                 <input type="text" id="dateofbirth" name="dateofbirth" size="20" onchange="CheckDate(document.form.dateofbirth);" value="[% IF ( opduplicate ) %][% ELSE %][% dateofbirth %][% END %]" />
-[% ELSE %]
+        [% ELSE %]
                 <input type="text" id="dateofbirth" name="dateofbirth" size="20" value="[% IF ( opduplicate ) %][% ELSE %][% dateofbirth %][% END %]" />
-[% END %]
+        [% END %]
 
         [% IF ( mandatorydateofbirth ) %]<span class="required">Required</span>[% END %]
         [% IF ( ERROR_dateofbirth ) %]<span class="required">(Error)</span>[% END %]
@@ -298,11 +315,7 @@
                     <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 %]" class="[% focusAction %]" />
                 [% IF ( mandatoryinitials ) %]<span class="required">Required</span>[% END %]
             </li>
         [% END %]
@@ -314,12 +327,8 @@
 			[% 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 %]" class="[% focusAction %]" />
 [% IF ( mandatoryothernames ) %]<span class="required">Required</span>[% END %]
 		[% IF ( I ) %]<input type="hidden" name="sex" value="N" />[% END %]
 		</li>
@@ -368,11 +377,7 @@
 	            <span>[% contactname %]</span>
 	            <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname %]" />
 	            [% 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 %]" class="[% focusAction %]" />
 	            [% END %]
 	        </li>
 [% ELSE %]
@@ -391,11 +396,7 @@
      <span>[% contactname %]</span>
      <input name="contactname" id="contactname" type="hidden" size="20" value="[% contactname %]" />
      [% 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 %]" class="[% focusAction %]" />
      [% END %]
  </li>
         [% END %]
@@ -406,11 +407,7 @@
      <span>[% contactfirstname %]</span>
      <input name="contactfirstname" id="contactfirstname" type="hidden" size="20" value="[% contactfirstname %]" />
      [% 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 %]" class="[% focusAction %]" />
      [% END %]
  </li>
         [% END %]
@@ -444,7 +441,7 @@
 
 [% END %]
 [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
-<fieldset class="rows">
+<fieldset class="rows" id="memberentry_mainaddress">
     <legend id="main_address_lgd">Main address</legend><ol>
         [% UNLESS nostreetnumber %]
     <li>
@@ -454,11 +451,7 @@
       <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 %]
+        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" class="[% focusAction %]" />
 [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -484,11 +477,7 @@
       <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 %]
+            <input type="text" id="address" name="address" size="35" value="[% address %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -500,11 +489,7 @@
       <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 %]
+            <input type="text" id="address2" name="address2" size="35" value="[% address2 %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
     </li>  
         [% END %]
@@ -516,11 +501,7 @@
         <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 %]
+        <input type="text" id="city" name="city" size="20" value="[% city %]" class="[% focusAction %]" />
         [% IF ( city_cgipopup ) %]or <strong>choose</strong>
         <select id="select_city" name="select_city">
         [% FOREACH city_loo IN city_loop %]
@@ -545,7 +526,7 @@
         <label for="state">
       [% END %]
       State: </label>
-      <input type="text" name="state" id="state" size="20" value="[% state %]" />
+      <input type="text" name="state" id="state" size="20" value="[% state %]" class="[% focusAction %]" />
 	  [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -557,11 +538,7 @@
         <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 %]
+            <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -573,11 +550,7 @@
         <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 %]
+        <input type="text" name="country" id="country" size="20" value="[% country %]" class="[% focusAction %]" />
 	  [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
     </li>    
         [% END %]
@@ -596,11 +569,7 @@
       <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 %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
 
     </li>
@@ -613,11 +582,7 @@
       <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 %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -629,11 +594,7 @@
       <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 %]" class="[% focusAction %]" />
 	  [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -645,11 +606,7 @@
       <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 %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
 
     </li>
@@ -662,11 +619,7 @@
       <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 %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -678,11 +631,7 @@
       <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 %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
     </li>
         [% END %]
@@ -705,11 +654,7 @@
 					<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 %]
+                    <input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -721,11 +666,7 @@
 					<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 %]
+                    <input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -737,7 +678,7 @@
 					<label for="B_city">
 				[% END %]
 				City: </label>
-				<input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
+                <input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -749,7 +690,7 @@
 					<label for="B_state">
 				[% END %]
 				State: </label>
-				<input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
+                <input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -761,11 +702,7 @@
 					<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 %]
+                    <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -777,11 +714,7 @@
 					<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 %]
+                    <input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]" class="[% focusAction %]" />
 	  [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -793,11 +726,7 @@
                 <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 %]
+                    <input type="text" id="B_phone" name="B_phone" value="[% B_phone %]" class="[% focusAction %]" />
                 [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
             </li>
         [% END %]
@@ -809,11 +738,7 @@
           <label for="B_email">
         [% 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 %]
+            <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]" class="[% focusAction %]" />
 		[% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
         [% END %]
         [% UNLESS nocontactnote %]
@@ -844,11 +769,7 @@
 				<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 %]
+                    <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -860,11 +781,7 @@
 				<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 %]
+                    <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -876,11 +793,7 @@
 				<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 %]
+                    <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]" size="40" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -892,11 +805,7 @@
 				<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 %]
+                <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]" size="40" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -908,7 +817,7 @@
 				<label for="altcontactaddress3">
 				[% END %]
 				City:</label>
-				<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
+                <input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -920,7 +829,7 @@
 				<label for="altcontactstate">
 				[% END %]
 				State:</label>
-				<input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
+                <input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -932,11 +841,7 @@
 				<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 %]
+                    <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]" size="5" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -948,11 +853,7 @@
 				<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 %]
+                    <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]" size="20" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
 			</li>			
         [% END %]
@@ -964,11 +865,7 @@
 				<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 %]
+                    <input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]" class="[% focusAction %]" />
 				[% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
 			</li>
         [% END %]
@@ -993,28 +890,31 @@
         [% END %]
         [% UNLESS nobranchcode %]
     <li>
-      [% IF ( mandatorybranchcode ) %]
-        <label for="branchcode" class="required">
-      [% ELSE %]
-        <label for="branchcode">
-      [% END %]
-      Library: </label>
-      [% CGIbranch %]
-	  [% IF ( mandatorybranchcode ) %]<span class="required">Required</span>[% END %]
+        <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>
     </li>
         [% END %]
     <li>
-        <label for="categorycode">Category: </label>
+        <label for="categorycode" class="required">Category: </label>
         <select id="categorycode" 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>
@@ -1027,6 +927,7 @@
             [% END %]
        [% END %]
        </select>
+       <span class="required">Required</span>
     </li>
         [% UNLESS nosort1 %]
     <li>
@@ -1039,7 +940,7 @@
       [% IF ( CGIsort1 ) %] 
         [% CGIsort1 %]
       [% ELSE %]
-        <input  type="text" id="sort1" name="sort1" size="20"  value="[% sort1 %]" />
+            <input type="text" id="sort1" name="sort1" size="20" value="[% sort1 %]" class="[% focusAction %]" />
 	  [% IF ( mandatorysort1 ) %]<span class="required">Required</span>[% END %]
       [% END %]   
     </li>
@@ -1055,18 +956,14 @@
     [% 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 %]
+        <input type="text" id="sort2" name="sort2" size="20" value="[% sort2 %]" class="[% focusAction %]" />
 	  [% IF ( mandatorysort2 ) %]<span class="required">Required</span>[% END %]
     [% END %] 
     </li>
         [% END %]
 	</ol>
   </fieldset>
-    [% UNLESS nodateenrolled && nodateexpiry &&  noopacnote && noborrowernotes %]
+    [% UNLESS nodateenrolled &&  noopacnote && noborrowernotes %]
 	<fieldset class="rows" id="memberentry_subscription">
 	<legend id="library_setup_lgd">Library set-up</legend><ol>
         [% UNLESS nodateenrolled %]
@@ -1077,11 +974,11 @@
             <label for="from">
 			[% END %]
 			Registration date: </label>
-			[% IF ( metric ) %]
+            [% 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" />
-			[% ELSE %]
+            [% ELSE %]
                 <input type="text" id="from" name="dateenrolled"  maxlength="10" size="10" value="[% dateenrolled %]" class="datepickerfrom" />
-			[% END %]
+            [% END %]
 		[% IF ( mandatorydateenrolled ) %]<span class="required">Required</span>[% END %]
 		[% IF ( ERROR_dateenrolled ) %]<span class="required">(Error)</span>[% END %]
 		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
@@ -1089,13 +986,16 @@
         [% END %]
         [% UNLESS nodateexpiry %]
 		<li>
+        [% ELSE %]
+                <li style="display:none">
+        [% END %]
 			[% IF ( mandatorydateexpiry ) %]
             <label for="to" class="required">
 			[% ELSE %]
             <label for="to">
 			[% END %]
 			Expiry date (leave blank for auto calc) </label>
-			[% IF ( metric ) %]
+            [% 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" />
 				[% ELSE %]
@@ -1112,7 +1012,6 @@
 		[% IF ( ERROR_dateexpiry ) %]<span class="required">(Error)</span>[% END %]
 		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
 		</li>
-        [% END %]
         [% UNLESS noopacnote %]
 		<li>
 			[% IF ( mandatoryopacnote ) %]
@@ -1269,7 +1168,6 @@
 			[% 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>
@@ -1287,48 +1185,63 @@
 
             </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">
+                <legend>Patron restrictions</legend>
+
+                [% IF ( debarments.size < 1 ) %]
+                    <p>Patron is currently unrestricted.</p>
+                [% ELSE %]
+                    <table>
+                        <thead>
+                            <tr>
+                                 <th>Type</th>
+                                 <th>Comment</th>
+                                 <th>Expiration</th>
+                                 <th>Remove?</th>
+                            </tr>
+                        </thead>
+
+                        <tbody>
+                            [% FOREACH d IN debarments %]
+                                <tr>
+                                    <td>[% d.type %]</td>
+                                    <td>[% d.comment %]</td>
+                                    <td>[% IF d.expiration %] [% d.expiration | $KohaDates %] [% ELSE %] <i>Indefinite</i> [% END %]</td>
+                                    <td>
+                                        <input type="checkbox" id="debarment_[% d.borrower_debarment_id %]" name="remove_debarment" value="[% d.borrower_debarment_id %]" />
+                                    </td>
+                                </tr>
+                            [% END %]
+                        </tbody>
+                    </table>
+                [% END %]
+                    <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="1" />
+                        <legend>Add manual restriction</legend>
+                        <ol>
+                            <li><label for="debarred_comment">Comment: </label><input type="text" id="debarred_comment" name="debarred_comment" onchange="$('#add_debarment').prop('checked', true);" /></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').prop('checked', true);" />
+                                    <a href='javascript:void(0)' onclick="$('#debarred_expiration').val('');">Clear date</a></li>
+
+                        </ol>
+                        <p>
+                            <a class="cancel" id="cancel_manual_restriction" href="#" onclick="">Cancel</a>
+                        </p>
+                    </fieldset>
+            </fieldset>
 		[% END %]
 
 [% END %]
 
 [% IF ( step_4 ) %][% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
   <fieldset class="rows" id="memberentry_patron_attributes">
-    <input type="hidden" name="setting_extended_patron_attributes" value="1" />
     <legend>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 %]">
@@ -1341,7 +1254,7 @@
                         <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 ) %]
                                         <option value="[% auth_val_loo.authorised_value %]" selected="selected">
@@ -1355,11 +1268,7 @@
                                 [% 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 %]"
@@ -1379,11 +1288,12 @@
 
 [% 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
     -->
-    <script language="javascript" type="text/javascript">//<![CDATA[
+    <script type="text/javascript">//<![CDATA[
        $(document).ready(function(){
             var message_prefs_dirty = false;
             $('#memberentry_messaging_prefs > *').change(function() {
@@ -1402,8 +1312,8 @@
                             var attrid = item.message_attribute_id;
                             var transports = ['email', 'rss', 'sms'];
                             $.each(transports, function(j, transport) {
-                                if (item['transport-' + transport] != ' ') {
-                                    $('#' + transport + attrid).attr('checked', item['transport-' + transport]);
+                                if (item['transports_' + transport] == 1) {
+                                    $('#' + transport + attrid).attr('checked', 'checked');
                                 } else {
                                     $('#' + transport + attrid).removeAttr('checked');
                                 }
@@ -1426,18 +1336,13 @@
     </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 %]
+            <input type="text" id="SMSnumber" name="SMSnumber" value="[% SMSnumber %]" class="[% focusAction %]" />
         </p>
     [% END %]
   </fieldset>