Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 22087: Add a no_line_break parameter to prevent new lines

Browse source 
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Jonathan Druart 2020-04-06 16:25:34 +02:00
parent 2fac4017b7
commit 77058c7d6b
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
View file

@ -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 ~%]

2
koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt
View file

@ -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":
"[% INCLUDE 'patron-age.inc' patron = data %]",
"dt_category":