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

Bug 25070: Centralize member-display-alt-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>
This commit is contained in:
Jonathan Druart 2020-04-06 14:25:48 +02:00
parent c32d71978c
commit ac973d2d44
5 changed files with 78 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,16 +0,0 @@
[% IF ( patron.B_address or patron.B_address2 ) %]
[% IF ( patron.B_address ) %]
[% SET roadtype_desc = '' %]
[% IF patron.B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
[% END %]
<li class="patronaddress1">[% patron.B_address | html %][%IF roadtype_desc %] [% roadtype_desc | html %][% END %][% IF patron.B_streetnumber %] [% patron.B_streetnumber | html %][% END %]</li>
[% END %]
[% IF ( patron.B_address2 ) %]
<li class="patronaddress2">[% patron.B_address2 | html %]</li>
[% END %]
[% END %]
[% IF ( patron.B_city ) %]<li class="patroncity">
[%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %][% patron.B_city | html %][% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
[% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]</li>
[% END %]

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

@ -1,21 +0,0 @@
[% IF ( patron.B_address or patron.B_address2 ) %]
[% IF ( patron.B_address ) %]
[% SET roadtype_desc = '' %]
[% IF patron.B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
[% END %]
<li class="patronaddress1">[% IF patron.B_streetnumber %][% patron.B_streetnumber | html %][% END %]
[%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
[% patron.B_address | html %]
</li>
[% END %]
[% IF ( patron.B_address2 ) %]
<li class="patronaddress2">[% patron.B_address2 | html %]</li>
[% END %]
[% END %]
[% IF ( patron.B_city ) %]
<li class="patroncity">[%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %]
[% patron.B_city | html %]
[% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
[% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]</li>
[% END %]

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

@ -1,16 +0,0 @@
[% IF ( patron.B_address or patron.B_address2 ) %]
[% IF ( patron.B_address ) %]
[% SET roadtype_desc = '' %]
[% IF patron.B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
[% END %]
<li class="patronaddress1">[% if (patron.B_streetnumber) | html %][% patron.B_streetnumber | html %][% end | html %] [% patron.B_address | html %] [% IF roadtype_desc %][% roadtype_desc | html %] [% END %][% end | html %]</li>
[% END %]
[% IF ( patron.B_address2 ) %]
<li class="patronaddress2">[% patron.B_address2 | html %]</li>
[% END %]
[% END %]
[% IF ( patron.B_city ) %]<li class="patroncity">
[% patron.B_city | html %][% IF ( patron.B_state ) %], [% patron.B_state | html %][% END %]
[% patron.B_zipcode | html %][% IF ( patron.B_country ) %], [% patron.B_country | html %][% END %]</li>
[% END %]

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

@ -0,0 +1,76 @@
[% USE Koha %]
[% BLOCK 'display-alt-address-style' %]
[% IF Koha.Preference( 'AddressFormat' ) %]
[% PROCESS "member-alt-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" %]
[% ELSE %]
[% PROCESS 'member-alt-display-address-style-us' %]
[% END %]
[% END %]
[% BLOCK 'member-alt-display-address-style-us' %]
[% IF ( patron.B_address or patron.B_address2 ) %]
[% IF ( patron.B_address ) %]
[% SET roadtype_desc = '' %]
[% IF patron.B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
[% END %]
<li class="patronaddress1">[% if (patron.B_streetnumber) | html %][% patron.B_streetnumber | html %][% end | html %] [% patron.B_address | html %] [% IF roadtype_desc %][% roadtype_desc | html %] [% END %][% end | html %]</li>
[% END %]
[% IF ( patron.B_address2 ) %]
<li class="patronaddress2">[% patron.B_address2 | html %]</li>
[% END %]
[% END %]
[% IF ( patron.B_city ) %]
<li class="patroncity">
[% patron.B_city | html %][% IF ( patron.B_state ) %], [% patron.B_state | html %][% END %]
[% patron.B_zipcode | html %][% IF ( patron.B_country ) %], [% patron.B_country | html %][% END %]
</li>
[% END %]
[% END %]
[% BLOCK 'member-alt-display-address-style-de' %]
[% IF ( patron.B_address or patron.B_address2 ) %]
[% IF ( patron.B_address ) %]
[% SET roadtype_desc = '' %]
[% IF patron.B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
[% END %]
<li class="patronaddress1">[% patron.B_address | html %][%IF roadtype_desc %] [% roadtype_desc | html %][% END %][% IF patron.B_streetnumber %] [% patron.B_streetnumber | html %][% END %]</li>
[% END %]
[% IF ( patron.B_address2 ) %]
<li class="patronaddress2">[% patron.B_address2 | html %]</li>
[% END %]
[% END %]
[% IF ( patron.B_city ) %]
<li class="patroncity">
[%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %][% patron.B_city | html %][% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
[% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]
</li>
[% END %]
[% END %]
[% BLOCK 'member-alt-display-address-style-fr' %]
[% IF ( patron.B_address or patron.B_address2 ) %]
[% IF ( patron.B_address ) %]
[% SET roadtype_desc = '' %]
[% IF patron.B_streettype %]
[% SET roadtype_desc = AuthorisedValues.GetByCode('ROADTYPE', patron.B_streettype) %]
[% END %]
<li class="patronaddress1">[% IF patron.B_streetnumber %][% patron.B_streetnumber | html %][% END %]
[%IF roadtype_desc %][% roadtype_desc | html %] [% END %]
[% patron.B_address | html %]
</li>
[% END %]
[% IF ( patron.B_address2 ) %]
<li class="patronaddress2">[% patron.B_address2 | html %]</li>
[% END %]
[% END %]
[% IF ( patron.B_city ) %]
<li class="patroncity">
[%IF ( patron.B_zipcode ) %][% patron.B_zipcode | html %] [% END %]
[% patron.B_city | html %]
[% IF ( patron.B_state ) %]</br>[% patron.B_state | html %][% END %]
[% IF ( patron.B_country ) %]<br />[% patron.B_country | html %][% END %]
</li>
[% END %]
[% END %]

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

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