Attachment 107421 Details for Bug 22087 – Bug 22087: Add space between zipcode and country

[patch] Bug 22087: Add space between zipcode and country

Bug-22087-Add-space-between-zipcode-and-country.patch (text/plain), 5.12 KB, created by Jonathan Druart on 2020-07-27 13:54:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2020-07-27 13:54:32 UTC

Size: 5.12 KB

patch

obsolete

>From 6f5d8a54a10b9c0aa3f422d5e8e97696bdf95d49 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 6 Apr 2020 16:14:04 +0200
>Subject: [PATCH] Bug 22087: Add space between zipcode and country
>
>---
> .../intranet-tmpl/prog/css/src/staff-global.scss | 1 +
> .../en/includes/member-display-address-style.inc | 16 ++++++++--------
> 2 files changed, 9 insertions(+), 8 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>index 0c8a011c47..cf95f49d2d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>+++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
>@@ -2012,6 +2012,7 @@ li {
> clear: none;
> float: left;
> list-style: none;
>+ margin-left: 1ch;
> }
> }
> }
>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 eed70063c1..d2ef74ac2f 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
>@@ -14,7 +14,7 @@
> [%~ IF patron.streettype ~%]
> [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
> [%~ END ~%]
>- <li class="patronaddress1">[%~ if (patron.streetnumber) | html ~%][%~ patron.streetnumber |html ~%][%~ end | html ~%] [%~ patron.address | html ~%] [%~ IF roadtype_desc ~%][%~ roadtype_desc |html ~%] [%~ END ~%][%~ end | html ~%]</li>
>+ <li class="patronaddress1">[%~ if (patron.streetnumber) | html ~%][%~ patron.streetnumber |html ~%][%~ end | html %] [% patron.address | html %] [% IF roadtype_desc ~%][%~ roadtype_desc |html %] [% END ~%][%~ end | html ~%]</li>
> [%~ END ~%]
> [%~ IF ( patron.address2 ) ~%]
> <li class="patronaddress2">[%~ patron.address2 |html ~%]</li>
>@@ -22,8 +22,8 @@
> [%~ END ~%]
> [%~ IF ( patron.city ) ~%]
> <li class="patroncity">
>- [%~ patron.city |html ~%][%~ IF ( patron.state ) ~%], [%~ patron.state |html ~%][%~ END ~%]
>- [%~ patron.zipcode |html ~%][%~ IF ( patron.country ) ~%], [%~ patron.country |html ~%][%~ END ~%]
>+ [%~ patron.city |html ~%][%~ IF ( patron.state ) %], [% patron.state |html ~%][%~ END ~%]
>+ [%~ " " _ patron.zipcode |html ~%][%~ IF ( patron.country ) %], [% patron.country |html ~%][%~ END ~%]
> </li>
> [%~ END ~%]
> [%~ END ~%]
>@@ -35,7 +35,7 @@
> [%~ IF patron.streettype ~%]
> [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
> [%~ END ~%]
>- <li class="patronaddress1">[%~ patron.address | html ~%][%~IF roadtype_desc ~%] [%~ roadtype_desc | html ~%][%~ END ~%][%~ IF patron.streetnumber ~%] [%~ patron.streetnumber | html ~%][%~ END ~%]</li>
>+ <li class="patronaddress1">[%~ patron.address | html ~%][%~IF roadtype_desc %] [% roadtype_desc | html ~%][%~ END ~%][%~ IF patron.streetnumber %] [% patron.streetnumber | html ~%][%~ END ~%]</li>
> [%~ END ~%]
> [%~ IF ( patron.address2 ) ~%]
> <li class="patronaddress2">[%~ patron.address2 | html ~%]</li>
>@@ -43,7 +43,7 @@
> [%~ END ~%]
> [%~ IF ( patron.city ) ~%]
> <li class="patroncity">
>- [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html ~%] [%~ END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][%~ patron.state | html ~%][%~ END ~%]
>+ [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][%~ patron.state | html ~%][%~ END ~%]
> [%~ IF ( patron.country ) ~%] [%~ patron.country | html ~%][%~ END ~%]
> </li>
> [%~ END ~%]
>@@ -56,8 +56,8 @@
> [%~ IF patron.streettype ~%]
> [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%]
> [%~ END ~%]
>- <li class="patronaddress1">[%~ IF patron.streetnumber ~%][%~ patron.streetnumber | html ~%] [%~ END ~%]
>- [%~IF roadtype_desc ~%][%~ roadtype_desc | html ~%] [%~ END ~%]
>+ <li class="patronaddress1">[%~ IF patron.streetnumber ~%][%~ patron.streetnumber | html %] [% END ~%]
>+ [%~IF roadtype_desc ~%][%~ roadtype_desc | html %] [% END ~%]
> [%~ patron.address | html ~%]
> </li>
> [%~ END ~%]
>@@ -67,7 +67,7 @@
> [%~ END ~%]
> [%~ IF ( patron.city ) ~%]
> <li class="patroncity">
>- [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html ~%] [%~ END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][%~ patron.state | html ~%][%~ END ~%]
>+ [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][%~ patron.state | html ~%][%~ END ~%]
> [%~ IF ( patron.country ) ~%] [%~ patron.country | html ~%][%~ END ~%]
> </li>
> [%~ END ~%]
>-- 
>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