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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-9 / +11 lines)
Lines 12-30 Link Here
12
<li><img src="/intranet-tmpl/prog/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
12
<li><img src="/intranet-tmpl/prog/img/patron-blank.png" alt="[% firstname %] [% surname %] ([% cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
13
[% END %]
13
[% END %]
14
[% END %]
14
[% END %]
15
    <li>[% IF ( address ) %]
15
    [% IF ( address or address2 ) %]
16
            [% address %]
16
        [% IF ( address ) %]
17
            <li>[% address %]</li>
18
        [% END %]
19
        [% IF ( address2 ) %]
20
            <li>[% address2 %]</li>
21
        [% END %]
17
    [% ELSE %]
22
    [% ELSE %]
18
            <span class="empty">No address stored.</span>
23
            <li><span class="empty" id="noadressstored">No address stored.</span></li>
19
    [% END %]</li>
24
    [% END %]
20
    [% IF ( address2 ) %]
21
        <li>[% address2 %]</li>
22
    [% END %]<li> 
23
    [% IF ( city ) %]
25
    [% IF ( city ) %]
24
            [% city %][% IF ( state ) %], [% state %][% END %]
26
            [% city %][% IF ( state ) %], [% state %][% END %]
25
	    [% zipcode %][% IF ( country ) %], [% country %][% END %]
27
	    [% zipcode %][% IF ( country ) %], [% country %][% END %]
26
    [% ELSE %]
28
    [% ELSE %]
27
        <span class="empty">No city stored.</span>
29
        <span class="empty" id="nocitystored">No city stored.</span>
28
    [% END %]</li>
30
    [% END %]</li>
29
    <li>[% IF ( phone ) %]
31
    <li>[% IF ( phone ) %]
30
        [% phone %]
32
        [% phone %]
Lines 35-41 Link Here
35
            [% IF ( phonepro ) %]
37
            [% IF ( phonepro ) %]
36
                [% phonepro %]
38
                [% phonepro %]
37
            [% ELSE %]
39
            [% ELSE %]
38
                <span class="empty">No phone stored.</span>    
40
                <span class="empty" id="nophonestored">No phone stored.</span>    
39
            [% END %]
41
            [% END %]
40
        [% END %]
42
        [% END %]
41
    [% END %]</li>
43
    [% END %]</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.tt (-10 / +12 lines)
Lines 14-32 in the global namespace %] Link Here
14
<li><img src="/intranet-tmpl/prog/img/patron-blank.png" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
14
<li><img src="/intranet-tmpl/prog/img/patron-blank.png" alt="[% borrower.firstname %] [% borrower.surname %] ([% borrower.cardnumber %])" border="0" style="margin: .3em 0 .3em .3em; padding: .2em; border: 1px solid #CCCCCC;" /></li>
15
[% END %]
15
[% END %]
16
[% END %]
16
[% END %]
17
    <li>[% IF borrower.address %]
17
    [% IF ( borrower.address or borrower.address2 ) %]
18
            [% borrower.address %]
18
        [% IF ( borrower.address ) %]
19
            <li>[% borrower.address %]</li>
20
        [% END %]
21
        [% IF ( borrower.address2 ) %]
22
            <li>[% borrower.address2 %]</li>
23
        [% END %]
19
    [% ELSE %]
24
    [% ELSE %]
20
            <span class="empty">No address stored.</span>
25
            <li><span class="empty" id="noaddressstored">No address stored.</span></li>
21
    [% END %]</li>
26
    [% END %]
22
    [% IF borrower.address2 %]
27
    <li>
23
        <li>[% borrower.address2 %]</li>
24
    [% END %]<li>
25
    [% IF borrower.city %]
28
    [% IF borrower.city %]
26
            [% borrower.city %][% IF borrower.state %], [% borrower.state %][% END %]
29
            [% borrower.city %][% IF borrower.state %], [% borrower.state %][% END %]
27
	    [% borrower.zipcode %][% IF ( borrower.country ) %], [% borrower.country %][% END %]
30
	    [% borrower.zipcode %][% IF ( borrower.country ) %], [% borrower.country %][% END %]
28
    [% ELSE %]
31
    [% ELSE %]
29
        <span class="empty">No city stored.</span>
32
        <span class="empty" id="nocitystored">No city stored.</span>
30
    [% END %]</li>
33
    [% END %]</li>
31
    <li>[% IF borrower.phone %]
34
    <li>[% IF borrower.phone %]
32
        [% borrower.phone %]
35
        [% borrower.phone %]
Lines 37-43 in the global namespace %] Link Here
37
            [% IF borrower.phonepro %]
40
            [% IF borrower.phonepro %]
38
                [% borrower.phonepro %]
41
                [% borrower.phonepro %]
39
            [% ELSE %]
42
            [% ELSE %]
40
                <span class="empty">No phone stored.</span>
43
                <span class="empty" id="nophonestored">No phone stored.</span>
41
            [% END %]
44
            [% END %]
42
        [% END %]
45
        [% END %]
43
    [% END %]</li>
46
    [% END %]</li>
44
- 

Return to bug 7334