Bug 10861: (follow-up) various refactoring

[koha_fer] / 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 8bceeb4..0f28cef 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt
@@ -178,8 +178,11 @@
                        [% IF ( ERROR_login_exist ) %]
                                <li id="ERROR_login_exist">Username/password already exists.</li>
                        [% END %]
-            [% IF ( ERROR_cardnumber ) %]
-                <li id="ERROR_cardnumber">Cardnumber already in use or not in a good format.</li>
+            [% IF ERROR_cardnumber_already_exists %]
+                <li id="ERROR_cardnumber">Cardnumber already in use.</li>
+            [% END %]
+            [% IF ERROR_cardnumber_length %]
+                <li id="ERROR_cardnumber">Cardnumber length is incorrect.</li>
             [% END %]
                        [% IF ( ERROR_age_limitations ) %]
                                <li id="ERROR_age_limitations">Patron's age is incorrect for their category.  
@@ -894,10 +897,12 @@
             <label for="cardnumber">
           [% END %]
           Card number: </label>
-          [% IF minlength_cardnumber && maxlength_cardnumber %]
+          [% IF minlength_cardnumber == maxlength_cardnumber %]
+              <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" pattern=".{[% minlength_cardnumber %]}" title="Exactly [% minlength_cardnumber %] characters" />
+          [% ELSIF minlength_cardnumber && maxlength_cardnumber %]
               <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" pattern=".{[% minlength_cardnumber %],[% maxlength_cardnumber %]}" title="between [% minlength_cardnumber %] and [% maxlength_cardnumber %] characters" />
           [% ELSE %]
-              <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" />
+               <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% cardnumber %]" />
           [% END %]
           [% IF ( mandatorycardnumber ) %]<span class="required">Required</span>[% END %]
         </li>