Attachment #105278 for bug #25463

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

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-de.inc (+9 lines)
	1	[% IF ( patron.altcontactaddress1 or patron.altcontactaddress2 ) %]
	2	<li class="altcontactname">[% patron.altcontactfirstname \| html %] [% patron.altcontactsurname \| html %][% end \| html %] </li>
	3	<li class="altcontactaddress1">[% if (patron.altcontactaddress1) \| html %][% patron.altcontactaddress1 \| html %][% end \| html %] </li>
	4	<li class="altcontactaddress2">[% if (patron.altcontactaddress2) \| html %][% patron.altcontactaddress2 \| html %][% end \| html %] </li>
	5	[% END %]
	6	[% IF ( patron.altcontactzipcode ) %]<li class="altcontactzipcode"> [% patron.altcontactzipcode \| html %] [% IF ( patron.altcontactaddress3 ) %][% patron.altcontactaddress3 %][% END %]</li>
	7	[% IF ( patron.altcontactstate ) %]<li clas="altcontactaddress3"> [% patron.altcontactstate \| html %] [% END %]</li>
	8	[% IF ( patron.altcontactcountry ) %] <li class="altcontactcountry"> [% patron.altcontactcountry \| html %][% END %]</li>
	9	[% END %]

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-fr.inc (+9 lines)
	1	[% IF ( patron.altcontactaddress1 or patron.altcontactaddress2 ) %]
	2	<li class="altcontactname">[% patron.altcontactfirstname \| html %] [% patron.altcontactsurname \| html %][% end \| html %] </li>
	3	<li class="altcontactaddress1">[% if (patron.altcontactaddress1) \| html %][% patron.altcontactaddress1 \| html %][% end \| html %] </li>
	4	<li class="altcontactaddress2">[% if (patron.altcontactaddress2) \| html %][% patron.altcontactaddress2 \| html %][% end \| html %] </li>
	5	[% END %]
	6	[% IF ( patron.altcontactzipcode ) %]<li class="altcontactzipcode"> [% patron.altcontactzipcode \| html %] [% IF ( patron.altcontactaddress3 ) %][% patron.altcontactaddress3 %][% END %]</li>
	7	[% IF ( patron.altcontactstate ) %]<li clas="altcontactaddress3"> [% patron.altcontactstate \| html %] [% END %]</li>
	8	[% IF ( patron.altcontactcountry ) %] <li class="altcontactcountry"> [% patron.altcontactcountry \| html %][% END %]</li>
	9	[% END %]

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-us.inc (+11 lines)
	1	[% IF ( patron.altcontactaddress1 or patron.altcontactaddress2 ) %]
	2	<li class="altcontactname">[% patron.altcontactfirstname \| html %] [% patron.altcontactsurname \| html %][% end \| html %] </li>
	3	<li class="altcontactaddress1">[% if (patron.altcontactaddress1) \| html %][% patron.altcontactaddress1 \| html %][% end \| html %] </li>
	4	<li class="altcontactaddress2">[% if (patron.altcontactaddress2) \| html %][% patron.altcontactaddress2 \| html %][% end \| html %] </li>
	5	[% END %]
	6	<li class="altcontactaddress3">
	7	[% IF ( patron.altcontactaddress3 ) %][% patron.altcontactaddress3 \| html %], [% END %]
	8	[% IF ( patron.altcontactstate ) %] [% patron.altcontactstate \| html %],[% END %]
	9	[% IF ( patron.altcontactzipcode ) %] [% patron.altcontactzipcode \| html %],[% END %]
	10	[% IF ( patron.altcontactcountry ) %] [% patron.altcontactcountry \| html %][% END %]
	11	</li>




                                        <h3>Alternative contact</h3>
                                        <a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&amp;borrowernumber=[% patron.borrowernumber | html %]&amp;step=2"><i class="fa fa-pencil"></i> Edit</a>
                                    </div>
