From 0aee2cb14326ccd69cedde8d32bc1f7ada57407c Mon Sep 17 00:00:00 2001 From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Date: Mon, 6 Apr 2020 16:25:34 +0200 Subject: [PATCH] Bug 22087: Add a no_line_break parameter to prevent new lines --- .../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(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc index 6c99b0a1e1..fc4a33f7b0 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc +++ b/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 = "<br/>" ~%] + [%~ 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 ) ~%] <li class="patroncity"> - [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%]</br>[%~ patron.state | html ~%][%~ END ~%] - [%~ IF ( patron.country ) ~%]<br />[%~ 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 ~%] </li> [%~ END ~%] [%~ END ~%] @@ -67,8 +69,8 @@ [%~ END ~%] [%~ IF ( patron.city ) ~%] <li class="patroncity"> - [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%]</br>[%~ patron.state | html ~%][%~ END ~%] - [%~ IF ( patron.country ) ~%]<br />[%~ 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 ~%] </li> [%~ END ~%] [%~ END ~%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt index 1f22eeee4a..e4fdc8c9df 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt @@ -18,7 +18,7 @@ "dt_cardnumber": "[% data.cardnumber | html | $To %]", "dt_name": - "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% 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 %]</a><br /><div class='address'><ul>[%~ PROCESS 'display-address-style' patron=data| $To ~%]</ul></div>[% IF data.email %]<br/>Email: <a href='mailto:[% data.email | html | $To %]'>[% data.email | html | $To %]</a>[% END %]", + "<a href=\"/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | html %]\" class=\"patron_preview\" data-borrowernumber=\"[% data.borrowernumber | html %]\" style='white-space:nowrap'>[% 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 %]</a><br /><div class='address'><ul>[%~ PROCESS 'display-address-style' patron=data no_line_break=1 | $To ~%]</ul></div>[% IF data.email %]<br/>Email: <a href='mailto:[% data.email | html | $To %]'>[% data.email | html | $To %]</a>[% END %]", "dt_dateofbirth": "[% data.dateofbirth | $KohaDates %]", "dt_category": -- 2.20.1