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

Bug 22087: Add space between zipcode and country

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:14:04 +02:00
parent 33f4bc949e
commit 2fac4017b7
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss
View file

@ -2012,6 +2012,7 @@ li {
clear: none;
float: left;
list-style: none;
margin-left: 1ch;
}
}
}

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

@ -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 ) ~%]</br>[%~ patron.state | html ~%][%~ END ~%]
[%~ 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 ~%]
</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 ) ~%]</br>[%~ patron.state | html ~%][%~ END ~%]
[%~ 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 ~%]
</li>
[%~ END ~%]