gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 40319: Fix spacing in address display include 

This patch makes some spacing changes to the address display include in
order to prevent address parts (e.g. city, state, zip, etc) from missing
spaces in between.

To test, apply the patch and locate or edit a patron record to include
data in all main address fields.

- Check out to the patron and check the display of the address in the
  sidebar. Confirm that the spacing is correct.
- Test with all variations of the AddressFormat system preference.
- Test with and without the use of road types (Administration ->
  Authorized values -> ROADTYPE) and street numbers.

Sponsored-by: Athens County Public Libraries
Signed-off-by: Martin Renvoize <martin.renvoize@openfifth.co.uk>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 51cb82b02e)
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
This commit is contained in:
Owen Leonard 2025-07-07 13:26:13 +00:00 committed by Paul Derscheid
parent 9895e224df
commit 59daecc0b8
No known key found for this signature in database
GPG Key ID: C25F9FD44CED595B
1 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style.inc
View File

@ -29,10 +29,18 @@
[%~ END ~%]
[%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
<li class="patroncity">
<span class="city">[%~ patron.city |html ~%]</span>[%~ IF ( patron.state ) %][%~ IF ( patron.city ) ~%],[% END ~%]<span class="state">[% patron.state |html ~%]</span>[%~ END ~%]
[%~ IF ( patron.zipcode ) %]<span class="zipcode">[%~ " " _ patron.zipcode |html ~%]</span>[% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state || patron.city ) ~%]
<span class="comma">,</span>
[% END ~%]<span class="country">[% patron.country |html ~%]</span>[%~ END ~%]
<span class="city">[%~ patron.city |html ~%]</span>
[%~ IF ( patron.state ) %]
[%~ IF ( patron.city ) ~%]
,
[% END ~%]
<span class="state">[% patron.state |html ~%]</span>
[%~ END ~%]
[%~ IF ( patron.zipcode ) %]<span class="zipcode">[%~ " " _ patron.zipcode |html ~%]</span>[% END %]
[%~ IF ( patron.country ) %]
[% line_break | $raw %]
<span class="country">[% patron.country |html ~%]</span>
[%~ END ~%]
</li>
[%~ END ~%]
[%~ END ~%]
@ -44,11 +52,15 @@
[%~ IF patron.streettype ~%]
[%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
[%~ END ~%]
<li class="patronaddress1"
><span class="address1">[%~ patron.address | html ~%]</span>[%~ IF roadtype_desc %]<span class="roadtype">[% roadtype_desc | html ~%]</span>[%~ END ~%][%~ IF patron.streetnumber %]
<li class="patronaddress1">
<span class="address1">[%~ patron.address | html ~%]</span>
[%~ IF roadtype_desc %]
<span class="roadtype">[% roadtype_desc | html ~%]</span>
[%~ END ~%]
[%~ IF patron.streetnumber %]
<span class="streetnumber">[% patron.streetnumber | html ~%]</span>
[%~ END ~%]</li
>
[%~ END ~%]
</li>
[%~ END ~%]
[%~ IF ( patron.address2 ) ~%]
<li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
@ -56,7 +68,11 @@
[%~ END ~%]
[%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
<li class="patroncity">
[%~ IF ( patron.zipcode ) ~%]<span class="zipcode">[%~ patron.zipcode | html %]</span>[% END ~%]<span class="city">[%~ patron.city | html ~%]</span>[%~ IF ( patron.state ) ~%]
[%~ IF ( patron.zipcode ) ~%]
<span class="zipcode">[%~ patron.zipcode | html %]</span>
[% END ~%]
<span class="city">[%~ patron.city | html ~%]</span>
[%~ IF ( patron.state ) ~%]
[% line_break | $raw %]<span class="state">[%~ patron.state | html ~%]</span>
[%~ END ~%]
[%~ IF ( patron.country ) ~%][% line_break | $raw %]<span class="country">[%~ patron.country | html ~%]</span>[%~ END ~%]
@ -71,9 +87,13 @@
[%~ IF patron.streettype ~%]
[%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
[%~ END ~%]
<li class="patronaddress1"
>[%~ IF patron.streetnumber ~%]<span class="streetnumber">[%~ patron.streetnumber | html %]</span>[% END ~%]
[%~ IF roadtype_desc ~%]<span class="roadtype">[%~ roadtype_desc | html %]</span>[% END ~%]
<li class="patronaddress1">
[%~ IF patron.streetnumber ~%]
<span class="streetnumber">[%~ patron.streetnumber | html %]</span>
[% END ~%]
[%~ IF roadtype_desc ~%]
<span class="roadtype">[%~ roadtype_desc | html %]</span>
[% END ~%]
<span class="address1">[%~ patron.address | html ~%]</span>
</li>
[%~ END ~%]
@ -83,7 +103,11 @@
[%~ END ~%]
[%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%]
<li class="patroncity">
[%~ IF ( patron.zipcode ) ~%]<span class="zipcode">[%~ patron.zipcode | html %]</span>[% END ~%]<span class="city">[%~ patron.city | html ~%]</span>[%~ IF ( patron.state ) ~%]
[%~ IF ( patron.zipcode ) ~%]
<span class="zipcode">[%~ patron.zipcode | html %]</span>
[% END ~%]
<span class="city">[%~ patron.city | html ~%]</span>
[%~ IF ( patron.state ) ~%]
[% line_break | $raw %]<span class="state">[%~ patron.state | html ~%]</span>
[%~ END ~%]
[%~ IF ( patron.country ) ~%][% line_break | $raw %]<span class="country">[%~ patron.country | html ~%]</span>[%~ END ~%]