Bugzilla – Attachment 119559 Details for
Bug 27830
OPAC library list does not use AddressFormat
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 27830: (follow-up) Merge DE and FR address formats
Bug-27830-follow-up-Merge-DE-and-FR-address-format.patch (text/plain), 5.62 KB, created by
Owen Leonard
on 2021-04-14 11:38:46 UTC
(
hide
)
Description:
Bug 27830: (follow-up) Merge DE and FR address formats
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2021-04-14 11:38:46 UTC
Size:
5.62 KB
patch
obsolete
>From faac1254f225bbf4b2a412f52715534ee5b8097c Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Wed, 14 Apr 2021 11:35:17 +0000 >Subject: [PATCH] Bug 27830: (follow-up) Merge DE and FR address formats > >Library addresses don't include the use of "Street Type" and "Street >Number." DE and FR address formats differ only in the position of street >type and number in the address sequence. > >This patch merges DE and FR address markup and uses the unified block if >the address format system preference ISN'T "us". >--- > .../en/includes/display-library-address.inc | 61 +++++----------------- > 1 file changed, 14 insertions(+), 47 deletions(-) > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc >index 4b0e39e638..5d129115c1 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/display-library-address.inc >@@ -3,10 +3,10 @@ > [%~ BLOCK 'display-library-address' ~%] > [%~ SET line_break = "<br/>" ~%] > [%~ IF no_line_break %][% SET line_break = " " %][% END ~%] >- [%~ IF Koha.Preference( 'AddressFormat' ) ~%] >- [%~ PROCESS "display-library-address-${ Koha.Preference( 'AddressFormat' ) }" ~%] >- [%~ ELSE ~%] >+ [%~ IF Koha.Preference( 'AddressFormat' ) == "us" ~%] > [%~ PROCESS 'display-library-address-us' ~%] >+ [%~ ELSE ~%] >+ [%~ PROCESS 'display-library-address-de-fr' ~%] > [%~ END ~%] > [%~ END ~%] > >@@ -33,17 +33,11 @@ > [%~ END ~%] > [%~ IF ( library.branchcity ) ~%] > <div class="branchcity"> >- <span property="addressLocality"> >- [%~ library.branchcity |html ~%] >- </span> >- [%~ IF ( library.branchstate ) %] >- <span property="addressRegion"> >- , [% library.branchstate |html ~%] >- </span> >- [%~ END ~%] >+ <span property="addressLocality">[%~ library.branchcity |html ~%]</span> >+ [%~ IF ( library.branchstate ) %]<span property="addressRegion">, [% library.branchstate |html ~%]</span>[%~ END ~%] > [%~ IF ( library.branchzip ) %] > <span property="postalCode"> >- [%~ " " _ library.branchzip |html ~%] >+ [%~ library.branchzip |html ~%] > </span> > [%~ END ~%] > [%~ IF ( library.branchcountry ) %] >@@ -55,18 +49,20 @@ > [%~ END ~%] > [%~ END ~%] > >-[%~ BLOCK 'display-library-address-de' ~%] >+[%~ BLOCK 'display-library-address-de-fr' ~%] > [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%] > <span property="streetAddress"> > [%~ IF ( library.branchaddress1 ) ~%] >- <div class="branchaddress1"> >+ <span class="branchaddress1"> > [%~ library.branchaddress1 | html ~%] >- </div> >+ </span> >+ [% line_break | $raw %] > [%~ END ~%] > [%~ IF ( library.branchaddress2 ) ~%] >- <div class="branchaddress2"> >+ <span class="branchaddress2"> > [%~ library.branchaddress2 | html ~%] >- </div> >+ </span> >+ [% line_break | $raw %] > [%~ END ~%] > [%~ IF ( library.branchaddress3 ) ~%] > <span class="branchaddress3"> >@@ -77,37 +73,8 @@ > </span> > [%~ END ~%] > [%~ IF ( library.branchcity ) ~%] >- <div class="branchcity"> >- [%~ IF ( library.branchzip ) ~%]<span property="postalCode">[%~ library.branchzip | html %]</span> [% END ~%]<span property="addressLocality">[%~ library.branchcity | html ~%]</span>[%~ IF ( library.branchstate ) ~%][% line_break | $raw %][%~ library.branchstate | html ~%][%~ END ~%] >- [%~ IF ( library.branchcountry ) ~%][% line_break | $raw %][%~ library.branchcountry | html ~%][%~ END ~%] >- </div> >- [%~ END ~%] >-[%~ END ~%] >- >-[%~ BLOCK 'display-library-address-fr' ~%] >- [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%] >- [%~ IF ( library.branchaddress1 ) ~%] >- <span class="branchaddress1"> >- [%~ library.branchaddress1 | html ~%] >- </span> >- [% line_break | $raw %] >- [%~ END ~%] >- [%~ IF ( library.branchaddress2 ) ~%] >- <span class="branchaddress2"> >- [%~ library.branchaddress2 | html ~%] >- </span> >- [% line_break | $raw %] >- [%~ END ~%] >- [%~ IF ( library.branchaddress3 ) ~%] >- <span class="branchaddress3"> >- [%~ library.branchaddress3 | html ~%] >- </span> >- [% line_break | $raw %] >- [%~ END ~%] >- [%~ END ~%] >- [%~ IF ( library.branchcity ) ~%] > <span class="branchcity"> >- [%~ IF ( library.branchzip ) ~%][%~ library.branchzip | html %] [% END ~%][%~ library.branchcity | html ~%][%~ IF ( library.branchstate ) ~%][% line_break | $raw %]<span property="addressRegion">[%~ library.branchstate | html ~%]</span>[%~ END ~%] >+ [%~ IF ( library.branchzip ) ~%]<span property="postalCode">[%~ library.branchzip | html %]</span> [% END ~%]<span property="addressLocality">[%~ library.branchcity | html ~%]</span>[%~ IF ( library.branchstate ) ~%][% line_break | $raw %]<span property="addressRegion">[%~ library.branchstate | html ~%]</span>[%~ END ~%] > [%~ IF ( library.branchcountry ) ~%][% line_break | $raw %]<span property="addressCountry">[%~ library.branchcountry | html ~%]</span>[%~ END ~%] > </span> > [%~ END ~%] >-- >2.11.0
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 27830
:
117731
|
119438
|
119559
|
119807
|
119808