Attachment 102484 Details for Bug 22087 – Bug 22087: Add a no_line_break parameter to prevent new lines

[patch] Bug 22087: Add a no_line_break parameter to prevent new lines

Bug-22087-Add-a-nolinebreak-parameter-to-prevent-n.patch (text/plain), 4.38 KB, created by Jonathan Druart on 2020-04-07 08:53:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-04-07 08:53:09 UTC

Size: 4.38 KB

patch

obsolete

>From dc62a7f35d518e8427bba0c8bb388f8818ee854c 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 d2ef74ac2f..0592fc25ae 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

Actions: View | Diff | Splinter Review

Attachments on bug 22087: 102043 | 102064 | 102448 | 102449 | 102450 | 102451 | 102466 | 102482 | 102483 | 102484 | 102485 | 102486 | 102492 | 102505 | 102506 | 102507 | 107420 | 107421 | 107422 | 107423 | 107424 | 107425 | 107427 | 107428 | 107543 | 107544 | 107545 | 107546 | 107547 | 107548 | 107549