View | Details | Raw Unified | Return to bug 6190
Collapse All | Expand All

(-)a/admin/systempreferences.pl (+1 lines)
Lines 223-228 $tabsysprefs{intranetreadinghistory} = "Patrons"; Link Here
223
$tabsysprefs{NotifyBorrowerDeparture}      = "Patrons";
223
$tabsysprefs{NotifyBorrowerDeparture}      = "Patrons";
224
$tabsysprefs{memberofinstitution}          = "Patrons";
224
$tabsysprefs{memberofinstitution}          = "Patrons";
225
$tabsysprefs{BorrowerMandatoryField}       = "Patrons";
225
$tabsysprefs{BorrowerMandatoryField}       = "Patrons";
226
$tabsysprefs{BorrowerUnwantedField}        = "Patrons";
226
$tabsysprefs{borrowerRelationship}         = "Patrons";
227
$tabsysprefs{borrowerRelationship}         = "Patrons";
227
$tabsysprefs{BorrowersTitles}              = "Patrons";
228
$tabsysprefs{BorrowersTitles}              = "Patrons";
228
$tabsysprefs{patronimages}                 = "Patrons";
229
$tabsysprefs{patronimages}                 = "Patrons";
(-)a/installer/data/mysql/en/mandatory/sysprefs.sql (+1 lines)
Lines 20-25 INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES Link Here
20
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoMemberNum',1,'If ON, patron number is auto-calculated','','YesNo');
20
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('autoMemberNum',1,'If ON, patron number is auto-calculated','','YesNo');
21
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BiblioDefaultView','normal','Choose the default detail view in the catalog; choose between normal, marc or isbd','normal|marc|isbd','Choice');
21
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BiblioDefaultView','normal','Choose the default detail view in the catalog; choose between normal, marc or isbd','normal|marc|isbd','Choice');
22
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerMandatoryField','zipcode|surname|cardnumber','Choose the mandatory fields for a patron\'s account',NULL,'free');
22
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerMandatoryField','zipcode|surname|cardnumber','Choose the mandatory fields for a patron\'s account',NULL,'free');
23
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free');
23
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('borrowerRelationship','father|mother','Define valid relationships between a guarantor & a guarantee (separated by | or ,)','','free');
24
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('borrowerRelationship','father|mother','Define valid relationships between a guarantor & a guarantee (separated by | or ,)','','free');
24
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersLog',1,'If ON, log edit/create/delete actions on patron data',NULL,'YesNo');
25
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowersLog',1,'If ON, log edit/create/delete actions on patron data',NULL,'YesNo');
25
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('casAuthentication', '0', 'Enable or disable CAS authentication', '', 'YesNo');
26
INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('casAuthentication', '0', 'Enable or disable CAS authentication', '', 'YesNo');
(-)a/installer/data/mysql/updatedatabase.pl (+7 lines)
Lines 4332-4337 if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { Link Here
4332
    SetVersion($DBversion);
4332
    SetVersion($DBversion);
4333
}
4333
}
4334
4334
4335
$DBversion = "3.05.00.XXX";
4336
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
4337
    $dbh->do("INSERT INTO `systempreferences` (variable,value,explanation,options,type) VALUES('BorrowerUnwantedField','','Name the fields you don\'t need to store for a patron\'s account',NULL,'free')");
4338
    print "Upgrade to $DBversion done (BorrowerUnwantedField syspref)\n";
4339
    SetVersion ($DBversion);
4340
}
4341
4335
=head1 FUNCTIONS
4342
=head1 FUNCTIONS
4336
4343
4337
=head2 DropAllForeignKeys($table)
4344
=head2 DropAllForeignKeys($table)
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref (+5 lines)
Lines 32-37 Patrons: Link Here
32
           class: multi
32
           class: multi
33
         - (separate columns with |)
33
         - (separate columns with |)
34
     -
34
     -
35
         - "The following database columns will not appear on the patron entry screen:"
36
         - pref: BorrowerUnwantedField
37
           class: multi
38
         - (separate columns with |)
39
     -
35
         - "Guarantors can be the following of those they guarantee:"
40
         - "Guarantors can be the following of those they guarantee:"
36
         - pref: borrowerRelationship
41
         - pref: borrowerRelationship
37
           class: multi
42
           class: multi
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/memberentry.tt (+1 lines)
Lines 22-27 Link Here
22
	<li>Enter the identifying information regarding your patron
22
	<li>Enter the identifying information regarding your patron
23
<ul>
23
<ul>
24
	<li>Required fields are defined in the BorrowerMandatoryField system preference</li>
24
	<li>Required fields are defined in the BorrowerMandatoryField system preference</li>
25
	<li>Unwanted fields are defined in the BorrowerUnwantedField system preference</li>
25
	<li>Salutation is populated by the BorrowersTitles system preference</li>
26
	<li>Salutation is populated by the BorrowersTitles system preference</li>
