gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 25070: Centralize member-display-address-style 

Signed-off-by: David Nind <david@davidnind.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit c32d71978c)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2020-04-06 14:20:34 +02:00 committed by Lucas Gass
parent 5151dd349e
commit c2bcc0288d
9 changed files with 84 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
View File

@ -1,5 +1,6 @@
[% USE Koha %]
[% USE KohaDates %]
[% PROCESS 'member-display-address-style.inc' %]
[% IF ( patron.borrowernumber ) %]
<div class="patroninfo"><h5>[% INCLUDE 'patron-title.inc' %]</h5>
@ -29,11 +30,7 @@
<ul class="patronbriefinfo">
[% IF !(Koha.Preference('HidePersonalPatronDetailOnCirculation')) %]
[% IF Koha.Preference( 'AddressFormat' ) %]
[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
[% PROCESS 'display-address-style' %]
[% IF ( patron.phone || patron.mobile || patron.phonepro ) %]<li class="patronphone">
[% IF ( patron.phone ) %]

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

@ -1,16 +0,0 @@
[% IF ( patron.address or patron.address2 ) %]
[% IF ( patron.address ) %]
[% SET roadtype_desc = '' %]
[% 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>
[% END %]
[% IF ( patron.address2 ) %]
<li class="patronaddress2">[% patron.address2 | html %]</li>
[% END %]
[% 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.country ) %]<br />[% patron.country | html %][% END %]</li>
[% END %]

19
koha-tmpl/intranet-tmpl/prog/en/includes/member-display-address-style-fr.inc
View File

@ -1,19 +0,0 @@
[% IF ( patron.address or patron.address2 ) %]
[% IF ( patron.address ) %]
[% SET roadtype_desc = '' %]
[% 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 %]
[% patron.address | html %]
</li>
[% END %]
[% IF ( patron.address2 ) %]
<li class="patronaddress2">[% patron.address2 | html %]</li>
[% END %]
[% 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.country ) %]<br />[% patron.country | html %][% END %]</li>
[% END %]

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

@ -1,16 +0,0 @@
[% IF ( patron.address or patron.address2 ) %]
[% IF ( patron.address ) %]
[% SET roadtype_desc = '' %]
[% 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>
[% END %]
[% IF ( patron.address2 ) %]
<li class="patronaddress2">[% patron.address2 |html %]</li>
[% END %]
[% 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 %]</li>
[% END %]

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

@ -0,0 +1,74 @@
[% USE Koha %]
[% BLOCK 'display-address-style' %]
[% IF Koha.Preference( 'AddressFormat' ) %]
[% PROCESS "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
[% ELSE %]
[% PROCESS 'member-display-address-style-us' %]
[% END %]
[% END %]
[% BLOCK 'member-display-address-style-us' %]
[% IF ( patron.address or patron.address2 ) %]
[% IF ( patron.address ) %]
[% SET roadtype_desc = '' %]
[% 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>
[% END %]
[% IF ( patron.address2 ) %]
<li class="patronaddress2">[% patron.address2 |html %]</li>
[% END %]
[% 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 %]
</li>
[% END %]
[% END %]
[% BLOCK 'member-display-address-style-de' %]
[% IF ( patron.address or patron.address2 ) %]
[% IF ( patron.address ) %]
[% SET roadtype_desc = '' %]
[% 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>
[% END %]
[% IF ( patron.address2 ) %]
<li class="patronaddress2">[% patron.address2 | html %]</li>
[% END %]
[% 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.country ) %]<br />[% patron.country | html %][% END %]
</li>
[% END %]
[% END %]
[% BLOCK 'member-display-address-style-fr' %]
[% IF ( patron.address or patron.address2 ) %]
[% IF ( patron.address ) %]
[% SET roadtype_desc = '' %]
[% 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 %]
[% patron.address | html %]
</li>
[% END %]
[% IF ( patron.address2 ) %]
<li class="patronaddress2">[% patron.address2 | html %]</li>
[% END %]
[% 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.country ) %]<br />[% patron.country | html %][% END %]
</li>
[% END %]
[% END %]

7
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt
View File

@ -6,6 +6,7 @@
[% USE ItemTypes %]
[% USE AuthorisedValues %]
[% USE ColumnsSettings %]
[% PROCESS 'member-display-address-style.inc' %]
[% SET footerjs = 1 %]
[% BLOCK display_bormessagepref %]
[% IF ( bormessagepref ) %]
@ -23,11 +24,7 @@
[% END %]
[% BLOCK display_holdpatron_address %]
[% IF Koha.Preference( 'AddressFormat' ) %]
[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
[% PROCESS 'display-address-style' %]
[% END %]
[% INCLUDE 'doc-head-open.inc' %]

7
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-brief.tt
View File

@ -1,6 +1,7 @@
[% USE raw %]
[% USE Koha %]
[% USE KohaDates %]
[% PROCESS 'member-display-address-style.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
<title>Koha &rsaquo; Check duplicate patron</title>
@ -21,11 +22,7 @@
[% IF ( patron.othernames ) %]&ldquo;[% patron.othernames | html %]&rdquo;[% END %]
<div class = "address">
<ul>
[% IF Koha.Preference( 'AddressFormat' ) %]
[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
[% PROCESS 'display-address-style' %]
</ul>
</div>
<div class="rows">

7
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt
View File

@ -3,6 +3,7 @@
[% USE KohaDates %]
[% USE Price %]
[% USE ItemTypes %]
[% PROCESS 'member-display-address-style.inc' %]
[% SET footerjs = 1 %]
[% PROCESS 'accounts.inc' %]
@ -17,11 +18,7 @@
<h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=[% patron.cardnumber | uri %]">Account summary: [% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a></h3>
<ul>
[% IF Koha.Preference( 'AddressFormat' ) %]
[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
[% PROCESS 'display-address-style' %]
<li>[% IF ( patron.phone ) %][% patron.phone | html %][% ELSE %](no phone number on file)[% END %]</li>
<li>[% IF ( patron.email ) %][% patron.email | html %][% ELSE %](no primary email on file)[% END %]</li>
[% IF ( patron.emailpro ) %]

7
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
View File

@ -6,6 +6,7 @@
[% USE AuthorisedValues %]
[% USE ColumnsSettings %]
[% USE Price %]
[% PROCESS 'member-display-address-style.inc' %]
[% SET footerjs = 1 %]
[% INCLUDE 'doc-head-open.inc' %]
[% Asset.css("lib/jquery/plugins/rowGroup/stylesheets/rowGroup.dataTables.min.css") | $raw %]
@ -195,11 +196,7 @@
<div class="address">
<ul>
[% IF Koha.Preference( 'AddressFormat' ) %]
[% INCLUDE "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }.inc" %]
[% ELSE %]
[% INCLUDE 'member-display-address-style-us.inc' %]
[% END %]
[% PROCESS 'display-address-style' %]
</ul>
</div>