@@ -, +, @@
---
.../prog/en/includes/member-display-address-style.inc | 10 ++++++----
.../prog/en/modules/members/tables/members_results.tt | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
@@ -1,5 +1,7 @@
[%~ USE Koha ~%]
[%~ BLOCK 'display-address-style' ~%]
+ [%~ SET line_break = "
" ~%]
+ [%~ IF no_line_break %][% SET line_break = " " %][% END ~%]
[%~ IF Koha.Preference( 'AddressFormat' ) ~%]
[%~ PROCESS "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" ~%]
[%~ ELSE ~%]
@@ -43,8 +45,8 @@
[%~ END ~%]
[%~ IF ( patron.city ) ~%]
- [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][%~ patron.state | html ~%][%~ END ~%]
- [%~ IF ( patron.country ) ~%]
[%~ patron.country | html ~%][%~ END ~%]
+ [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break %][%~ patron.state | html ~%][%~ END ~%]
+ [%~ IF ( patron.country ) ~%][% line_break %][%~ patron.country | html ~%][%~ END ~%]
[%~ END ~%]
[%~ END ~%]
@@ -67,8 +69,8 @@
[%~ END ~%]
[%~ IF ( patron.city ) ~%]
- [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][%~ patron.state | html ~%][%~ END ~%]
- [%~ IF ( patron.country ) ~%]
[%~ patron.country | html ~%][%~ END ~%]
+ [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break %][%~ patron.state | html ~%][%~ END ~%]
+ [%~ IF ( patron.country ) ~%][% line_break %][%~ patron.country | html ~%][%~ END ~%]
[%~ END ~%]
[%~ END ~%]
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
@@ -18,7 +18,7 @@
"dt_cardnumber":
"[% data.cardnumber | html | $To %]",
"dt_name":
- "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]
[%~ PROCESS 'display-address-style' patron=data| $To ~%]
[% IF data.email %]
Email: [% data.email | html | $To %][% END %]",
+ "[% INCLUDE 'patron-title.inc' borrowernumber = data.borrowernumber category_type = data.category_type firstname = data.firstname surname = data.surname othernames = data.othernames invert_name = 1 | $To %]
[%~ PROCESS 'display-address-style' patron=data no_line_break=1 | $To ~%]
[% IF data.email %]
Email: [% data.email | html | $To %][% END %]",
"dt_dateofbirth":
"[% data.dateofbirth | $KohaDates %]",
"dt_category":
--