<!-- Change below here DR -->
                                <div class="address">
                                        <ul>
                                            [% IF Koha.Preference( 'AddressFormat' ) %]
                                                [% INCLUDE "member-display-altv-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
                                            [% ELSE %]
                                                [% INCLUDE 'member-display-altv-address-style-us.inc' %]
                                            [% END %]
                                        </ul>
                                    </div>
                                    <div class="rows">
                                        <ol>
                                            [% IF ( patron.altcontactsurname ) %]
                                                <li id="patron-altcontactsurname">
                                                    <span class="label">Surname: </span>
                                                    [% patron.altcontactsurname | html %]
                                                </li>
                                            [% END %]
                                            [% IF ( patron.altcontactfirstname ) %]
                                                <li id="patron-altcontactfirstname">
                                                    <span class="label">First name: </span>
                                                    [% patron.altcontactfirstname | html %]
                                                </li>
                                            [% END %]
                                            [% IF ( patron.altcontactaddress1 ) %]
                                                <li id="patron-altcontactaddress1">
                                                    <span class="label">Address: </span>
                                                    [% patron.altcontactaddress1 | html %]
                                                </li>
                                            [% END %]
                                            [% IF ( patron.altcontactaddress2 ) %]
                                                <li id="patron-altcontactaddress2">
                                                    <span class="label">Address 2: </span>
                                                    [% patron.altcontactaddress2 | html %]
                                                </li>
                                            [% END %]
                                            [% IF ( patron.altcontactaddress3 ) %]
                                                <li id="patron-altcontactaddress3">
                                                    <span class="label">City: </span>
                                                    [% patron.altcontactaddress3 | html %]
                                                </li>
                                            [% END %]

                                            [% IF ( patron.altcontactstate ) %]
                                                <li id="patron-altcontactstate">
                                                    <span class="label">State: </span>
                                                    [% patron.altcontactstate | html %]
                                                </li>
                                            [% END %]
                                            [% IF ( patron.altcontactzipcode ) %]
                                                <li id="patron-altcontactzipcode">
                                                    <span class="label">ZIP/Postal code: </span>
                                                    [% patron.altcontactzipcode | html %]
                                                </li>
                                            [% END %]
                                            [% IF ( patron.altcontactcountry ) %]
                                                <li id="patron-altcontactcountry">
                                                    <span class="label">Country: </span>
                                                    [% patron.altcontactcountry | html %]
                                                </li>
                                            [% END %]
                                            [% IF ( patron.altcontactphone ) %]
                                                <li id="patron-altcontactphone">
                                                    <span class="label">Phone: </span>
                                                    <a href="tel:[% patron.altcontactphone | uri %]">[% patron.altcontactphone |html  %]</a>
                                                </li>
                                            [% END %]
                                        </ol>
                                    </div> 
                                [% ELSE %]
                                    <div class="patroninfo-heading">
                                        <h3>Alternative contact</h3>
- 

Return to bug 25463

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-de.inc (+9 lines)
	1	[% IF ( patron.altcontactaddress1 or patron.altcontactaddress2 ) %]
	2	<li class="altcontactname">[% patron.altcontactfirstname \| html %] [% patron.altcontactsurname \| html %][% end \| html %] </li>
	3	<li class="altcontactaddress1">[% if (patron.altcontactaddress1) \| html %][% patron.altcontactaddress1 \| html %][% end \| html %] </li>
	4	<li class="altcontactaddress2">[% if (patron.altcontactaddress2) \| html %][% patron.altcontactaddress2 \| html %][% end \| html %] </li>
	5	[% END %]
	6	[% IF ( patron.altcontactzipcode ) %]<li class="altcontactzipcode"> [% patron.altcontactzipcode \| html %] [% IF ( patron.altcontactaddress3 ) %][% patron.altcontactaddress3 %][% END %]</li>
	7	[% IF ( patron.altcontactstate ) %]<li clas="altcontactaddress3"> [% patron.altcontactstate \| html %] [% END %]</li>
	8	[% IF ( patron.altcontactcountry ) %] <li class="altcontactcountry"> [% patron.altcontactcountry \| html %][% END %]</li>
	9	[% END %]

Line 0 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-altv-address-style-fr.inc (+9 lines)
	1	[% IF ( patron.altcontactaddress1 or patron.altcontactaddress2 ) %]
	2	<li class="altcontactname">[% patron.altcontactfirstname \| html %] [% patron.altcontactsurname \| html %][% end \| html %] </li>
	3	<li class="altcontactaddress1">[% if (patron.altcontactaddress1) \| html %][% patron.altcontactaddress1 \| html %][% end \| html %] </li>
	4	<li class="altcontactaddress2">[% if (patron.altcontactaddress2) \| html %][% patron.altcontactaddress2 \| html %][% end \| html %] </li>
	5	[% END %]
	6	[% IF ( patron.altcontactzipcode ) %]<li class="altcontactzipcode"> [% patron.altcontactzipcode \| html %] [% IF ( patron.altcontactaddress3 ) %][% patron.altcontactaddress3 %][% END %]</li>
	7	[% IF ( patron.altcontactstate ) %]<li clas="altcontactaddress3"> [% patron.altcontactstate \| html %] [% END %]</li>
	8	[% IF ( patron.altcontactcountry ) %] <li class="altcontactcountry"> [% patron.altcontactcountry \| html %][% END %]</li>
	9	[% END %]

Lines 640-704 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-52 / +12 lines)
640	<h3>Alternative contact</h3>	640	<h3>Alternative contact</h3>
641	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=2"><i class="fa fa-pencil"></i> Edit</a>	641	<a class="btn btn-default btn-xs" href="memberentry.pl?op=modify&borrowernumber=[% patron.borrowernumber \| html %]&step=2"><i class="fa fa-pencil"></i> Edit</a>
642	</div>	642	</div>
		643	<!-- Change below here DR -->
		644	<div class="address">
		645	<ul>
		646	[% IF Koha.Preference( 'AddressFormat' ) %]
		647	[% INCLUDE "member-display-altv-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
		648	[% ELSE %]
		649	[% INCLUDE 'member-display-altv-address-style-us.inc' %]
		650	[% END %]
		651	</ul>
		652	</div>
643	<div class="rows">	653	<div class="rows">
644	<ol>	654	<ol>
645	[% IF ( patron.altcontactsurname ) %]
646	<li id="patron-altcontactsurname">
647	<span class="label">Surname: </span>
648	[% patron.altcontactsurname \| html %]
649	</li>
650	[% END %]
651	[% IF ( patron.altcontactfirstname ) %]
652	<li id="patron-altcontactfirstname">
653	<span class="label">First name: </span>
654	[% patron.altcontactfirstname \| html %]
655	</li>
656	[% END %]
657	[% IF ( patron.altcontactaddress1 ) %]
658	<li id="patron-altcontactaddress1">
659	<span class="label">Address: </span>
660	[% patron.altcontactaddress1 \| html %]
661	</li>
662	[% END %]
663	[% IF ( patron.altcontactaddress2 ) %]
664	<li id="patron-altcontactaddress2">
665	<span class="label">Address 2: </span>
666	[% patron.altcontactaddress2 \| html %]
667	</li>
668	[% END %]
669	[% IF ( patron.altcontactaddress3 ) %]
670	<li id="patron-altcontactaddress3">
671	<span class="label">City: </span>
672	[% patron.altcontactaddress3 \| html %]
673	</li>
674	[% END %]
675
676	[% IF ( patron.altcontactstate ) %]
677	<li id="patron-altcontactstate">
678	<span class="label">State: </span>
679	[% patron.altcontactstate \| html %]
680	</li>
681	[% END %]
682	[% IF ( patron.altcontactzipcode ) %]
683	<li id="patron-altcontactzipcode">
684	<span class="label">ZIP/Postal code: </span>
685	[% patron.altcontactzipcode \| html %]
686	</li>
687	[% END %]
688	[% IF ( patron.altcontactcountry ) %]
689	<li id="patron-altcontactcountry">
690	<span class="label">Country: </span>
691	[% patron.altcontactcountry \| html %]
692	</li>
693	[% END %]
694	[% IF ( patron.altcontactphone ) %]	655	[% IF ( patron.altcontactphone ) %]
695	<li id="patron-altcontactphone">	656	<li id="patron-altcontactphone">
696	<span class="label">Phone: </span>	657	<span class="label">Phone: </span>
697	<a href="tel:[% patron.altcontactphone \| url %]">[% patron.altcontactphone \| html %]</a>	658	<a href="tel:[% patron.altcontactphone \| uri %]">[% patron.altcontactphone \|html %]</a>
698	</li>	659	</li>
699	[% END %]	660	[% END %]
700	</ol>	661	</ol>
701	</div> [% # /div.rows %]	662	</div>
702	[% ELSE %]	663	[% ELSE %]
703	<div class="patroninfo-heading">	664	<div class="patroninfo-heading">
704	<h3>Alternative contact</h3>	665	<h3>Alternative contact</h3>
705	-