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 (-11 / +10 lines)
Lines 561-566 legend:hover { Link Here
561
                                [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
561
                                [% UNLESS noaddress && noaddress2 && nocity && nostate && nozipcode && nocountry %]
562
                                    [% IF Koha.Preference( 'AddressFormat' ) %]
562
                                    [% IF Koha.Preference( 'AddressFormat' ) %]
563
                                        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
563
                                        [% INCLUDE "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
564
                                    [% ELSE %]
565
                                        [% INCLUDE 'member-main-address-style-us.inc' %]
564
                                    [% END %]
566
                                    [% END %]
565
                                [% END # /UNLESS nostreet && nocity etc group%]
567
                                [% END # /UNLESS nostreet && nocity etc group%]
566
568
Lines 726-747 legend:hover { Link Here
726
728
727
                            [% IF ( step_6 ) %]
729
                            [% IF ( step_6 ) %]
728
                                [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
730
                                [% UNLESS noB_address && noB_address2 && noB_city && noB_zipcode && noB_state && noB_country &&nocontactnote && noB_phone && noB_email %]
729
                                [% SWITCH Koha.Preference( 'AddressFormat' ) %]
731
                                    [% IF Koha.Preference( 'AddressFormat' ) %]
730
                                    [% CASE 'de' %]
732
                                        [% INCLUDE "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
731
                                        [% INCLUDE 'member-alt-address-style-de.inc' %]
733
                                    [% ELSE %]
732
                                    [% CASE # us %]
733
                                        [% INCLUDE 'member-alt-address-style-us.inc' %]
734
                                        [% INCLUDE 'member-alt-address-style-us.inc' %]
734
                                 [% END %]
735
                                    [% END %]
735
                                [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
736
                                [% END # UNLESS noB_address && noB_city && noB_state && noB_phone && noB_email %]
736
                            [% END # /IF ( step_6 ) %]
737
                            [% END # /IF ( step_6 ) %]
737
738
738
                            [% IF ( step_2 ) %]
739
                            [% IF ( step_2 ) %]
739
                                [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
740
                                [% UNLESS noaltcontactsurname && noaltcontactfirstname && noaltcontactaddress1 && noaltcontactaddress2 && noaltcontactaddress3 && noaltcontactstate && noaltcontactzipcode && noaltcontactcountry && noaltcontactphone %]
740
                                    [% SWITCH Koha.Preference( 'AddressFormat' ) %]
741
                                    [% IF Koha.Preference( 'AddressFormat' ) %]
741
                                        [% CASE 'de' %]
742
                                        [% INCLUDE "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
742
                                            [% INCLUDE 'member-alt-contact-style-de.inc' %]
743
                                    [% ELSE %]
743
                                        [% CASE # us %]
744
                                        [% INCLUDE 'member-alt-contact-style-us.inc' %]
744
                                            [% INCLUDE 'member-alt-contact-style-us.inc' %]
745
                                    [% END %]
745
                                    [% END %]
746
                                [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
746
                                [% END # UNLESS noaltcontactsurname && noaltcontactfirstname etc %]
747
                            [% END # /IF ( step_2 ) %]
747
                            [% END # /IF ( step_2 ) %]
748
- 

Return to bug 25069