Attachment #61651 for bug #18110

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




[% IF ( address or address2 ) %]
    [% IF ( address ) %]
        <li>
        [% SET roadtype_desc = '' %]
        [% IF streettype %]
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
        [% END %]
        <li>
        [% IF streetnumber %] [% streetnumber %][% END %]
        [%IF roadtype_desc %] [% roadtype_desc %][% END %]
            [% address %]
        </li>
            <li class="patronaddress1">[% address %]
            </li>
    [% END %]
    [% IF ( address2 ) %]
        <li class="patronaddress2">[% address2 %]</li>




<fieldset class="rows" id="memberentry_mainaddress">
    <legend id="main_address_lgd">Main address</legend><ol>
[% UNLESS nostreetnumber %]
    <li>
    [% IF ( mandatorystreetnumber ) %]
        <label for="streetnumber" class="required">
    [% ELSE %]
        <label for="streetnumber">
    [% END %]
        Street number: </label>
        <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
    [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
    </li>
[% END %]
[% UNLESS nostreettype %]
    [% UNLESS nostreetnumber %]
        [% IF ( mandatorystreetnumber ) %]
            <label for="streetnumber" class="required">
        [% ELSE %]
            <label for="streetnumber">
        [% END %]
            Street number: </label>
            <input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
        [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
    [% END %]

    [% IF roadtypes %]
        <li>
        [% IF ( mandatorystreettype ) %]

Lines 140-145 $template->param( Link Here

(-)a/members/member-password.pl (-1 / +1 lines)
140	country => $bor->{'country'},	140	country => $bor->{'country'},
141	phone => $bor->{'phone'},	141	phone => $bor->{'phone'},
142	phonepro => $bor->{'phonepro'},	142	phonepro => $bor->{'phonepro'},
		143	streetnumber => $bor->{'streetnumber'},
143	mobile => $bor->{'mobile'},	144	mobile => $bor->{'mobile'},
144	email => $bor->{'email'},	145	email => $bor->{'email'},
145	emailpro => $bor->{'emailpro'},	146	emailpro => $bor->{'emailpro'},
146	-

Return to bug 18110

Lines 1-15 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc (-3 / +2 lines)
1	[% IF ( address or address2 ) %]	1	[% IF ( address or address2 ) %]
2	[% IF ( address ) %]	2	[% IF ( address ) %]
		3	<li>
3	[% SET roadtype_desc = '' %]	4	[% SET roadtype_desc = '' %]
4	[% IF streettype %]	5	[% IF streettype %]
5	[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]	6	[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', streettype) %]
6	[% END %]	7	[% END %]
7	<li>
8	[% IF streetnumber %] [% streetnumber %][% END %]	8	[% IF streetnumber %] [% streetnumber %][% END %]
9	[%IF roadtype_desc %] [% roadtype_desc %][% END %]	9	[%IF roadtype_desc %] [% roadtype_desc %][% END %]
		10	[% address %]
10	</li>	11	</li>
11	<li class="patronaddress1">[% address %]
12	</li>
13	[% END %]	12	[% END %]
14	[% IF ( address2 ) %]	13	[% IF ( address2 ) %]
15	<li class="patronaddress2">[% address2 %]</li>	14	<li class="patronaddress2">[% address2 %]</li>

Lines 1-18 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style-fr.inc (-12 / +11 lines)
1	<fieldset class="rows" id="memberentry_mainaddress">	1	<fieldset class="rows" id="memberentry_mainaddress">
2	<legend id="main_address_lgd">Main address</legend><ol>	2	<legend id="main_address_lgd">Main address</legend><ol>
3	[% UNLESS nostreetnumber %]
4	<li>
5	[% IF ( mandatorystreetnumber ) %]
6	<label for="streetnumber" class="required">
7	[% ELSE %]
8	<label for="streetnumber">
9	[% END %]
10	Street number: </label>
11	<input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
12	[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
13	</li>
14	[% END %]
15	[% UNLESS nostreettype %]	3	[% UNLESS nostreettype %]
		4	[% UNLESS nostreetnumber %]
		5	[% IF ( mandatorystreetnumber ) %]
		6	<label for="streetnumber" class="required">
		7	[% ELSE %]
		8	<label for="streetnumber">
		9	[% END %]
		10	Street number: </label>
		11	<input type="text" id="streetnumber" name="streetnumber" size="5" value="[% streetnumber %]" />
		12	[% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %]
		13	[% END %]
		14
16	[% IF roadtypes %]	15	[% IF roadtypes %]
17	<li>	16	<li>
18	[% IF ( mandatorystreettype ) %]	17	[% IF ( mandatorystreettype ) %]