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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-5 / +13 lines)
Lines 595-601 Link Here
595
      [% ELSE %]
595
      [% ELSE %]
596
      <label for="phone">
596
      <label for="phone">
597
      [% END %]
597
      [% END %]
598
      Primary phone: </label>
598
      [% IF ( I ) %]
599
      Organization phone: 
600
      [% ELSE %]
601
      Primary phone:
602
      [% END %] </label>
599
      [% IF ( opduplicate ) %]
603
      [% IF ( opduplicate ) %]
600
			<input type="text" id="phone" name="phone" value="[% phone %]" onclick="this.value=''" />
604
			<input type="text" id="phone" name="phone" value="[% phone %]" onclick="this.value=''" />
601
      [% ELSE %]
605
      [% ELSE %]
Lines 605-611 Link Here
605
609
606
    </li>
610
    </li>
607
        [% END %]
611
        [% END %]
608
        [% UNLESS nophonepro %]
612
        [% UNLESS nophonepro || I %]
609
    <li>
613
    <li>
610
      [% IF ( mandatoryphonepro ) %]
614
      [% IF ( mandatoryphonepro ) %]
611
      <label for="phonepro" class="required">
615
      <label for="phonepro" class="required">
Lines 621-627 Link Here
621
	  [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
625
	  [% IF ( mandatoryphonepro ) %]<span class="required">Required</span>[% END %]
622
    </li>
626
    </li>
623
        [% END %]
627
        [% END %]
624
        [% UNLESS nomobile %]
628
        [% UNLESS nomobile || I || P %]
625
    <li>
629
    <li>
626
      [% IF ( mandatorymobile ) %]
630
      [% IF ( mandatorymobile ) %]
627
      <label for="mobile" class="required">
631
      <label for="mobile" class="required">
Lines 644-650 Link Here
644
      [% ELSE %]
648
      [% ELSE %]
645
      <label for="email">
649
      <label for="email">
646
      [% END %]
650
      [% END %]
647
      Primary email: </label>
651
      [% IF ( I ) %]
652
      Organization email: 
653
      [% ELSE %]
654
      Primary email:
655
      [% END %] </label>
648
      [% IF ( opduplicate ) %]
656
      [% IF ( opduplicate ) %]
649
		<input type="text" id="email" name="email" size="45" value="[% email %]" onclick="this.value=''" />
657
		<input type="text" id="email" name="email" size="45" value="[% email %]" onclick="this.value=''" />
650
      [% ELSE %]
658
      [% ELSE %]
Lines 654-660 Link Here
654
662
655
    </li>
663
    </li>
656
        [% END %]
664
        [% END %]
657
        [% UNLESS noemailpro %]
665
        [% UNLESS noemailpro || I %]
658
    <li>
666
    <li>
659
      [% IF ( mandatoryemailpro ) %] 
667
      [% IF ( mandatoryemailpro ) %] 
660
      <label for="emailpro" class="required">
668
      <label for="emailpro" class="required">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt (-9 / +8 lines)
Lines 14-20 Link Here
14
<div class="yui-u first">
14
<div class="yui-u first">
15
	<div id="patron-information" style="padding: .5em;">
15
	<div id="patron-information" style="padding: .5em;">
16
16
17
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
17
     [% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
18
18
19
	<p class="address">[% streetnumber %]
19
	<p class="address">[% streetnumber %]
20
        [% IF ( roaddetails ) %]
20
        [% IF ( roaddetails ) %]
Lines 29-46 Link Here
29
	<div class="rows">
29
	<div class="rows">
30
		<ol>
30
		<ol>
31
        [% IF ( I ) %]
31
        [% IF ( I ) %]
32
            [% IF ( phonepro ) %]<li><span class="label">Organization phone: </span>[% phonepro %]</li>[% END %]
32
            [% IF ( phone ) %]<li><span class="label">Organization phone: </span>[% phone %]</li>[% END %]
33
            [% IF ( emailpro ) %]<li><span class="label">Organization email: </span>[% emailpro %]</li>[% END %]
33
            [% IF ( email ) %]<li><span class="label">Organization email: </span>[% email %]</li>[% END %]
34
        [% ELSIF ( P ) %]
35
			[% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
36
			[% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro %]</li>[% END %]       
34
        [% ELSE %]
37
        [% ELSE %]
35
            [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
38
            [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
36
            [% IF ( mobile ) %]<li><span class="label">Secondary phone: </span>[% mobile %]</li>[% END %]
39
            [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro %]</li>[% END %]
37
            [% IF ( phonepro ) %]<li><span class="label">Other phone: </span>[% phonepro %]</li>[% END %]
40
            [% IF ( mobile ) %]<li><span class="label">Mobile phone: </span>[% mobile %]</li>[% END %]
38
        [% END %]
41
        [% END %]
39
42
40
    [% IF ( P ) %]
41
        [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
42
        [% IF ( mobile ) %]<li><span class="label">Secondary mobile: </span>[% mobile %]</li>[% END %]
43
    [% END %]
44
	[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
43
	[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
45
    [% UNLESS ( I ) %]
44
    [% UNLESS ( I ) %]
46
        [% IF ( email ) %]<li><span class="label">Primary email:</span><a href="mailto:[% email %]">[% email %]</a></li>[% END %]
45
        [% IF ( email ) %]<li><span class="label">Primary email:</span><a href="mailto:[% email %]">[% email %]</a></li>[% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-11 / +10 lines)
Lines 190-196 function validate1(date) { Link Here
190
 <div class="yui-u first">
190
 <div class="yui-u first">
191
<div id="patron-information" style="padding : .5em;">
191
<div id="patron-information" style="padding : .5em;">
192
192
193
     [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
193
     [% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
194
194
195
<p class="address">[% streetnumber %]
195
<p class="address">[% streetnumber %]
196
        [% IF ( roaddetails ) %]
196
        [% IF ( roaddetails ) %]
Lines 206-223 function validate1(date) { Link Here
206
	<div class="rows">
206
	<div class="rows">
207
		<ol>
207
		<ol>
208
        [% IF ( I ) %]
208
        [% IF ( I ) %]
209
            [% IF ( phonepro ) %]<li><span class="label">Organization phone: </span>[% phonepro %]</li>[% END %]
209
            [% IF ( phone ) %]<li><span class="label">Organization phone: </span>[% phone %]</li>[% END %]
210
            [% IF ( emailpro ) %]<li><span class="label">Organization email: </span>[% emailpro %]</li>[% END %]
210
            [% IF ( email ) %]<li><span class="label">Organization email: </span>[% email %]</li>[% END %]
211
        [% ELSIF ( P ) %]
212
			[% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
213
			[% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro %]</li>[% END %]       
211
        [% ELSE %]
214
        [% ELSE %]
212
            [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
215
            [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
213
            [% IF ( mobile ) %]<li><span class="label">Secondary phone: </span>[% mobile %]</li>[% END %]
216
            [% IF ( phonepro ) %]<li><span class="label">Secondary phone: </span>[% phonepro %]</li>[% END %]
214
            [% IF ( phonepro ) %]<li><span class="label">Other phone: </span>[% phonepro %]</li>[% END %]
217
            [% IF ( mobile ) %]<li><span class="label">Mobile phone: </span>[% mobile %]</li>[% END %]
215
        [% END %]
218
        [% END %]
216
219
  	
217
    [% IF ( P ) %]
218
        [% IF ( phone ) %]<li><span class="label">Primary phone: </span>[% phone %]</li>[% END %]
219
        [% IF ( mobile ) %]<li><span class="label">Secondary phone: </span>[% mobile %]</li>[% END %]
220
    [% END %]   	
221
	[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
220
	[% IF ( fax ) %]<li><span class="label">Fax: </span>[% fax %]</li>[% END %]
222
    [% UNLESS ( I ) %]
221
    [% UNLESS ( I ) %]
223
        [% IF ( email ) %]<li><span class="label">Primary email:</span><a href="mailto:[% email %]">[% email %]</a></li>[% END %]
222
        [% IF ( email ) %]<li><span class="label">Primary email:</span><a href="mailto:[% email %]">[% email %]</a></li>[% END %]
Lines 227-233 function validate1(date) { Link Here
227
    [% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth %]</li>[% END %]
226
    [% IF ( dateofbirth ) %]<li><span class="label">Date of birth:</span>[% dateofbirth %]</li>[% END %]
228
    [% IF ( sex ) %]<li><span class="label">Gender:</span>
227
    [% IF ( sex ) %]<li><span class="label">Gender:</span>
229
    [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
228
    [% IF ( sex == 'F' ) %]Female[% ELSIF ( sex == 'M' ) %]Male[% ELSE %][% sex %][% END %]
230
    </li>[% END %][% END %]
229
    </li>[% END %]
231
    [% IF ( printethnicityline ) %]
230
    [% IF ( printethnicityline ) %]
232
    <li><span class="label">Ethnicity:</span>[% ethnicity %]</li>
231
    <li><span class="label">Ethnicity:</span>[% ethnicity %]</li>
233
    <li><span class="label">Ethnicity notes: </span>[% ethnotes %]</li>
232
    <li><span class="label">Ethnicity notes: </span>[% ethnotes %]</li>
(-)a/members/moremember.pl (-1 / +1 lines)
Lines 426-431 $template->param( Link Here
426
    error           => $error,
426
    error           => $error,
427
    StaffMember     => ($category_type eq 'S'),
427
    StaffMember     => ($category_type eq 'S'),
428
    is_child        => ($category_type eq 'C'),
428
    is_child        => ($category_type eq 'C'),
429
    "$category_type"  => 1, #passes category type (e.g. C, A, S, P, I, X) to template like in memberentry.pl
429
#   reserveloop     => \@reservedata,
430
#   reserveloop     => \@reservedata,
430
    dateformat      => C4::Context->preference("dateformat"),
431
    dateformat      => C4::Context->preference("dateformat"),
431
    "dateformat_" . (C4::Context->preference("dateformat") || '') => 1,
432
    "dateformat_" . (C4::Context->preference("dateformat") || '') => 1,
432
- 

Return to bug 9383