Attachment #104662 for bug #25070

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




[% IF ( patron.B_address or patron.B_address2 ) %]
    [% IF ( patron.B_address ) %]
        [% SET roadtype_desc = '' %]
        [% IF patron.B_streettype %]
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
        [% END %]
        <li class="patronaddress1">[% patron.B_address | html %][%IF roadtype_desc %] [% roadtype_desc | html %][% END %][% IF patron.B_streetnumber %] [% patron.B_streetnumber | html %][% END %]</li>
    [% END %]
    [% IF ( patron.B_address2 ) %]
        <li class="patronaddress2">[% patron.B_address2 | html %]</li>
    [% END %]
[% END %]
[% IF ( patron.B_city ) %]<li class="patroncity">
    [%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %][% patron.B_city | html %][% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
    [% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]</li>
[% END %]




[% IF ( patron.B_address or patron.B_address2 ) %]
    [% IF ( patron.B_address ) %]
        [% SET roadtype_desc = '' %]
        [% IF patron.B_streettype %]
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
        [% END %]
        <li class="patronaddress1">[% IF patron.B_streetnumber %][% patron.B_streetnumber | html %][% END %]
        [%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
            [% patron.B_address | html %]
        </li>
    [% END %]
    [% IF ( patron.B_address2 ) %]
        <li class="patronaddress2">[% patron.B_address2 | html %]</li>
    [% END %]
[% END %]
[% IF ( patron.B_city ) %]
    <li class="patroncity">[%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %]
    [% patron.B_city | html %]
    [% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
    [% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]</li>
[% END %]




[% IF ( patron.B_address or patron.B_address2 ) %]
    [% IF ( patron.B_address ) %]
        [% SET roadtype_desc = '' %]
        [% IF patron.B_streettype %]
            [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
        [% END %]
        <li class="patronaddress1">[% if (patron.B_streetnumber) | html %][% patron.B_streetnumber | html %][% end | html %] [% patron.B_address | html %] [% IF roadtype_desc %][% roadtype_desc | html %] [% END %][% end | html %]</li>
    [% END %]
    [% IF ( patron.B_address2 ) %]
        <li class="patronaddress2">[% patron.B_address2 | html %]</li>
    [% END %]
[% END %]
[% IF ( patron.B_city ) %]<li class="patroncity">
        [% patron.B_city | html %][% IF ( patron.B_state ) %], [% patron.B_state | html %][% END %]
        [% patron.B_zipcode | html %][% IF ( patron.B_country ) %], [% patron.B_country | html %][% END %]</li>
[% END %]




[% USE Koha %]
[% BLOCK 'display-alt-address-style' %]
    [% IF Koha.Preference( 'AddressFormat' ) %]
        [% PROCESS "member-alt-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
    [% ELSE %]
        [% PROCESS 'member-alt-display-address-style-us' %]
    [% END %]
[% END %]

[% BLOCK 'member-alt-display-address-style-us' %]
    [% IF ( patron.B_address or patron.B_address2 ) %]
        [% IF ( patron.B_address ) %]
            [% SET roadtype_desc = '' %]
            [% IF patron.B_streettype %]
                [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
            [% END %]
            <li class="patronaddress1">[% if (patron.B_streetnumber) | html %][% patron.B_streetnumber | html %][% end | html %] [% patron.B_address | html %] [% IF roadtype_desc %][% roadtype_desc | html %] [% END %][% end | html %]</li>
        [% END %]
        [% IF ( patron.B_address2 ) %]
            <li class="patronaddress2">[% patron.B_address2 | html %]</li>
        [% END %]
    [% END %]
    [% IF ( patron.B_city ) %]
        <li class="patroncity">
            [% patron.B_city | html %][% IF ( patron.B_state ) %], [% patron.B_state | html %][% END %]
            [% patron.B_zipcode | html %][% IF ( patron.B_country ) %], [% patron.B_country | html %][% END %]
        </li>
    [% END %]
[% END %]

[% BLOCK 'member-alt-display-address-style-de' %]
    [% IF ( patron.B_address or patron.B_address2 ) %]
        [% IF ( patron.B_address ) %]
            [% SET roadtype_desc = '' %]
            [% IF patron.B_streettype %]
                [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
            [% END %]
            <li class="patronaddress1">[% patron.B_address | html %][%IF roadtype_desc %] [% roadtype_desc | html %][% END %][% IF patron.B_streetnumber %] [% patron.B_streetnumber | html %][% END %]</li>
        [% END %]
        [% IF ( patron.B_address2 ) %]
            <li class="patronaddress2">[% patron.B_address2 | html %]</li>
        [% END %]
    [% END %]
    [% IF ( patron.B_city ) %]
        <li class="patroncity">
            [%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %][% patron.B_city | html %][% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
            [% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]
        </li>
    [% END %]
[% END %]

[% BLOCK 'member-alt-display-address-style-fr' %]
    [% IF ( patron.B_address or patron.B_address2 ) %]
        [% IF ( patron.B_address ) %]
            [% SET roadtype_desc = '' %]
            [% IF patron.B_streettype %]
                [% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
            [% END %]
            <li class="patronaddress1">[% IF patron.B_streetnumber %][% patron.B_streetnumber | html %][% END %]
            [%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
                [% patron.B_address | html %]
            </li>
        [% END %]
        [% IF ( patron.B_address2 ) %]
            <li class="patronaddress2">[% patron.B_address2 | html %]</li>
        [% END %]
    [% END %]
    [% IF ( patron.B_city ) %]
        <li class="patroncity">
            [%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %]
            [% patron.B_city | html %]
            [% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
            [% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]
        </li>
    [% END %]
[% END %]




[% USE ColumnsSettings %]
[% USE Price %]
[% PROCESS 'member-display-address-style.inc' %]
[% PROCESS 'member-display-alt-address-style.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]

                                    </div>
                                    <div class="address">
                                        <ul>
                                            [% PROCESS 'display-alt-address-style' %]
                                                [% INCLUDE "member-display-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
                                            [% ELSE %]
                                                [% INCLUDE 'member-display-alt-address-style-us.inc' %]
                                            [% END %]
                                        </ul>
                                    </div>
                                    <div class="rows">
- 

Return to bug 25070

Lines 1-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style-de.inc (-16 lines)
1	[% IF ( patron.B_address or patron.B_address2 ) %]
2	[% IF ( patron.B_address ) %]
3	[% SET roadtype_desc = '' %]
4	[% IF patron.B_streettype %]
5	[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
6	[% END %]
7	<li class="patronaddress1">[% patron.B_address \| html %][%IF roadtype_desc %] [% roadtype_desc \| html %][% END %][% IF patron.B_streetnumber %] [% patron.B_streetnumber \| html %][% END %]</li>
8	[% END %]
9	[% IF ( patron.B_address2 ) %]
10	<li class="patronaddress2">[% patron.B_address2 \| html %]</li>
11	[% END %]
12	[% END %]
13	[% IF ( patron.B_city ) %]<li class="patroncity">
14	[%IF ( patron.B_zipcode ) %][% patron.B_zipcode \| html %] [% END %][% patron.B_city \| html %][% IF ( patron.B_state ) %]</br>[% patron.B_state \| html %][% END %]
15	[% IF ( patron.B_country ) %]<br />[% patron.B_country \| html %][% END %]</li>
16	[% END %]

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc (+76 lines)
		1	[% USE Koha %]
		2	[% BLOCK 'display-alt-address-style' %]
		3	[% IF Koha.Preference( 'AddressFormat' ) %]
		4	[% PROCESS "member-alt-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
		5	[% ELSE %]
		6	[% PROCESS 'member-alt-display-address-style-us' %]
		7	[% END %]
		8	[% END %]
		9
		10	[% BLOCK 'member-alt-display-address-style-us' %]
		11	[% IF ( patron.B_address or patron.B_address2 ) %]
		12	[% IF ( patron.B_address ) %]
		13	[% SET roadtype_desc = '' %]
		14	[% IF patron.B_streettype %]
		15	[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
		16	[% END %]
		17	<li class="patronaddress1">[% if (patron.B_streetnumber) \| html %][% patron.B_streetnumber \| html %][% end \| html %] [% patron.B_address \| html %] [% IF roadtype_desc %][% roadtype_desc \| html %] [% END %][% end \| html %]</li>
		18	[% END %]
		19	[% IF ( patron.B_address2 ) %]
		20	<li class="patronaddress2">[% patron.B_address2 \| html %]</li>
		21	[% END %]
		22	[% END %]
		23	[% IF ( patron.B_city ) %]
		24	<li class="patroncity">
		25	[% patron.B_city \| html %][% IF ( patron.B_state ) %], [% patron.B_state \| html %][% END %]
		26	[% patron.B_zipcode \| html %][% IF ( patron.B_country ) %], [% patron.B_country \| html %][% END %]
		27	</li>
		28	[% END %]
		29	[% END %]
		30
		31	[% BLOCK 'member-alt-display-address-style-de' %]
		32	[% IF ( patron.B_address or patron.B_address2 ) %]
		33	[% IF ( patron.B_address ) %]
		34	[% SET roadtype_desc = '' %]
		35	[% IF patron.B_streettype %]
		36	[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
		37	[% END %]
		38	<li class="patronaddress1">[% patron.B_address \| html %][%IF roadtype_desc %] [% roadtype_desc \| html %][% END %][% IF patron.B_streetnumber %] [% patron.B_streetnumber \| html %][% END %]</li>
		39	[% END %]
		40	[% IF ( patron.B_address2 ) %]
		41	<li class="patronaddress2">[% patron.B_address2 \| html %]</li>
		42	[% END %]
		43	[% END %]
		44	[% IF ( patron.B_city ) %]
		45	<li class="patroncity">
		46	[%IF ( patron.B_zipcode ) %][% patron.B_zipcode \| html %] [% END %][% patron.B_city \| html %][% IF ( patron.B_state ) %]</br>[% patron.B_state \| html %][% END %]
		47	[% IF ( patron.B_country ) %]<br />[% patron.B_country \| html %][% END %]
		48	</li>
		49	[% END %]
		50	[% END %]
		51
		52	[% BLOCK 'member-alt-display-address-style-fr' %]
		53	[% IF ( patron.B_address or patron.B_address2 ) %]
		54	[% IF ( patron.B_address ) %]
		55	[% SET roadtype_desc = '' %]
		56	[% IF patron.B_streettype %]
		57	[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
		58	[% END %]
		59	<li class="patronaddress1">[% IF patron.B_streetnumber %][% patron.B_streetnumber \| html %][% END %]
		60	[%IF roadtype_desc %][% roadtype_desc \| html %] [% END %]
		61	[% patron.B_address \| html %]
		62	</li>
		63	[% END %]
		64	[% IF ( patron.B_address2 ) %]
65	<li class="patronaddress2">[% patron.B_address2 \| html %]</li>
66	[% END %]
67	[% END %]
68	[% IF ( patron.B_city ) %]
69	<li class="patroncity">
70	[%IF ( patron.B_zipcode ) %][% patron.B_zipcode \| html %] [% END %]
71	[% patron.B_city \| html %]
72	[% IF ( patron.B_state ) %]</br>[% patron.B_state \| html %][% END %]
73	[% IF ( patron.B_country ) %]<br />[% patron.B_country \| html %][% END %]
74	</li>
75	[% END %]
76	[% END %]

Lines 7-12 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-6 / +2 lines)
7	[% USE ColumnsSettings %]	7	[% USE ColumnsSettings %]
8	[% USE Price %]	8	[% USE Price %]
9	[% PROCESS 'member-display-address-style.inc' %]	9	[% PROCESS 'member-display-address-style.inc' %]
		10	[% PROCESS 'member-display-alt-address-style.inc' %]
10	[% SET footerjs = 1 %]	11	[% SET footerjs = 1 %]
11	[% INCLUDE 'doc-head-open.inc' %]	12	[% INCLUDE 'doc-head-open.inc' %]
12	[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") \| $raw %]	13	[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") \| $raw %]
Lines 581-591 Link Here
581	</div>	582	</div>
582	<div class="address">	583	<div class="address">
583	<ul>	584	<ul>
584	[% IF Koha.Preference( 'AddressFormat' ) %]	585	[% PROCESS 'display-alt-address-style' %]
585	[% INCLUDE "member-display-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
586	[% ELSE %]
587	[% INCLUDE 'member-display-alt-address-style-us.inc' %]
588	[% END %]
589	</ul>	586	</ul>
590	</div>	587	</div>
591	<div class="rows">	588	<div class="rows">
592	-