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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc (-4 / +6 lines)
Lines 1-5 Link Here
1 
[%~ USE Koha ~%]
 1 
[%~ USE Koha ~%]
2 
[%~ BLOCK 'display-address-style' ~%]
 2 
[%~ BLOCK 'display-address-style' ~%]
3 
    [%~ SET line_break = "<br/>" ~%]
4 
    [%~ IF no_line_break %][% SET line_break = " " %][% END ~%]
3 
    [%~ IF Koha.Preference( 'AddressFormat' ) ~%]
 5 
    [%~ IF Koha.Preference( 'AddressFormat' ) ~%]
4 
        [%~ PROCESS "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" ~%]
 6 
        [%~ PROCESS "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" ~%]
5 
    [%~ ELSE ~%]
 7 
    [%~ ELSE ~%]
Lines 43-50 Link Here
43 
    [%~ END ~%]
 45 
    [%~ END ~%]
44 
    [%~ IF ( patron.city ) ~%]
 46 
    [%~ IF ( patron.city ) ~%]
45 
        <li class="patroncity">
 47 
        <li class="patroncity">
46 
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%]</br>[%~ patron.state | html ~%][%~ END ~%]
 48 
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break %][%~ patron.state | html ~%][%~ END ~%]
47 
            [%~ IF ( patron.country ) ~%]<br />[%~ patron.country | html ~%][%~ END ~%]
 49 
            [%~ IF ( patron.country ) ~%][% line_break %][%~ patron.country | html ~%][%~ END ~%]
48 
        </li>
 50 
        </li>
49 
    [%~ END ~%]
 51 
    [%~ END ~%]
50 
[%~ END ~%]
 52 
[%~ END ~%]
Lines 67-74 Link Here
67 
    [%~ END ~%]
 69 
    [%~ END ~%]
68 
    [%~ IF ( patron.city ) ~%]
 70 
    [%~ IF ( patron.city ) ~%]
69 
        <li class="patroncity">
 71 
        <li class="patroncity">
70 
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%]</br>[%~ patron.state | html ~%][%~ END ~%]
 72 
            [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break %][%~ patron.state | html ~%][%~ END ~%]
71 
            [%~ IF ( patron.country ) ~%]<br />[%~ patron.country | html ~%][%~ END ~%]
 73 
            [%~ IF ( patron.country ) ~%][% line_break %][%~ patron.country | html ~%][%~ END ~%]
72 
        </li>
 74 
        </li>
73 
    [%~ END ~%]
 75 
    [%~ END ~%]
74 
[%~ END ~%]
 76 
[%~ END ~%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt (-2 / +1 lines)
Lines 18-24 Link Here
18 
                "dt_cardnumber":
 18 
                "dt_cardnumber":
19 
                    "[% data.cardnumber | html | $To %]",
 19 
                    "[% data.cardnumber | html | $To %]",
20 
                "dt_name":
 20 
                "dt_name":
21 
                    "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]</a><br /><div class='address'><ul>[%~ PROCESS 'display-address-style' patron=data| $To ~%]</ul></div>[% IF data.email %]<br/>Email: <a href='mailto:[% data.email | html | $To %]'>[% data.email | html | $To %]</a>[% END %]",
 21 
                    "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]</a><br /><div class='address'><ul>[%~ PROCESS 'display-address-style' patron=data no_line_break=1 | $To ~%]</ul></div>[% IF data.email %]<br/>Email: <a href='mailto:[% data.email | html | $To %]'>[% data.email | html | $To %]</a>[% END %]",
22 
    "dt_dateofbirth":
 22 
    "dt_dateofbirth":
23 
        "[% data.dateofbirth | $KohaDates %]",
 23 
        "[% data.dateofbirth | $KohaDates %]",
24 
                "dt_category":
 24 
                "dt_category":
25 
-

Return to bug 22087