Bug 21222: (bug 20226 follow-up) Fix patron creation

[koha.git] / koha-tmpl / intranet-tmpl / prog / en / modules / members / memberentrygen.tt

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 607217a..695b1e2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -1,9 +1,20 @@
+[% 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 patron %][% patron.category.description %][% 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 %] [% END %]
+        [% IF (surname) %][% surname %] [% END %]
+        ([%IF categoryname %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])
+    [% END %]
+</title>
 [% INCLUDE 'doc-head-close.inc' %]
 </head>
 
@@ -11,15 +22,19 @@
 [% 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 | html %] [% END %][% IF (surname) %][% surname | html %] [% END %]</a>  &rsaquo;[% END %]
+<div id="breadcrumbs">
+    <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>
+    [% UNLESS blocking_error %]
+    &rsaquo;[% IF (firstname || surname ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% borrowernumber %]">[% IF (firstname) %][% firstname | html %] [% END %][% IF (surname) %][% surname | html %] [% END %]</a>  &rsaquo;[% END %]
 <strong>[% IF ( opadd ) %]Add[% ELSIF ( opduplicate ) %]Duplicate[% ELSE %] Modify[% END %] patron ([%IF ( categoryname ) %][% categoryname %][% ELSE %][% IF ( I ) %]Organization[% END %][% IF ( A ) %]Adult[% END %][% IF ( C ) %]Child[% END %][% IF ( P ) %]Professional[% END %][% IF ( S ) %]Staff[% END %][% END %])</strong>
+    [% END %]
 </div>
 [% IF ( opadd ) %]<div id="doc" class="yui-t7">[% ELSE %]<div id="doc3" class="yui-t2">[% END %]
 
    <div id="bd">
        <div id="yui-main">
        <div class="yui-b">
+    [% INCLUDE 'blocking_errors.inc' %]
     [% IF error_alert %]
         [% IF ( error_alert == "no_email" ) %]
             <div class="error">This member has no email</div>
@@ -146,7 +161,7 @@
 <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 %]" />
@@ -186,12 +201,20 @@
                [% 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 %]" />
                [% ELSE %]
@@ -967,7 +990,7 @@
 
 [% END %]
 
-[% IF ( step_4 ) %]
+[% IF ( step_7 ) %]
 [% IF Koha.Preference('HouseboundModule') %]
   <fieldset class="rows" id="memberentry_housebound_roles">
     <legend id="housebound_roles">Housebound roles</legend>
@@ -1017,6 +1040,9 @@
     </ol>
   </fieldset>
 [% END # hide fieldset %]
+[% END # IF step_7 %]
+
+[% IF ( step_4 ) %]
 [% IF ( ExtendedPatronAttributes ) %][% UNLESS ( no_patron_attribute_types ) %]
   <fieldset class="rows" id="memberentry_patron_attributes">
     <legend id="patron_attributes_lgd">Additional attributes and identifiers</legend>
@@ -1155,8 +1181,10 @@
 </div>
 
 [% MACRO jsinclude BLOCK %]
-    <script type="text/javascript" src="[% interface %]/lib/jquery/plugins/jquery.fixFloat_[% KOHA_VERSION %].js"></script>
+    [% Asset.js("lib/jquery/plugins/jquery.fixFloat.js") %]
     [% INCLUDE 'calendar.inc' %]
+    [% INCLUDE 'str/members-menu.inc' %]
+    [% Asset.js("js/members-menu.js") %]
     <script type="text/javascript">
         $(document).ready(function() {
 
@@ -1244,20 +1272,6 @@
                 else {return false;}
             });
 
-            $("#entryform").validate({
-                rules: {
-                    password: {
-                        required: true,
-                        password_strong: true,
-                        password_no_spaces: true
-                    },
-                    password2: {
-                        required: true,
-                        password_match: true
-                    }
-                }
-            });
-
             $("#saverecord").click(function(){
                 if( check_form_borrowers() ){
                     $("#entryform").submit();
@@ -1327,8 +1341,8 @@
         [% END %]
 
     </script>
-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/members_[% KOHA_VERSION %].js"></script>
-    <script type="text/javascript" src="[% interface %]/[% theme %]/js/messaging-preference-form_[% KOHA_VERSION %].js"></script>
+    [% Asset.js("js/members.js") %]
+    [% Asset.js("js/messaging-preference-form.js") %]
 [% END %]
 
 [% INCLUDE 'intranet-bottom.inc' %]