Bug 16730 - Use member-display-address-style*-includes in moremember-brief.tt

To test:
- Apply patch
- Create a new patron with the same first and last name as an existing
  patron. This should trigger a duplicate warning message. Click the
  "View existing record" link to trigger a pop-up window with a patron
  detail brief view.
- Verify that the address information displays the same way as on the
  patron details screen (moremember.pl).
- Change syspref 'AddressFormat' and verify that the address displays
  as appropriate.

Signed-off-by: Frédéric Demians <f.demians@tamil.fr>
  Works as described: AddressFormat is taken into account on 'view exiting
  record' dialog box.

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
index 33061fa..a2c0b12 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
@@ -1,3 +1,4 @@
+[% USE Koha %]
 [% USE KohaDates %]
 [% INCLUDE 'doc-head-open.inc' %]
 <title>Koha &rsaquo; Check duplicate patron</title>
@@ -16,17 +17,13 @@
        <div id="patron-information" style="padding: .5em;">
 
      [% UNLESS ( I ) %][% IF ( othernames ) %]&ldquo;[% othernames %]&rdquo;[% END %]
-
-       <p class="address">[% streetnumber %]
-        [% IF ( roaddetails ) %]
-         [% roaddetails %]
-        [% END %]
-        [% address %]<br />
-        [% IF ( address2 ) %][% address2 %]<br />[% END %]
-        [% IF ( city ) %][% city %][% END %]
-        [% IF ( zipcode ) %][% zipcode %]<br />[% END %]
-        [% IF ( country ) %][% country %][% END %]</p>
-
+        <div class = "address">
+            [% IF Koha.Preference( 'AddressFormat' ) %]
+                [% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
+            [% ELSE %]
+                [% INCLUDE 'member-display-address-style-us.inc' %]
+            [% END %]
+        </div>
        <div class="rows">
                <ol>
         [% IF ( I ) %]