From 6f5d8a54a10b9c0aa3f422d5e8e97696bdf95d49 Mon Sep 17 00:00:00 2001 From: Jonathan Druart 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 ~%] -
  • [%~ if (patron.streetnumber) | html ~%][%~ patron.streetnumber |html ~%][%~ end | html ~%] [%~ patron.address | html ~%] [%~ IF roadtype_desc ~%][%~ roadtype_desc |html ~%] [%~ END ~%][%~ end | html ~%]
  • +
  • [%~ if (patron.streetnumber) | html ~%][%~ patron.streetnumber |html ~%][%~ end | html %] [% patron.address | html %] [% IF roadtype_desc ~%][%~ roadtype_desc |html %] [% END ~%][%~ end | html ~%]
  • [%~ END ~%] [%~ IF ( patron.address2 ) ~%]
  • [%~ patron.address2 |html ~%]
  • @@ -22,8 +22,8 @@ [%~ END ~%] [%~ IF ( patron.city ) ~%]
  • - [%~ 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 ~%]
  • [%~ END ~%] [%~ END ~%] @@ -35,7 +35,7 @@ [%~ IF patron.streettype ~%] [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%] [%~ END ~%] -
  • [%~ patron.address | html ~%][%~IF roadtype_desc ~%] [%~ roadtype_desc | html ~%][%~ END ~%][%~ IF patron.streetnumber ~%] [%~ patron.streetnumber | html ~%][%~ END ~%]
  • +
  • [%~ patron.address | html ~%][%~IF roadtype_desc %] [% roadtype_desc | html ~%][%~ END ~%][%~ IF patron.streetnumber %] [% patron.streetnumber | html ~%][%~ END ~%]
  • [%~ END ~%] [%~ IF ( patron.address2 ) ~%]
  • [%~ patron.address2 | html ~%]
  • @@ -43,7 +43,7 @@ [%~ END ~%] [%~ IF ( patron.city ) ~%]
  • - [%~ 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 ~%]
  • [%~ END ~%] @@ -56,8 +56,8 @@ [%~ IF patron.streettype ~%] [%~ SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.streettype) ~%] [%~ END ~%] -
  • [%~ IF patron.streetnumber ~%][%~ patron.streetnumber | html ~%] [%~ END ~%] - [%~IF roadtype_desc ~%][%~ roadtype_desc | html ~%] [%~ END ~%] +
  • [%~ IF patron.streetnumber ~%][%~ patron.streetnumber | html %] [% END ~%] + [%~IF roadtype_desc ~%][%~ roadtype_desc | html %] [% END ~%] [%~ patron.address | html ~%]
  • [%~ END ~%] @@ -67,7 +67,7 @@ [%~ END ~%] [%~ IF ( patron.city ) ~%]
  • - [%~ 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 ~%]
  • [%~ END ~%] -- 2.20.1