Bugzilla – Attachment 183842 Details for
Bug 40319
Fix spacing in address display include
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 40319: Fix spacing in address display include
Bug-40319-Fix-spacing-in-address-display-include.patch (text/plain), 6.20 KB, created by
Owen Leonard
on 2025-07-07 13:45:19 UTC
(
hide
)
Description:
Bug 40319: Fix spacing in address display include
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2025-07-07 13:45:19 UTC
Size:
6.20 KB
patch
obsolete
>From c8446458c420c225ff2ad8004ce180d5fb394667 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Mon, 7 Jul 2025 13:26:13 +0000 >Subject: [PATCH] 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 >--- > .../includes/member-display-address-style.inc | 50 ++++++++++++++----- > 1 file changed, 37 insertions(+), 13 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 7f29640ceb7..3e0bb172e01 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 >@@ -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 ~%] >-- >2.39.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 40319
:
183842
|
183937