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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-5 / +4 lines)
Lines 29-39 Link Here
29
29
30
<ul class="patronbriefinfo">
30
<ul class="patronbriefinfo">
31
    [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
31
    [% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
32
        [% SWITCH Koha.Preference( 'AddressFormat' ) %]
32
        [% IF Koha.Preference( 'AddressFormat' ) %]
33
            [% CASE 'de' %]
33
            [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
34
                [% INCLUDE 'member-display-address-style-de.inc' %]
34
        [% ELSE %]
35
            [% CASE # us %]
35
            [% INCLUDE 'member-display-address-style-us.inc' %]
36
                [% INCLUDE 'member-display-address-style-us.inc' %]
37
        [% END %]
36
        [% END %]
38
37
39
        [% IF ( patron.phone || patron.mobile || patron.phonepro ) %]<li class="patronphone">
38
        [% IF ( patron.phone || patron.mobile || patron.phonepro ) %]<li class="patronphone">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt (-12 / +10 lines)
Lines 454-459 Link Here
454
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
454
[% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
455
    [% IF Koha.Preference( 'AddressFormat' ) %]
455
    [% IF Koha.Preference( 'AddressFormat' ) %]
456
        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
456
        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
457
    [% ELSE %]
458
        [% INCLUDE 'member-main-address-style-us.inc' %]
457
    [% END %]
459
    [% END %]
458
[% END # nostreet && nocity etc group%]
460
[% END # nostreet && nocity etc group%]
459
461
Lines 591-613 Link Here
591
[% IF ( step_6 ) %]
593
[% IF ( step_6 ) %]
592
594
593
    [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
595
    [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
594
    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
596
        [% IF Koha.Preference( 'AddressFormat' ) %]
595
        [% CASE 'de' %]
597
            [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
596
            [% INCLUDE 'member-alt-address-style-de.inc' %]
598
        [% ELSE %]
597
        [% CASE # us %]
598
            [% INCLUDE 'member-alt-address-style-us.inc' %]
599
            [% INCLUDE 'member-alt-address-style-us.inc' %]
599
     [% END %]
600
        [% END %]
600
601
    [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
601
    [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
602
[% END %]
602
[% END %]
603
[% IF ( step_2 ) %]
603
[% IF ( step_2 ) %]
604
    [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
604
    [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
605
    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
605
        [% IF Koha.Preference( 'AddressFormat' ) %]
606
        [% CASE 'de' %]
606
            [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
607
            [% INCLUDE 'member-alt-contact-style-de.inc' %]
607
        [% ELSE %]
608
        [% CASE # us %]
609
            [% INCLUDE 'member-alt-contact-style-us.inc' %]
608
            [% INCLUDE 'member-alt-contact-style-us.inc' %]
610
     [% END %]
609
        [% END %]
611
    [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
610
    [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
612
611
613
[% END %]
612
[% END %]
614
- 

Return to bug 25069