26
</ul>
27
</ul>
27
</li>
28
</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-3 / +106 lines)
Lines 169-174 Link Here
169
		<legend>[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend>
169
		<legend>[% IF ( I ) %]Organization [% ELSE %]Patron [% END %]identity</legend>
170
		<ol>
170
		<ol>
171
		[% UNLESS ( I ) %]
171
		[% UNLESS ( I ) %]
172
        [% UNLESS notitle %]
172
		[% IF ( title_cgipopup ) %]
173
		[% IF ( title_cgipopup ) %]
173
            <li>
174
            <li>
174
            [% IF ( mandatorytitle ) %]
175
            [% IF ( mandatorytitle ) %]
Lines 182-187 Link Here
182
            </li>
183
            </li>
183
		[% END %]
184
		[% END %]
184
        [% END %]
185
        [% END %]
186
		[% END %]
187
        [% UNLESS nosurname %]
185
		<li>
188
		<li>
186
		[% IF ( mandatorysurname ) %]
189
		[% IF ( mandatorysurname ) %]
187
		<label for="surname" class="required">
190
		<label for="surname" class="required">
Lines 196-202 Link Here
196
		[% END %]
199
		[% END %]
197
		[% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %]
200
		[% IF ( mandatorysurname ) %]<span class="required">Required</span>[% END %]
198
		</li>
201
		</li>
202
        [% END %]
199
		[% UNLESS ( I ) %]
203
		[% UNLESS ( I ) %]
204
        [% UNLESS nofirstname %]
200
            <li>
205
            <li>
201
                [% IF ( mandatoryfirstname ) %]
206
                [% IF ( mandatoryfirstname ) %]
202
                <label for="firstname" class="required">
207
                <label for="firstname" class="required">
Lines 207-212 Link Here
207
                <input type="text" id="firstname" name="firstname" size="20"  value="[% IF ( opduplicate ) %][% ELSE %][% firstname %][% END %]" />
212
                <input type="text" id="firstname" name="firstname" size="20"  value="[% IF ( opduplicate ) %][% ELSE %][% firstname %][% END %]" />
208
                [% IF ( mandatoryfirstname ) %]<span class="required">Required</span>[% END %]
213
                [% IF ( mandatoryfirstname ) %]<span class="required">Required</span>[% END %]
209
            </li>
214
            </li>
215
        [% END %]
216
        [% UNLESS nodateofbirth %]
210
            <li>
217
            <li>
211
                [% IF ( mandatorydateofbirth ) %]
218
                [% IF ( mandatorydateofbirth ) %]
212
                <label for="dateofbirth" class="required">
219
                <label for="dateofbirth" class="required">
Lines 235-240 Link Here
235
        [% IF ( ERROR_dateofbirth ) %]<span class="required">(Error)</span>[% END %]
242
        [% IF ( ERROR_dateofbirth ) %]<span class="required">(Error)</span>[% END %]
236
		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
243
		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
237
            </li>
244
            </li>
245
        [% END %]
246
        [% UNLESS noinitials %]
238
            <li>
247
            <li>
239
                [% IF ( mandatoryinitials ) %]
248
                [% IF ( mandatoryinitials ) %]
240
                    <label for="initials" class="required">
249
                    <label for="initials" class="required">
Lines 246-251 Link Here
246
                [% IF ( mandatoryinitials ) %]<span class="required">Required</span>[% END %]
255
                [% IF ( mandatoryinitials ) %]<span class="required">Required</span>[% END %]
247
            </li>
256
            </li>
248
        [% END %]
257
        [% END %]
258
        [% END %]
259
        [% UNLESS noothernames %]
249
		<li>
260
		<li>
250
			[% IF ( mandatoryothernames ) %]
261
			[% IF ( mandatoryothernames ) %]
251
			<label for="othernames" class="required">
262
			<label for="othernames" class="required">
Lines 257-263 Link Here
257
[% IF ( mandatoryothernames ) %]<span class="required">Required</span>[% END %]
268
[% IF ( mandatoryothernames ) %]<span class="required">Required</span>[% END %]
258
		[% IF ( I ) %]<input type="hidden" name="sex" value="N" />[% END %]
269
		[% IF ( I ) %]<input type="hidden" name="sex" value="N" />[% END %]
259
		</li>
270
		</li>
271
        [% END %]
260
    [% UNLESS ( I ) %]
272
    [% UNLESS ( I ) %]
273
        [% UNLESS nosex %]
261
		<li class="radio">
274
		<li class="radio">
262
		
275
		
263
		[% IF ( female ) %]
276
		[% IF ( female ) %]
Lines 276-281 Link Here
276
				<label for="sex-none">N/A </label><input type="radio" name="sex" id="sex-none" value="" />
289
				<label for="sex-none">N/A </label><input type="radio" name="sex" id="sex-none" value="" />
277
[% END %]
290
[% END %]
278
       	</li>
291
       	</li>
292
        [% END %]
279
    [% END %]
293
    [% END %]
280
		</ol>
294
		</ol>
281
	</fieldset>
295
	</fieldset>
Lines 310-315 Link Here
310
 [% END %]
324
 [% END %]
311
     <span class="label">Patron #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid %]</a>[% END %]
325
     <span class="label">Patron #:</span> [% IF ( guarantorid ) %] <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% guarantorid %]" target="blank">[% guarantorid %]</a>[% END %]
312
 </li>
326
 </li>
327
        [% UNLESS nocontactname %]
313
 <li>
328
 <li>
314
     <label for="contactname">Surname: </label>
329
     <label for="contactname">Surname: </label>
315
     [% IF ( guarantorid ) %]
330
     [% IF ( guarantorid ) %]
Lines 319-324 Link Here
319
     <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
334
     <input name="contactname" id="contactname" type="text" size="20" value="[% contactname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
320
     [% END %]
335
     [% END %]
321
 </li>
336
 </li>
337
        [% END %]
338
        [% UNLESS nocontactfirstname %]
322
 <li>
339
 <li>
323
     <label for="contactfirstname">First name: </label>
340
     <label for="contactfirstname">First name: </label>
324
     [% IF ( guarantorid ) %]
341
     [% IF ( guarantorid ) %]
Lines 328-333 Link Here
328
     <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
345
     <input name="contactfirstname" id="contactfirstname" type="text" size="20" value="[% contactfirstname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
329
     [% END %]
346
     [% END %]
330
 </li>
347
 </li>
348
        [% END %]
331
 [% IF ( relshiploop ) %]
349
 [% IF ( relshiploop ) %]
332
 <li>
350
 <li>
333
     <label for="relationship">Relationship: </label>
351
     <label for="relationship">Relationship: </label>
Lines 359-364 Link Here
359
[% END %]
377
[% END %]
360
<fieldset class="rows">
378
<fieldset class="rows">
361
    <legend>Main address</legend><ol>
379
    <legend>Main address</legend><ol>
380
        [% UNLESS nostreetnumber %]
362
    <li>
381
    <li>
363
      [% IF ( mandatorystreetnumber ) %]
382
      [% IF ( mandatorystreetnumber ) %]
364
      <label for="streetnumber" class="required">
383
      <label for="streetnumber" class="required">
Lines 369-374 Link Here
369
      <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
388
      <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
370
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
389
[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
371
    </li>
390
    </li>
391
        [% END %]
392
        [% UNLESS nostreettype %]
372
    [% IF ( road_cgipopup ) %]
393
    [% IF ( road_cgipopup ) %]
373
      <li>
394
      <li>
374
      [% IF ( mandatorystreettype ) %]
395
      [% IF ( mandatorystreettype ) %]
Lines 381-386 Link Here
381
	  [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
402
	  [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %]
382
      </li>
403
      </li>
383
    [% END %] 
404
    [% END %] 
405
        [% END %]
406
        [% UNLESS noaddress %]
384
    <li>
407
    <li>
385
      [% IF ( mandatoryaddress ) %]
408
      [% IF ( mandatoryaddress ) %]
386
      <label for="address" class="required">
409
      <label for="address" class="required">
Lines 391-396 Link Here
391
      <input type="text" id="address" name="address" size="35" value="[% address %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
414
      <input type="text" id="address" name="address" size="35" value="[% address %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
392
	  [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
415
	  [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %]
393
    </li>
416
    </li>
417
        [% END %]
418
        [% UNLESS noaddress2 %]
394
    <li>
419
    <li>
395
      [% IF ( mandatoryaddress2 ) %]
420
      [% IF ( mandatoryaddress2 ) %]
396
      <label for="address2" class="required">
421
      <label for="address2" class="required">
Lines 401-406 Link Here
401
      <input type="text" id="address2" name="address2" size="35" value="[% address2 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
426
      <input type="text" id="address2" name="address2" size="35" value="[% address2 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
402
	  [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
427
	  [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %]
403
    </li>  
428
    </li>  
429
        [% END %]
430
        [% UNLESS nocity %]
404
    <li>
431
    <li>
405
      [% IF ( mandatorycity ) %]
432
      [% IF ( mandatorycity ) %]
406
        <label for="city" class="required">
433
        <label for="city" class="required">
Lines 425-430 Link Here
425
        [% END %]
452
        [% END %]
426
	  [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
453
	  [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %]
427
    </li>
454
    </li>
455
        [% END %]
456
        [% UNLESS nostate %]
428
    <li> 
457
    <li> 
429
      [% IF ( mandatorystate ) %]
458
      [% IF ( mandatorystate ) %]
430
        <label for="state" class="required">
459
        <label for="state" class="required">
Lines 435-440 Link Here
435
      <input type="text" name="state" id="state" size="20" value="[% state %]" />
464
      <input type="text" name="state" id="state" size="20" value="[% state %]" />
436
	  [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
465
	  [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %]
437
    </li>
466
    </li>
467
        [% END %]
468
        [% UNLESS nozipcode %]
438
    <li> 
469
    <li> 
439
      [% IF ( mandatoryzipcode ) %]
470
      [% IF ( mandatoryzipcode ) %]
440
        <label for="zipcode" class="required">
471
        <label for="zipcode" class="required">
Lines 445-451 Link Here
445
      <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
476
      <input type="text" name="zipcode" id="zipcode" size="10" value="[% zipcode %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
446
	  [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
477
	  [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %]
447
    </li>
478
    </li>
448
    
479
        [% END %]
480
        [% UNLESS nocountry %]
449
    <li> 
481
    <li> 
450
      [% IF ( mandatorycountry ) %]
482
      [% IF ( mandatorycountry ) %]
451
        <label for="country" class="required">
483
        <label for="country" class="required">
Lines 456-466 Link Here
456
      <input type="text" name="country" id="country" size="20" value="[% country %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
488
      <input type="text" name="country" id="country" size="20" value="[% country %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
457
	  [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
489
	  [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %]
458
    </li>    
490
    </li>    
459
  
491
        [% END %]
460
	</ol>
492
	</ol>
461
    </fieldset>
493
    </fieldset>
462
  <fieldset class="rows" id="memberentry_contact">
494
  <fieldset class="rows" id="memberentry_contact">
463
    <legend>Contact</legend><ol>
495
    <legend>Contact</legend><ol>
496
        [% UNLESS nophone %]
464
      <li>
497
      <li>
465
      [% IF ( mandatoryphone ) %] 
498
      [% IF ( mandatoryphone ) %] 
466
      <label for="phone" class="required">
499
      <label for="phone" class="required">
Lines 472-477 Link Here
472
	  [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
505
	  [% IF ( mandatoryphone ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
473
506
474
    </li>
507
    </li>
508
        [% END %]
509
        [% UNLESS nophonepro %]
475
    <li>
510
    <li>
476
      [% IF ( mandatoryphonepro ) %]
511
      [% IF ( mandatoryphonepro ) %]
477
      <label for="phonepro" class="required">
512
      <label for="phonepro" class="required">
Lines 482-487 Link Here
482
      <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
517
      <input type="text" id="phonepro" name="phonepro" value="[% phonepro %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
483
	  [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
518
	  [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
484
    </li>
519
    </li>
520
        [% END %]
521
        [% UNLESS nomobile %]
485
    <li>
522
    <li>
486
      [% IF ( mandatorymobile ) %]
523
      [% IF ( mandatorymobile ) %]
487
      <label for="mobile" class="required">
524
      <label for="mobile" class="required">
Lines 492-497 Link Here
492
      <input type="text" id="mobile" name="mobile" value="[% mobile %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
529
      <input type="text" id="mobile" name="mobile" value="[% mobile %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
493
	  [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
530
	  [% IF ( mandatorymobile ) %]<span class="required">Required</span>[% END %]
494
    </li>
531
    </li>
532
        [% END %]
533
        [% UNLESS noemail %]
495
    <li>
534
    <li>
496
      [% IF ( mandatoryemail ) %]
535
      [% IF ( mandatoryemail ) %]
497
      <label for="email" class="required">
536
      <label for="email" class="required">
Lines 503-508 Link Here
503
	  [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
542
	  [% IF ( mandatoryemail ) %]<span class="required">Required</span>[% END %]<div class="hint">Shows on transit slips</div>
504
543
505
    </li>
544
    </li>
545
        [% END %]
546
        [% UNLESS noemailpro %]
506
    <li>
547
    <li>
507
      [% IF ( mandatoryemailpro ) %] 
548
      [% IF ( mandatoryemailpro ) %] 
508
      <label for="emailpro" class="required">
549
      <label for="emailpro" class="required">
Lines 513-518 Link Here
513
      <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
554
      <input type="text" id="emailpro" name="emailpro" size="45" value="[% emailpro %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
514
	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
555
	  [% IF ( mandatoryemailpro ) %]<span class="required">Required</span>[% END %]
515
    </li>
556
    </li>
557
        [% END %]
558
        [% UNLESS nofax %]
516
    <li>
559
    <li>
517
      [% IF ( mandatoryfax ) %]
560
      [% IF ( mandatoryfax ) %]
518
      <label for="fax" class="required">
561
      <label for="fax" class="required">
Lines 523-528 Link Here
523
      <input type="text" id="fax" name="fax" value="[% fax %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
566
      <input type="text" id="fax" name="fax" value="[% fax %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
524
	  [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
567
	  [% IF ( mandatoryfax ) %]<span class="required">Required</span>[% END %]
525
    </li>
568
    </li>
569
        [% END %]
526
	</ol>
570
	</ol>
527
  </fieldset>
571
  </fieldset>
528
572
Lines 531-538 Link Here
531
[% END %]
575
[% END %]
532
[% IF ( step_6 ) %]
576
[% IF ( step_6 ) %]
533
577
578
    [% UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
534
		<fieldset class="rows" id="memberentry_address">
579
		<fieldset class="rows" id="memberentry_address">
535
		<legend>Alternate address</legend><ol>
580
		<legend>Alternate address</legend><ol>
581
        [% UNLESS noB_address %]
536
			<li>
582
			<li>
537
				[% IF ( mandatoryB_address ) %]
583
				[% IF ( mandatoryB_address ) %]
538
					<label for="B_address" class="required">
584
					<label for="B_address" class="required">
Lines 543-548 Link Here
543
				<input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
589
				<input type="text" id="B_address" name="B_address" size="40" value="[% B_address %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
544
	  [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
590
	  [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %]
545
			</li>
591
			</li>
592
        [% END %]
593
        [% UNLESS noB_address2 %]
546
			<li>
594
			<li>
547
				[% IF ( mandatoryB_address2 ) %]
595
				[% IF ( mandatoryB_address2 ) %]
548
					<label for="B_address2" class="required">
596
					<label for="B_address2" class="required">
Lines 553-558 Link Here
553
				<input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
601
				<input type="text" id="B_address2" name="B_address2" size="40" value="[% B_address2 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
554
	  [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
602
	  [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %]
555
			</li>
603
			</li>
604
        [% END %]
605
        [% UNLESS noB_city %]
556
			<li>
606
			<li>
557
				[% IF ( mandatoryB_city ) %]
607
				[% IF ( mandatoryB_city ) %]
558
					<label for="B_city" class="required" >
608
					<label for="B_city" class="required" >
Lines 563-568 Link Here
563
				<input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
613
				<input type="text" id="B_city" name="B_city" size="20" value="[% B_city %]" />
564
	  [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
614
	  [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %]
565
			</li>
615
			</li>
616
        [% END %]
617
        [% UNLESS noB_state %]
566
			<li>
618
			<li>
567
				[% IF ( mandatoryB_state ) %]
619
				[% IF ( mandatoryB_state ) %]
568
					<label for="B_state" class="required" >
620
					<label for="B_state" class="required" >
Lines 573-578 Link Here
573
				<input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
625
				<input type="text" id="B_state" name="B_state" size="20" value="[% B_state %]" />
574
	  [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
626
	  [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %]
575
			</li>
627
			</li>
628
        [% END %]
629
        [% UNLESS noB_zipcode %]
576
			<li>
630
			<li>
577
				[% IF ( mandatoryB_zipcode ) %]
631
				[% IF ( mandatoryB_zipcode ) %]
578
					<label for="B_zipcode" class="required">
632
					<label for="B_zipcode" class="required">
Lines 583-588 Link Here
583
				<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
637
				<input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% B_zipcode %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
584
	  [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
638
	  [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %]
585
			</li>
639
			</li>
640
        [% END %]
641
        [% UNLESS noB_country %]
586
			<li>
642
			<li>
587
				[% IF ( mandatoryB_country ) %]
643
				[% IF ( mandatoryB_country ) %]
588
					<label for="B_country" class="required">
644
					<label for="B_country" class="required">
Lines 593-598 Link Here
593
				<input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
649
				<input type="text" id="B_country" name="B_country" size="20" value="[% B_country %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
594
	  [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
650
	  [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %]
595
			</li>
651
			</li>
652
        [% END %]
653
        [% UNLESS noB_phone %]
596
            <li>
654
            <li>
597
                [% IF ( mandatoryB_phone ) %]
655
                [% IF ( mandatoryB_phone ) %]
598
                <label for="B_phone" class="required">
656
                <label for="B_phone" class="required">
Lines 603-608 Link Here
603
                <input type="text" id="B_phone" name="B_phone" value="[% B_phone %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
661
                <input type="text" id="B_phone" name="B_phone" value="[% B_phone %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
604
                [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
662
                [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %]
605
            </li>
663
            </li>
664
        [% END %]
665
        [% UNLESS noB_email %]
606
			<li> 
666
			<li> 
607
        [% IF ( mandatoryB_email ) %]
667
        [% IF ( mandatoryB_email ) %]
608
          <label for="B_email" class="required">
668
          <label for="B_email" class="required">
Lines 612-617 Link Here
612
        Email: </label>
672
        Email: </label>
613
        <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
673
        <input type="text" id="B_email" name="B_email" size="45" value="[% B_email %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
614
		[% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
674
		[% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] </li>
675
        [% END %]
676
        [% UNLESS nocontactnote %]
615
            <li>
677
            <li>
616
                [% IF ( mandatorycontactnote ) %]
678
                [% IF ( mandatorycontactnote ) %]
617
                <label for="contactnote" class="required">
679
                <label for="contactnote" class="required">
Lines 622-633 Link Here
622
                <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea>
684
                <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% contactnote %]</textarea>
623
        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
685
        [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %]
624
            </li>
686
            </li>
687
        [% END %]
625
			</ol>
688
			</ol>
626
		</fieldset>
689
		</fieldset>
690
    [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
627
[% END %]		
691
[% END %]		
628
[% IF ( step_2 ) %]
692
[% IF ( step_2 ) %]
693
    [% UNLESS noaltcontactsurname && noaltcontactfirstname %]
629
		<fieldset class="rows" id="memberentry_altaddress">       
694
		<fieldset class="rows" id="memberentry_altaddress">       
630
		    <legend>Alternate Contact</legend><ol>
695
		    <legend>Alternate Contact</legend><ol>
696
        [% UNLESS noaltcontactsurname %]
631
			<li>
697
			<li>
632
			    [% IF ( mandatoryaltcontactsurname ) %]
698
			    [% IF ( mandatoryaltcontactsurname ) %]
633
				<label for="altcontactsurname" class="required">
699
				<label for="altcontactsurname" class="required">
Lines 638-643 Link Here
638
				<input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
704
				<input type="text" name="altcontactsurname" id="altcontactsurname" value="[% altcontactsurname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
639
				[% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
705
				[% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %]
640
			</li>
706
			</li>
707
        [% END %]
708
        [% UNLESS noaltcontactfirstname %]
641
			<li>
709
			<li>
642
			    [% IF ( mandatoryaltcontactfirstname ) %]
710
			    [% IF ( mandatoryaltcontactfirstname ) %]
643
				<label for="altcontactfirstname" class="required">
711
				<label for="altcontactfirstname" class="required">
Lines 648-653 Link Here
648
				<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
716
				<input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% altcontactfirstname %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
649
				[% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
717
				[% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %]
650
			</li>
718
			</li>
719
        [% END %]
720
        [% UNLESS noaltcontactaddress1 %]
651
			<li>
721
			<li>
652
			    [% IF ( mandatoryaltcontactaddress1 ) %]
722
			    [% IF ( mandatoryaltcontactaddress1 ) %]
653
				<label for="altcontactaddress1" class="required">
723
				<label for="altcontactaddress1" class="required">
Lines 658-663 Link Here
658
				<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="40" />
728
				<input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% altcontactaddress1 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="40" />
659
				[% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
729
				[% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %]
660
			</li>
730
			</li>
731
        [% END %]
732
        [% UNLESS noaltcontactaddress2 %]
661
			<li>
733
			<li>
662
			    [% IF ( mandatoryaltcontactaddress2 ) %]
734
			    [% IF ( mandatoryaltcontactaddress2 ) %]
663
				<label for="altcontactaddress2" class="required">
735
				<label for="altcontactaddress2" class="required">
Lines 668-673 Link Here
668
				<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="40" />
740
				<input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% altcontactaddress2 %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="40" />
669
				[% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
741
				[% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %]
670
			</li>
742
			</li>
743
        [% END %]
744
        [% UNLESS noaltcontactaddress3 %]
671
			<li>
745
			<li>
672
			    [% IF ( mandatoryaltcontactaddress3 ) %]
746
			    [% IF ( mandatoryaltcontactaddress3 ) %]
673
				<label for="altcontactaddress3" class="required">
747
				<label for="altcontactaddress3" class="required">
Lines 678-683 Link Here
678
				<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
752
				<input type="text" name="altcontactaddress3" id="altcontactaddress3" value="[% altcontactaddress3 %]" size="20" />
679
				[% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
753
				[% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %]
680
			</li>
754
			</li>
755
        [% END %]
756
        [% UNLESS noaltcontactstate %]
681
			<li>
757
			<li>
682
			    [% IF ( mandatoryaltcontactstate ) %]
758
			    [% IF ( mandatoryaltcontactstate ) %]
683
				<label for="altcontactstate" class="required">
759
				<label for="altcontactstate" class="required">
Lines 688-693 Link Here
688
				<input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
764
				<input type="text" name="altcontactstate" id="altcontactstate" value="[% altcontactstate %]" size="20" />
689
				[% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
765
				[% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %]
690
			</li>
766
			</li>
767
        [% END %]
768
        [% UNLESS noaltcontactzipcode %]
691
			<li>
769
			<li>
692
			    [% IF ( mandatoryaltcontactzipcode ) %]
770
			    [% IF ( mandatoryaltcontactzipcode ) %]
693
				<label for="altcontactzipcode" class="required">
771
				<label for="altcontactzipcode" class="required">
Lines 698-703 Link Here
698
				<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="5" />
776
				<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% altcontactzipcode %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="5" />
699
				[% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
777
				[% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %]
700
			</li>
778
			</li>
779
        [% END %]
780
        [% UNLESS noaltcontactcountry %]
701
			<li>
781
			<li>
702
			    [% IF ( mandatoryaltcontactcountry ) %]
782
			    [% IF ( mandatoryaltcontactcountry ) %]
703
				<label for="altcontactcountry" class="required">
783
				<label for="altcontactcountry" class="required">
Lines 708-713 Link Here
708
				<input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="20" />
788
				<input type="text" name="altcontactcountry" id="altcontactcountry" value="[% altcontactcountry %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] size="20" />
709
				[% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
789
				[% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %]
710
			</li>			
790
			</li>			
791
        [% END %]
792
        [% UNLESS noaltcontactphone %]
711
			<li>
793
			<li>
712
			    [% IF ( mandatoryaltcontactphone ) %]
794
			    [% IF ( mandatoryaltcontactphone ) %]
713
				<label for="altcontactphone" class="required">
795
				<label for="altcontactphone" class="required">
Lines 718-725 Link Here
718
				<input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
800
				<input type="text" name="altcontactphone" id="altcontactphone" value="[% altcontactphone %]"[% IF ( opduplicate ) %] onclick="this.value=''"[% END %] />
719
				[% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
801
				[% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %]
720
			</li>
802
			</li>
803
        [% END %]
721
            </ol>
804
            </ol>
722
        </fieldset>
805
        </fieldset>
806
    [% END # UNLESS noaltcontactsurname && noaltcontactfirstname %]
723
807
724
808
725
  [% IF ( I ) %]
809
  [% IF ( I ) %]
Lines 746-751 Link Here
746
830
747
  <fieldset class="rows" id="memberentry_library_management">
831
  <fieldset class="rows" id="memberentry_library_management">
748
    <legend>Library Management</legend><ol>
832
    <legend>Library Management</legend><ol>
833
        [% UNLESS nocardnumber %]
749
   <li> [% IF ( mandatorycardnumber ) %]
834
   <li> [% IF ( mandatorycardnumber ) %]
750
      <label for="cardnumber" class="required">
835
      <label for="cardnumber" class="required">
751
    [% ELSE %]
836
    [% ELSE %]
Lines 754-759 Link Here
754
    Card number: </label>
839
    Card number: </label>
755
    <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% IF ( opduplicate ) %][% ELSE %][% cardnumber %][% END %]" />
840
    <input type="text" id="cardnumber" name="cardnumber" size="20" value="[% IF ( opduplicate ) %][% ELSE %][% cardnumber %][% END %]" />
756
	  [% IF ( mandatorycardnumber ) %]<span class="required">Required</span>[% END %]</li>
841
	  [% IF ( mandatorycardnumber ) %]<span class="required">Required</span>[% END %]</li>
842
        [% END %]
843
        [% UNLESS nobranchcode %]
757
    <li>
844
    <li>
758
      [% IF ( mandatorybranchcode ) %]
845
      [% IF ( mandatorybranchcode ) %]
759
        <label for="branchcode" class="required">
846
        <label for="branchcode" class="required">
Lines 764-769 Link Here
764
      [% CGIbranch %]
851
      [% CGIbranch %]
765
	  [% IF ( mandatorybranchcode ) %]<span class="required">Required</span>[% END %]
852
	  [% IF ( mandatorybranchcode ) %]<span class="required">Required</span>[% END %]
766
    </li>
853
    </li>
854
        [% END %]
767
    <li>
855
    <li>
768
        <label for="categorycode">Category: </label>
856
        <label for="categorycode">Category: </label>
769
        <select id="categorycode" name="categorycode">
857
        <select id="categorycode" name="categorycode">
Lines 789-794 Link Here
789
       [% END %]
877
       [% END %]
790
       </select>
878
       </select>
791
    </li>
879
    </li>
880
        [% UNLESS nosort1 %]
792
    <li>
881
    <li>
793
      [% IF ( mandatorysort1 ) %]
882
      [% IF ( mandatorysort1 ) %]
794
        <label for="sort1" class="required">
883
        <label for="sort1" class="required">
Lines 803-808 Link Here
803
	  [% IF ( mandatorysort1 ) %]<span class="required">Required</span>[% END %]
892
	  [% IF ( mandatorysort1 ) %]<span class="required">Required</span>[% END %]
804
      [% END %]   
893
      [% END %]   
805
    </li>
894
    </li>
895
        [% END %]
896
        [% UNLESS nosort2 %]
806
    <li>
897
    <li>
807
    [% IF ( mandatorysort2 ) %]
898
    [% IF ( mandatorysort2 ) %]
808
    <label for="sort2" class="required">
899
    <label for="sort2" class="required">
Lines 817-826 Link Here
817
	  [% IF ( mandatorysort2 ) %]<span class="required">Required</span>[% END %]
908
	  [% IF ( mandatorysort2 ) %]<span class="required">Required</span>[% END %]
818
    [% END %] 
909
    [% END %] 
819
    </li>
910
    </li>
911
        [% END %]
820
	</ol>
912
	</ol>
821
  </fieldset>
913
  </fieldset>
822
	<fieldset class="rows" id="memberentry_subscription">
914
	<fieldset class="rows" id="memberentry_subscription">
823
	<legend>Library set-up</legend><ol>
915
	<legend>Library set-up</legend><ol>
916
        [% UNLESS nodateenrolled %]
824
		<li>
917
		<li>
825
			[% IF ( mandatorydateenrolled ) %]
918
			[% IF ( mandatorydateenrolled ) %]
826
			<label for="dateenrolled" class="required">
919
			<label for="dateenrolled" class="required">
Lines 843-848 Link Here
843
		[% IF ( ERROR_dateenrolled ) %]<span class="required">(Error)</span>[% END %]
936
		[% IF ( ERROR_dateenrolled ) %]<span class="required">(Error)</span>[% END %]
844
		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
937
		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
845
		</li>
938
		</li>
939
        [% END %]
940
        [% UNLESS nodateexpiry %]
846
		<li>
941
		<li>
847
			[% IF ( mandatorydateexpiry ) %]
942
			[% IF ( mandatorydateexpiry ) %]
848
			<label for="dateexpiry" class="required">
943
			<label for="dateexpiry" class="required">
Lines 865-870 Link Here
865
		[% IF ( ERROR_dateexpiry ) %]<span class="required">(Error)</span>[% END %]
960
		[% IF ( ERROR_dateexpiry ) %]<span class="required">(Error)</span>[% END %]
866
		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
961
		<div class="hint">[% INCLUDE 'date-format.inc' %]</div>
867
		</li>
962
		</li>
963
        [% END %]
964
        [% UNLESS noopacnote %]
868
		<li>
965
		<li>
869
			[% IF ( mandatoryopacnote ) %]
966
			[% IF ( mandatoryopacnote ) %]
870
				<label for="opacnote" class="required">
967
				<label for="opacnote" class="required">
Lines 876-881 Link Here
876
			<div class="hint">This message appears on this patron's user page in the OPAC</div>
973
			<div class="hint">This message appears on this patron's user page in the OPAC</div>
877
	  [% IF ( mandatoryopacnote ) %]<span class="required">Required</span>[% END %]
974
	  [% IF ( mandatoryopacnote ) %]<span class="required">Required</span>[% END %]
878
		</li>
975
		</li>
976
        [% END %]
977
        [% UNLESS noborrowernotes %]
879
		<li>
978
		<li>
880
			[% IF ( mandatoryborrowernotes ) %]	
979
			[% IF ( mandatoryborrowernotes ) %]	
881
				<label for="borrowernotes" class="required">
980
				<label for="borrowernotes" class="required">
Lines 887-896 Link Here
887
			<div class="hint">This message displays when checking out to this patron</div>
986
			<div class="hint">This message displays when checking out to this patron</div>
888
	  [% IF ( mandatoryborrowernotes ) %]<span class="required">Required</span>[% END %]
987
	  [% IF ( mandatoryborrowernotes ) %]<span class="required">Required</span>[% END %]
889
		</li>
988
		</li>
989
        [% END %]
890
		</ol>
990
		</ol>
891
	</fieldset>
991
	</fieldset>
892
	<fieldset class="rows" id="memberentry_userid">
992
	<fieldset class="rows" id="memberentry_userid">
893
		<legend>OPAC login</legend><ol>
993
		<legend>OPAC login</legend><ol>
994
        [% UNLESS nouserid %]
894
		<li>
995
		<li>
895
			[% IF ( mandatoryuserid ) %]
996
			[% IF ( mandatoryuserid ) %]
896
			<label for="userid" class="required">
997
			<label for="userid" class="required">
Lines 937-943 Link Here
937
			[% END %]
1038
			[% END %]
938
	  [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_short_password ) %]<span class="required">Password is too short</span>[% END %]
1039
	  [% IF ( mandatorypassword ) %]<span class="required">Required</span>[% END %][% IF ( ERROR_short_password ) %]<span class="required">Password is too short</span>[% END %]
939
[% IF ( minPasswordLength ) %]<div class="hint">Minimum password length: [% minPasswordLength %]</div>[% END %]
1040
[% IF ( minPasswordLength ) %]<div class="hint">Minimum password length: [% minPasswordLength %]</div>[% END %]
940
		</li></ol>
1041
		</li>
1042
        [% END %]
1043
    </ol>
941
		</fieldset>
1044
		</fieldset>
942
		<!--this zones are not necessary in modif mode -->
1045
		<!--this zones are not necessary in modif mode -->
943
		[% UNLESS ( opadd ) %]
1046
		[% UNLESS ( opadd ) %]
(-)a/members/memberentry.pl (-1 / +7 lines)
Lines 100-105 my @field_check=split(/\|/,$check_BorrowerMandatoryField); Link Here
100
foreach (@field_check) {
100
foreach (@field_check) {
101
	$template->param( "mandatory$_" => 1);    
101
	$template->param( "mandatory$_" => 1);    
102
}
102
}
103
# function to designate unwanted fields
104
my $check_BorrowerUnwantedField=C4::Context->preference("BorrowerUnwantedField");
105
@field_check=split(/\|/,$check_BorrowerUnwantedField);
106
foreach (@field_check) {
107
    next unless m/\w/o;
108
	$template->param( "no$_" => 1);    
109
}
103
$template->param( "add" => 1 ) if ( $op eq 'add' );
110
$template->param( "add" => 1 ) if ( $op eq 'add' );
104
$template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' );
111
$template->param( "duplicate" => 1 ) if ( $op eq 'duplicate' );
105
$template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 );
112
$template->param( "checked" => 1 ) if ( defined($nodouble) && $nodouble eq 1 );
106
- 

Return to bug 6190