Bugzilla – Attachment 162516 Details for
Bug 36171
Extraction of Template Toolkit directive as translatable string causes patron view error in several languages
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 36171: Use FILTER collapse instead of tilde in address includes
Bug-36171-Use-FILTER-collapse-instead-of-tilde-in-.patch (text/plain), 82.04 KB, created by
Owen Leonard
on 2024-02-27 17:38:28 UTC
(
hide
)
Description:
Bug 36171: Use FILTER collapse instead of tilde in address includes
Filename:
MIME Type:
Creator:
Owen Leonard
Created:
2024-02-27 17:38:28 UTC
Size:
82.04 KB
patch
obsolete
>From 14e780c92d1e4a8774fd41347774f2e9c38a9dc8 Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >Date: Tue, 27 Feb 2024 16:59:01 +0000 >Subject: [PATCH] Bug 36171: Use FILTER collapse instead of tilde in address > includes > >A couple of our include files used for displaying addresses have "~" >added to every template directive in order to collapse whitespace in the >generated HTML. This seems to cause problems for the translation script >which was picking up the "SET" in "[% SET foo = 'bar' %]. > >This patch modifies the affected files and related files (for >consistency) to use '[% FILTER collapse %]'. This seems to fix the >problem. > >Note: This patch makes indentation changes, so ignore whitespace when >viewing the diff. > >To test, apply the patch and search for a patron in the staff interface. > >- View the patron detail page. All addresses, including alternate > address and alternative contact address, should be displayed > correctly. >- Edit the patron and confirm that the forms for entering those > addresses also look correct. >- Go to Administration -> System preferences and test using other > options for the "AddressFormat" preference. > >- In the OPAC, view the "Libraries" page. Confirm that addresses are > displayed correctly. > >- Rebuild the ru-RU templates to confirm that there is no error: > > perl misc/translator/translate update ru-RU > > perl misc/translator/translate install ru-RU > - Enable the language, if necessary, by updating the "language" and > "OPACLanguage" system preferences. > - Repeat the testing steps above. >--- > .../en/includes/member-alt-address-style.inc | 444 +++++++++--------- > .../en/includes/member-alt-contact-style.inc | 354 +++++++------- > .../includes/member-display-address-style.inc | 148 +++--- > .../member-display-alt-address-style.inc | 120 ++--- > .../en/includes/member-main-address-style.inc | 340 +++++++------- > .../en/includes/display-library-address.inc | 160 +++---- > 6 files changed, 789 insertions(+), 777 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc >index f358763c3b7..7b8304b08d6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-address-style.inc >@@ -1,252 +1,254 @@ > [% USE Koha %] > [% USE AuthorisedValues %] >-[% BLOCK 'alt-address-style' %] >- <fieldset class="rows" id="memberentry_address"> >- <legend id="alt_address_lgd">Alternate address</legend> >- <ol> >- [% IF Koha.Preference( 'AddressFormat' ) %] >- [% PROCESS "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }" %] >- [% ELSE %] >- [% PROCESS 'member-alt-address-style-us' %] >- [% END %] >- </ol> >- </fieldset> >-[% END %] >+[% FILTER collapse %] >+ [% BLOCK 'alt-address-style' %] >+ <fieldset class="rows" id="memberentry_address"> >+ <legend id="alt_address_lgd">Alternate address</legend> >+ <ol> >+ [% IF Koha.Preference( 'AddressFormat' ) %] >+ [% PROCESS "member-alt-address-style-${ Koha.Preference( 'AddressFormat' ) }" %] >+ [% ELSE %] >+ [% PROCESS 'member-alt-address-style-us' %] >+ [% END %] >+ </ol> >+ </fieldset> >+ [% END %] >+ >+ [% BLOCK 'member-alt-address-style-us' %] >+ [% PROCESS 'alt-address-style_B_streetnumber' %] >+ [% PROCESS 'alt-address-style_roadtypes' %] >+ [% PROCESS 'alt-address-style_B_address' %] >+ [% PROCESS 'alt-address-style_B_address2' %] >+ [% PROCESS 'alt-address-style_B_city' %] >+ [% PROCESS 'alt-address-style_B_state' %] >+ [% PROCESS 'alt-address-style_B_zipcode' %] >+ [% PROCESS 'alt-address-style_B_country' %] >+ [% PROCESS 'alt-address-style_B_phone' %] >+ [% PROCESS 'alt-address-style_B_email' %] >+ [% PROCESS 'alt-address-style_B_contactnote' %] >+ [% END %] > >-[% BLOCK 'member-alt-address-style-us' %] >- [% PROCESS 'alt-address-style_B_streetnumber' %] >- [% PROCESS 'alt-address-style_roadtypes' %] >- [% PROCESS 'alt-address-style_B_address' %] >- [% PROCESS 'alt-address-style_B_address2' %] >- [% PROCESS 'alt-address-style_B_city' %] >- [% PROCESS 'alt-address-style_B_state' %] >- [% PROCESS 'alt-address-style_B_zipcode' %] >- [% PROCESS 'alt-address-style_B_country' %] >- [% PROCESS 'alt-address-style_B_phone' %] >- [% PROCESS 'alt-address-style_B_email' %] >- [% PROCESS 'alt-address-style_B_contactnote' %] >-[% END %] >+ [% BLOCK 'member-alt-address-style-de' %] >+ [% PROCESS 'alt-address-style_roadtypes' %] >+ [% PROCESS 'alt-address-style_B_address' %] >+ [% PROCESS 'alt-address-style_B_streetnumber' %] >+ [% PROCESS 'alt-address-style_B_address2' %] >+ [% PROCESS 'alt-address-style_B_zipcode' %] >+ [% PROCESS 'alt-address-style_B_city' %] >+ [% PROCESS 'alt-address-style_B_state' %] >+ [% PROCESS 'alt-address-style_B_country' %] >+ [% PROCESS 'alt-address-style_B_phone' %] >+ [% PROCESS 'alt-address-style_B_email' %] >+ [% PROCESS 'alt-address-style_B_contactnote' %] >+ [% END %] > >-[% BLOCK 'member-alt-address-style-de' %] >- [% PROCESS 'alt-address-style_roadtypes' %] >- [% PROCESS 'alt-address-style_B_address' %] >- [% PROCESS 'alt-address-style_B_streetnumber' %] >- [% PROCESS 'alt-address-style_B_address2' %] >- [% PROCESS 'alt-address-style_B_zipcode' %] >- [% PROCESS 'alt-address-style_B_city' %] >- [% PROCESS 'alt-address-style_B_state' %] >- [% PROCESS 'alt-address-style_B_country' %] >- [% PROCESS 'alt-address-style_B_phone' %] >- [% PROCESS 'alt-address-style_B_email' %] >- [% PROCESS 'alt-address-style_B_contactnote' %] >-[% END %] >+ [% BLOCK 'member-alt-address-style-fr' %] >+ [% PROCESS 'alt-address-style_B_streetnumber' %] >+ [% PROCESS 'alt-address-style_roadtypes' %] >+ [% PROCESS 'alt-address-style_B_address' %] >+ [% PROCESS 'alt-address-style_B_address2' %] >+ [% PROCESS 'alt-address-style_B_zipcode' %] >+ [% PROCESS 'alt-address-style_B_city' %] >+ [% PROCESS 'alt-address-style_B_state' %] >+ [% PROCESS 'alt-address-style_B_country' %] >+ [% PROCESS 'alt-address-style_B_phone' %] >+ [% PROCESS 'alt-address-style_B_email' %] >+ [% PROCESS 'alt-address-style_B_contactnote' %] >+ [% END %] > >-[% BLOCK 'member-alt-address-style-fr' %] >- [% PROCESS 'alt-address-style_B_streetnumber' %] >- [% PROCESS 'alt-address-style_roadtypes' %] >- [% PROCESS 'alt-address-style_B_address' %] >- [% PROCESS 'alt-address-style_B_address2' %] >- [% PROCESS 'alt-address-style_B_zipcode' %] >- [% PROCESS 'alt-address-style_B_city' %] >- [% PROCESS 'alt-address-style_B_state' %] >- [% PROCESS 'alt-address-style_B_country' %] >- [% PROCESS 'alt-address-style_B_phone' %] >- [% PROCESS 'alt-address-style_B_email' %] >- [% PROCESS 'alt-address-style_B_contactnote' %] >-[% END %] >+ [% BLOCK 'alt-address-style_roadtypes' %] >+ [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %] >+ [% IF roadtypes.count %] >+ [% UNLESS noB_streettype %] >+ <li> >+ [% IF ( mandatoryB_streettype ) %] >+ <label for="B_streettype" class="required"> >+ [% ELSE %] >+ <label for="B_streettype"> >+ [% END %] >+ Street type: </label> >+ <select name="B_streettype"> >+ <option value=""></option> >+ [% FOR roadtype IN roadtypes %] >+ [% IF roadtype.authorised_value == patron.B_streettype %] >+ <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option> >+ [% ELSE %] >+ <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] >+ [% END %] >+ [% END %] > >-[% BLOCK 'alt-address-style_roadtypes' %] >- [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %] >- [% IF roadtypes.count %] >- [% UNLESS noB_streettype %] >+ [% BLOCK 'alt-address-style_B_address' %] >+ [% UNLESS noB_address %] > <li> >- [% IF ( mandatoryB_streettype ) %] >- <label for="B_streettype" class="required"> >+ [% IF ( mandatoryB_address ) %] >+ <label for="B_address" class="required"> > [% ELSE %] >- <label for="B_streettype"> >+ <label for="B_address"> > [% END %] >- Street type: </label> >- <select name="B_streettype"> >- <option value=""></option> >- [% FOR roadtype IN roadtypes %] >- [% IF roadtype.authorised_value == patron.B_streettype %] >- <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option> >- [% ELSE %] >- <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option> >- [% END %] >- [% END %] >- </select> >- [% IF ( mandatoryB_streettype ) %]<span class="required">Required</span>[% END %] >+ Address: </label> >+ <input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address | html %]" /> >+ [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-address-style_B_address' %] >- [% UNLESS noB_address %] >- <li> >- [% IF ( mandatoryB_address ) %] >- <label for="B_address" class="required"> >- [% ELSE %] >- <label for="B_address"> >- [% END %] >- Address: </label> >- <input type="text" id="B_address" name="B_address" size="40" value="[% patron.B_address | html %]" /> >- [% IF ( mandatoryB_address ) %]<span class="required">Required</span>[% END %] >- </li> >- [% END %] >-[% END %] >- >-[% BLOCK 'alt-address-style_B_streetnumber' %] >- [% UNLESS noB_streetnumber %] >- <li> >- [% IF ( mandatoryB_streetnumber ) %] >- <label for="B_streetnumber" class="required"> >- [% ELSE %] >- <label for="B_streetnumber"> >- [% END %] >- Street number: </label> >- <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" maxlength="10" value="[% patron.B_streetnumber | html %]" /> >- [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-address-style_B_streetnumber' %] >+ [% UNLESS noB_streetnumber %] >+ <li> >+ [% IF ( mandatoryB_streetnumber ) %] >+ <label for="B_streetnumber" class="required"> >+ [% ELSE %] >+ <label for="B_streetnumber"> >+ [% END %] >+ Street number: </label> >+ <input type="text" id="B_streetnumber" name="B_streetnumber" size="5" maxlength="10" value="[% patron.B_streetnumber | html %]" /> >+ [% IF ( mandatoryB_streetnumber ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-address-style_B_address2' %] >- [% UNLESS noB_address2 %] >- <li> >- [% IF ( mandatoryB_address2 ) %] >- <label for="B_address2" class="required"> >- [% ELSE %] >- <label for="B_address2"> >- [% END %] >- Address 2: </label> >- <input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 | html %]" /> >- [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-address-style_B_address2' %] >+ [% UNLESS noB_address2 %] >+ <li> >+ [% IF ( mandatoryB_address2 ) %] >+ <label for="B_address2" class="required"> >+ [% ELSE %] >+ <label for="B_address2"> >+ [% END %] >+ Address 2: </label> >+ <input type="text" id="B_address2" name="B_address2" size="40" value="[% patron.B_address2 | html %]" /> >+ [% IF ( mandatoryB_address2 ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-address-style_B_zipcode' %] >- [% UNLESS noB_zipcode %] >- <li> >- [% IF ( mandatoryB_zipcode ) %] >- <label for="B_zipcode" class="required"> >- [% ELSE %] >- <label for="B_zipcode"> >- [% END %] >- ZIP/Postal code: </label> >- <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode | html %]" /> >- [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-address-style_B_zipcode' %] >+ [% UNLESS noB_zipcode %] >+ <li> >+ [% IF ( mandatoryB_zipcode ) %] >+ <label for="B_zipcode" class="required"> >+ [% ELSE %] >+ <label for="B_zipcode"> >+ [% END %] >+ ZIP/Postal code: </label> >+ <input type="text" id="B_zipcode" name="B_zipcode" maxlength="10" size="10" value="[% patron.B_zipcode | html %]" /> >+ [% IF ( mandatoryB_zipcode ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-address-style_B_city' %] >- [% UNLESS noB_city %] >- <li> >- [% IF ( mandatoryB_city ) %] >- <label for="B_city" class="required" > >- [% ELSE %] >- <label for="B_city"> >- [% END %] >- City: </label> >- [% IF cities.count %] >- <select class="select_city" data-addressfield="B_" name="select_city"> >- <option value="|||"></option> >- [% FOREACH c IN cities %] >- [% IF c.city_name == patron.B_city && c.city_state == patron.B_state && c.city_zipcode == patron.B_zipcode %] >- <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected"> >- [% ELSE %] >- <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]"> >+ [% BLOCK 'alt-address-style_B_city' %] >+ [% UNLESS noB_city %] >+ <li> >+ [% IF ( mandatoryB_city ) %] >+ <label for="B_city" class="required" > >+ [% ELSE %] >+ <label for="B_city"> >+ [% END %] >+ City: </label> >+ [% IF cities.count %] >+ <select class="select_city" data-addressfield="B_" name="select_city"> >+ <option value="|||"></option> >+ [% FOREACH c IN cities %] >+ [% IF c.city_name == patron.B_city && c.city_state == patron.B_state && c.city_zipcode == patron.B_zipcode %] >+ <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected"> >+ [% ELSE %] >+ <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]"> >+ [% END %] >+ [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %] >+ </option> > [% END %] >- [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %] >- </option> >- [% END %] >- </select> >- <span class="hint">or enter</span> >- [% END %] >- <input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city | html %]" /> >- [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %] >- </li> >+ </select> >+ <span class="hint">or enter</span> >+ [% END %] >+ <input type="text" id="B_city" name="B_city" size="20" value="[% patron.B_city | html %]" /> >+ [% IF ( mandatoryB_city ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-address-style_B_state' %] >- [% UNLESS noB_state %] >- <li> >- [% IF ( mandatoryB_state ) %] >- <label for="B_state" class="required" > >- [% ELSE %] >- <label for="B_state"> >- [% END %] >- State: </label> >- <input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state | html %]" /> >- [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-address-style_B_state' %] >+ [% UNLESS noB_state %] >+ <li> >+ [% IF ( mandatoryB_state ) %] >+ <label for="B_state" class="required" > >+ [% ELSE %] >+ <label for="B_state"> >+ [% END %] >+ State: </label> >+ <input type="text" id="B_state" name="B_state" size="20" value="[% patron.B_state | html %]" /> >+ [% IF ( mandatoryB_state ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-address-style_B_country' %] >- [% UNLESS noB_country %] >- <li> >- [% IF ( mandatoryB_country ) %] >- <label for="B_country" class="required"> >- [% ELSE %] >- <label for="B_country"> >- [% END %] >- Country: </label> >- <input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country | html %]" /> >- [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-address-style_B_country' %] >+ [% UNLESS noB_country %] >+ <li> >+ [% IF ( mandatoryB_country ) %] >+ <label for="B_country" class="required"> >+ [% ELSE %] >+ <label for="B_country"> >+ [% END %] >+ Country: </label> >+ <input type="text" id="B_country" name="B_country" size="20" value="[% patron.B_country | html %]" /> >+ [% IF ( mandatoryB_country ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-address-style_B_phone' %] >- [% UNLESS noB_phone %] >- <li> >- [% IF ( mandatoryB_phone ) %] >- <label for="B_phone" class="required"> >- [% ELSE %] >- <label for="B_phone"> >- [% END %] >- Phone: </label> >- <input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone | html %]" /> >- [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-address-style_B_phone' %] >+ [% UNLESS noB_phone %] >+ <li> >+ [% IF ( mandatoryB_phone ) %] >+ <label for="B_phone" class="required"> >+ [% ELSE %] >+ <label for="B_phone"> >+ [% END %] >+ Phone: </label> >+ <input type="text" id="B_phone" name="B_phone" value="[% patron.B_phone | html %]" /> >+ [% IF ( mandatoryB_phone ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-address-style_B_email' %] >- [% UNLESS noB_email %] >- <li> >- [% IF ( mandatoryB_email ) %] >- <label for="B_email" class="required"> >- [% ELSE %] >- <label for="B_email"> >- [% END %] >- Email: </label> >- [% IF ( NoUpdateEmail ) %] >- <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email | html %]" disabled="disabled"/> >- [% ELSE %] >- <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email | html %]" /> >- [% END %] >- [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-address-style_B_email' %] >+ [% UNLESS noB_email %] >+ <li> >+ [% IF ( mandatoryB_email ) %] >+ <label for="B_email" class="required"> >+ [% ELSE %] >+ <label for="B_email"> >+ [% END %] >+ Email: </label> >+ [% IF ( NoUpdateEmail ) %] >+ <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email | html %]" disabled="disabled"/> >+ [% ELSE %] >+ <input type="text" id="B_email" name="B_email" size="45" value="[% patron.B_email | html %]" /> >+ [% END %] >+ [% IF ( mandatoryB_email ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-address-style_B_contactnote' %] >- [% UNLESS nocontactnote %] >- <li> >- [% IF ( mandatorycontactnote ) %] >- <label for="contactnote" class="required"> >- [% ELSE %] >- <label for="contactnote"> >- [% END %] >- Contact note: </label> >- <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% patron.contactnote | html %]</textarea> >- [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-address-style_B_contactnote' %] >+ [% UNLESS nocontactnote %] >+ <li> >+ [% IF ( mandatorycontactnote ) %] >+ <label for="contactnote" class="required"> >+ [% ELSE %] >+ <label for="contactnote"> >+ [% END %] >+ Contact note: </label> >+ <textarea id="contactnote" name="contactnote" cols="40" rows="2">[% patron.contactnote | html %]</textarea> >+ [% IF ( mandatorycontactnote ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] >+[% END # /FILTER collapse %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc >index 6211c412af6..992201a4e65 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-alt-contact-style.inc >@@ -1,199 +1,201 @@ > [% USE Koha %] >-[% BLOCK 'alt-contact-style' %] >- <fieldset class="rows" id="memberentry_altaddress"> >- <legend id="alt_contact_lgd">Alternate contact</legend> >- <ol> >- [% IF Koha.Preference( 'AddressFormat' ) %] >- [% PROCESS "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }" %] >- [% ELSE %] >- [% PROCESS 'member-alt-contact-style-us' %] >- [% END %] >- </ol> >- </fieldset> >-[% END %] >+[% FILTER collapse %] >+ [% BLOCK 'alt-contact-style' %] >+ <fieldset class="rows" id="memberentry_altaddress"> >+ <legend id="alt_contact_lgd">Alternate contact</legend> >+ <ol> >+ [% IF Koha.Preference( 'AddressFormat' ) %] >+ [% PROCESS "member-alt-contact-style-${ Koha.Preference( 'AddressFormat' ) }" %] >+ [% ELSE %] >+ [% PROCESS 'member-alt-contact-style-us' %] >+ [% END %] >+ </ol> >+ </fieldset> >+ [% END %] > >-[% BLOCK 'member-alt-contact-style-us' %] >- [% PROCESS 'alt-contact-style_altcontactsurname' %] >- [% PROCESS 'alt-contact-style_altcontactfirstname' %] >- [% PROCESS 'alt-contact-style_altcontactaddress1' %] >- [% PROCESS 'alt-contact-style_altcontactaddress2' %] >- [% PROCESS 'alt-contact-style_altcontactaddress3' %] >- [% PROCESS 'alt-contact-style_altcontactstate' %] >- [% PROCESS 'alt-contact-style_altcontactzipcode' %] >- [% PROCESS 'alt-contact-style_altcontactcountry' %] >- [% PROCESS 'alt-contact-style_altcontactphone' %] >-[% END %] >+ [% BLOCK 'member-alt-contact-style-us' %] >+ [% PROCESS 'alt-contact-style_altcontactsurname' %] >+ [% PROCESS 'alt-contact-style_altcontactfirstname' %] >+ [% PROCESS 'alt-contact-style_altcontactaddress1' %] >+ [% PROCESS 'alt-contact-style_altcontactaddress2' %] >+ [% PROCESS 'alt-contact-style_altcontactaddress3' %] >+ [% PROCESS 'alt-contact-style_altcontactstate' %] >+ [% PROCESS 'alt-contact-style_altcontactzipcode' %] >+ [% PROCESS 'alt-contact-style_altcontactcountry' %] >+ [% PROCESS 'alt-contact-style_altcontactphone' %] >+ [% END %] > >-[% BLOCK 'member-alt-contact-style-de' %] >- [% PROCESS 'alt-contact-style_altcontactsurname' %] >- [% PROCESS 'alt-contact-style_altcontactfirstname' %] >- [% PROCESS 'alt-contact-style_altcontactaddress1' %] >- [% PROCESS 'alt-contact-style_altcontactaddress2' %] >- [% PROCESS 'alt-contact-style_altcontactzipcode' %] >- [% PROCESS 'alt-contact-style_altcontactaddress3' %] >- [% PROCESS 'alt-contact-style_altcontactstate' %] >- [% PROCESS 'alt-contact-style_altcontactcountry' %] >- [% PROCESS 'alt-contact-style_altcontactphone' %] >-[% END %] >+ [% BLOCK 'member-alt-contact-style-de' %] >+ [% PROCESS 'alt-contact-style_altcontactsurname' %] >+ [% PROCESS 'alt-contact-style_altcontactfirstname' %] >+ [% PROCESS 'alt-contact-style_altcontactaddress1' %] >+ [% PROCESS 'alt-contact-style_altcontactaddress2' %] >+ [% PROCESS 'alt-contact-style_altcontactzipcode' %] >+ [% PROCESS 'alt-contact-style_altcontactaddress3' %] >+ [% PROCESS 'alt-contact-style_altcontactstate' %] >+ [% PROCESS 'alt-contact-style_altcontactcountry' %] >+ [% PROCESS 'alt-contact-style_altcontactphone' %] >+ [% END %] > >-[% BLOCK 'member-alt-contact-style-fr' %] >- [% PROCESS 'alt-contact-style_altcontactsurname' %] >- [% PROCESS 'alt-contact-style_altcontactfirstname' %] >- [% PROCESS 'alt-contact-style_altcontactaddress1' %] >- [% PROCESS 'alt-contact-style_altcontactaddress2' %] >- [% PROCESS 'alt-contact-style_altcontactzipcode' %] >- [% PROCESS 'alt-contact-style_altcontactaddress3' %] >- [% PROCESS 'alt-contact-style_altcontactstate' %] >- [% PROCESS 'alt-contact-style_altcontactcountry' %] >- [% PROCESS 'alt-contact-style_altcontactphone' %] >-[% END %] >+ [% BLOCK 'member-alt-contact-style-fr' %] >+ [% PROCESS 'alt-contact-style_altcontactsurname' %] >+ [% PROCESS 'alt-contact-style_altcontactfirstname' %] >+ [% PROCESS 'alt-contact-style_altcontactaddress1' %] >+ [% PROCESS 'alt-contact-style_altcontactaddress2' %] >+ [% PROCESS 'alt-contact-style_altcontactzipcode' %] >+ [% PROCESS 'alt-contact-style_altcontactaddress3' %] >+ [% PROCESS 'alt-contact-style_altcontactstate' %] >+ [% PROCESS 'alt-contact-style_altcontactcountry' %] >+ [% PROCESS 'alt-contact-style_altcontactphone' %] >+ [% END %] > >-[% BLOCK 'alt-contact-style_altcontactsurname' %] >- [% UNLESS noaltcontactsurname %] >- <li> >- [% IF ( mandatoryaltcontactsurname ) %] >- <label for="altcontactsurname" class="required"> >- [% ELSE %] >- <label for="altcontactsurname"> >- [% END %] >- Surname: </label> >- <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname | html %]" /> >- [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-contact-style_altcontactsurname' %] >+ [% UNLESS noaltcontactsurname %] >+ <li> >+ [% IF ( mandatoryaltcontactsurname ) %] >+ <label for="altcontactsurname" class="required"> >+ [% ELSE %] >+ <label for="altcontactsurname"> >+ [% END %] >+ Surname: </label> >+ <input type="text" name="altcontactsurname" id="altcontactsurname" value="[% patron.altcontactsurname | html %]" /> >+ [% IF ( mandatoryaltcontactsurname ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-contact-style_altcontactfirstname' %] >- [% UNLESS noaltcontactfirstname %] >- <li> >- [% IF ( mandatoryaltcontactfirstname ) %] >- <label for="altcontactfirstname" class="required"> >- [% ELSE %] >- <label for="altcontactfirstname"> >- [% END %] >- First name: </label> >- <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname | html %]" /> >- [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-contact-style_altcontactfirstname' %] >+ [% UNLESS noaltcontactfirstname %] >+ <li> >+ [% IF ( mandatoryaltcontactfirstname ) %] >+ <label for="altcontactfirstname" class="required"> >+ [% ELSE %] >+ <label for="altcontactfirstname"> >+ [% END %] >+ First name: </label> >+ <input type="text" name="altcontactfirstname" id="altcontactfirstname" value="[% patron.altcontactfirstname | html %]" /> >+ [% IF ( mandatoryaltcontactfirstname ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-contact-style_altcontactaddress1' %] >- [% UNLESS noaltcontactaddress1 %] >- <li> >- [% IF ( mandatoryaltcontactaddress1 ) %] >- <label for="altcontactaddress1" class="required"> >- [% ELSE %] >- <label for="altcontactaddress1"> >- [% END %] >- Address: </label> >- <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 | html %]" size="40" /> >- [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-contact-style_altcontactaddress1' %] >+ [% UNLESS noaltcontactaddress1 %] >+ <li> >+ [% IF ( mandatoryaltcontactaddress1 ) %] >+ <label for="altcontactaddress1" class="required"> >+ [% ELSE %] >+ <label for="altcontactaddress1"> >+ [% END %] >+ Address: </label> >+ <input type="text" name="altcontactaddress1" id="altcontactaddress1" value="[% patron.altcontactaddress1 | html %]" size="40" /> >+ [% IF ( mandatoryaltcontactaddress1 ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-contact-style_altcontactaddress2' %] >- [% UNLESS noaltcontactaddress2 %] >- <li> >- [% IF ( mandatoryaltcontactaddress2 ) %] >- <label for="altcontactaddress2" class="required"> >- [% ELSE %] >- <label for="altcontactaddress2"> >- [% END %] >- Address 2: </label> >- <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 | html %]" size="40" /> >- [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-contact-style_altcontactaddress2' %] >+ [% UNLESS noaltcontactaddress2 %] >+ <li> >+ [% IF ( mandatoryaltcontactaddress2 ) %] >+ <label for="altcontactaddress2" class="required"> >+ [% ELSE %] >+ <label for="altcontactaddress2"> >+ [% END %] >+ Address 2: </label> >+ <input type="text" name="altcontactaddress2" id="altcontactaddress2" value="[% patron.altcontactaddress2 | html %]" size="40" /> >+ [% IF ( mandatoryaltcontactaddress2 ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-contact-style_altcontactzipcode' %] >- [% UNLESS noaltcontactzipcode %] >- <li> >- [% IF ( mandatoryaltcontactzipcode ) %] >- <label for="altcontactzipcode" class="required"> >- [% ELSE %] >- <label for="altcontactzipcode"> >- [% END %] >- ZIP/Postal code: </label> >-<input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode | html %]" size="5" /> >- [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-contact-style_altcontactzipcode' %] >+ [% UNLESS noaltcontactzipcode %] >+ <li> >+ [% IF ( mandatoryaltcontactzipcode ) %] >+ <label for="altcontactzipcode" class="required"> >+ [% ELSE %] >+ <label for="altcontactzipcode"> >+ [% END %] >+ ZIP/Postal code: </label> >+ <input type="text" name="altcontactzipcode" id="altcontactzipcode" value="[% patron.altcontactzipcode | html %]" size="5" /> >+ [% IF ( mandatoryaltcontactzipcode ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-contact-style_altcontactaddress3' %] >- [% UNLESS noaltcontactaddress3 %] >- <li> >- [% IF ( mandatoryaltcontactaddress3 ) %] >- <label for="altcontactaddress3" class="required"> >- [% ELSE %] >- <label for="altcontactaddress3"> >- [% END %] >- City: </label> >- [% IF cities.count %] >- <select class="select_city" data-addressfield="altcontact" name="select_city"> >- <option value="|||"></option> >- [% FOREACH c IN cities %] >- [% IF c.city_name == patron.altcontactaddress3 && c.city_state == patron.altcontactstate && c.city_zipcode == patron.altcontactzipcode %] >- <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected"> >- [% ELSE %] >- <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]"> >+ [% BLOCK 'alt-contact-style_altcontactaddress3' %] >+ [% UNLESS noaltcontactaddress3 %] >+ <li> >+ [% IF ( mandatoryaltcontactaddress3 ) %] >+ <label for="altcontactaddress3" class="required"> >+ [% ELSE %] >+ <label for="altcontactaddress3"> >+ [% END %] >+ City: </label> >+ [% IF cities.count %] >+ <select class="select_city" data-addressfield="altcontact" name="select_city"> >+ <option value="|||"></option> >+ [% FOREACH c IN cities %] >+ [% IF c.city_name == patron.altcontactaddress3 && c.city_state == patron.altcontactstate && c.city_zipcode == patron.altcontactzipcode %] >+ <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected"> >+ [% ELSE %] >+ <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]"> >+ [% END %] >+ [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %] >+ </option> > [% END %] >- [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %] >- </option> >- [% END %] >- </select> >- <span class="hint">or enter</span> >- [% END %] >- <input type="text" name="altcontactaddress3" id="altcontactcity" value="[% patron.altcontactaddress3 | html %]" size="20" /> >- [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %] >- </li> >+ </select> >+ <span class="hint">or enter</span> >+ [% END %] >+ <input type="text" name="altcontactaddress3" id="altcontactcity" value="[% patron.altcontactaddress3 | html %]" size="20" /> >+ [% IF ( mandatoryaltcontactaddress3 ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-contact-style_altcontactstate' %] >- [% UNLESS noaltcontactstate %] >- <li> >- [% IF ( mandatoryaltcontactstate ) %] >- <label for="altcontactstate" class="required"> >- [% ELSE %] >- <label for="altcontactstate"> >- [% END %] >- State: </label> >- <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate | html %]" size="20" /> >- [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-contact-style_altcontactstate' %] >+ [% UNLESS noaltcontactstate %] >+ <li> >+ [% IF ( mandatoryaltcontactstate ) %] >+ <label for="altcontactstate" class="required"> >+ [% ELSE %] >+ <label for="altcontactstate"> >+ [% END %] >+ State: </label> >+ <input type="text" name="altcontactstate" id="altcontactstate" value="[% patron.altcontactstate | html %]" size="20" /> >+ [% IF ( mandatoryaltcontactstate ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-contact-style_altcontactcountry' %] >- [% UNLESS noaltcontactcountry %] >- <li> >- [% IF ( mandatoryaltcontactcountry ) %] >- <label for="altcontactcountry" class="required"> >- [% ELSE %] >- <label for="altcontactcountry"> >- [% END %] >- Country: </label> >- <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry | html %]" size="20" /> >- [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-contact-style_altcontactcountry' %] >+ [% UNLESS noaltcontactcountry %] >+ <li> >+ [% IF ( mandatoryaltcontactcountry ) %] >+ <label for="altcontactcountry" class="required"> >+ [% ELSE %] >+ <label for="altcontactcountry"> >+ [% END %] >+ Country: </label> >+ <input type="text" name="altcontactcountry" id="altcontactcountry" value="[% patron.altcontactcountry | html %]" size="20" /> >+ [% IF ( mandatoryaltcontactcountry ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'alt-contact-style_altcontactphone' %] >- [% UNLESS noaltcontactphone %] >- <li> >- [% IF ( mandatoryaltcontactphone ) %] >- <label for="altcontactphone" class="required"> >- [% ELSE %] >- <label for="altcontactphone"> >- [% END %] >- Phone: </label> >- <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone | html %]" /> >- [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'alt-contact-style_altcontactphone' %] >+ [% UNLESS noaltcontactphone %] >+ <li> >+ [% IF ( mandatoryaltcontactphone ) %] >+ <label for="altcontactphone" class="required"> >+ [% ELSE %] >+ <label for="altcontactphone"> >+ [% END %] >+ Phone: </label> >+ <input type="text" name="altcontactphone" id="altcontactphone" value="[% patron.altcontactphone | html %]" /> >+ [% IF ( mandatoryaltcontactphone ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] >+[% END # /FILTER collapse %] >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 83fa575bd11..8fe1ab15b55 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 >@@ -1,77 +1,79 @@ >-[%~ USE Koha ~%] >-[%~ USE raw ~%] >-[%~ BLOCK 'display-address-style' ~%] >- [%~ SET line_break = "<br/>" ~%] >- [%~ IF no_line_break %][% SET line_break = " " %][% END ~%] >- [%~ IF Koha.Preference( 'AddressFormat' ) ~%] >- [%~ PROCESS "member-display-address-style-${ Koha.Preference( 'AddressFormat' ) }" ~%] >- [%~ ELSE ~%] >- [%~ PROCESS 'member-display-address-style-us' ~%] >- [%~ END ~%] >-[%~ END ~%] >+[% USE Koha %] >+[% USE raw %] >+[% FILTER collapse %] >+ [% BLOCK 'display-address-style' %] >+ [% SET line_break = "<br/>" %] >+ [% IF no_line_break %][% SET line_break = " " %][% END %] >+ [% 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 || patron.zipcode || patron.state || patron.country ) ~%] >- <li class="patroncity"> >- [%~ patron.city |html ~%][%~ IF ( patron.state ) %][%~ IF ( patron.city ) ~%], [% END ~%][% patron.state |html ~%][%~ END ~%] >- [%~ IF ( patron.zipcode ) %][%~ " " _ patron.zipcode |html ~%][% END %][%~ IF ( patron.country ) %][%~ IF ( patron.zipcode || patron.state || patron.city ) ~%], [% END ~%][% patron.country |html ~%][%~ END ~%] >- </li> >- [%~ 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 || patron.zipcode || patron.state || patron.country ) %] >+ <li class="patroncity"> >+ [% patron.city |html %][% IF ( patron.state ) %][% IF ( patron.city ) %], [% END %][% patron.state |html %][% END %] >+ [% IF ( patron.zipcode ) %][% " " _ patron.zipcode |html %][% END %][% IF ( patron.country ) %][% IF ( patron.zipcode || patron.state || patron.city ) %], [% END %][% 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 || patron.zipcode || patron.state || patron.country ) ~%] >- <li class="patroncity"> >- [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | $raw %][%~ patron.state | html ~%][%~ END ~%] >- [%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ 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 || patron.zipcode || patron.state || patron.country ) %] >+ <li class="patroncity"> >+ [% IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %][% line_break | $raw %][% patron.state | html %][% END %] >+ [% IF ( patron.country ) %][% line_break | $raw %][% 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 ~%] >+ [% 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 || patron.zipcode || patron.state || patron.country ) %] >+ <li class="patroncity"> >+ [% IF ( patron.zipcode ) %][% patron.zipcode | html %] [% END %][% patron.city | html %][% IF ( patron.state ) %][% line_break | $raw %][% patron.state | html %][% END %] >+ [% IF ( patron.country ) %][% line_break | $raw %][% patron.country | html %][% END %] > </li> >- [%~ END ~%] >- [%~ IF ( patron.address2 ) ~%] >- <li class="patronaddress2">[%~ patron.address2 | html ~%]</li> >- [%~ END ~%] >- [%~ END ~%] >- [%~ IF ( patron.city || patron.zipcode || patron.state || patron.country ) ~%] >- <li class="patroncity"> >- [%~ IF ( patron.zipcode ) ~%][%~ patron.zipcode | html %] [% END ~%][%~ patron.city | html ~%][%~ IF ( patron.state ) ~%][% line_break | $raw %][%~ patron.state | html ~%][%~ END ~%] >- [%~ IF ( patron.country ) ~%][% line_break | $raw %][%~ patron.country | html ~%][%~ END ~%] >- </li> >- [%~ END ~%] >-[%~ END ~%] >+ [% END %] >+ [% END %] >+[% END # /FILTER collapse %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc >index dfcb6074247..ce23fa431ae 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-display-alt-address-style.inc >@@ -1,76 +1,78 @@ > [% 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' %] >+[% FILTER collapse %] >+ [% 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 %] >-[% 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) %] >+ [% 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 %] >- <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> >+ [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %] >+ <li class="patroncity"> >+ [% patron.B_city | html %][% IF ( patron.B_state ) %][% IF ( patron.B_city ) %], [% END %][%~ patron.B_state | html ~%][%~ END ~%] >+ [% IF ( patron.B_zipcode ) %][%~ " " _ patron.B_zipcode |html ~%][% END %][% IF ( patron.B_country ) %][% IF ( patron.B_zipcode || patron.B_state || patron.B_city ) %], [% END %][% patron.B_country | html %][% END %] >+ </li> > [% END %] > [% END %] >- [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %] >- <li class="patroncity"> >- [% patron.B_city | html %][% IF ( patron.B_state ) %][% IF ( patron.B_city ) %], [% END %][%~ patron.B_state | html ~%][%~ END ~%] >- [% IF ( patron.B_zipcode ) %][%~ " " _ patron.B_zipcode |html ~%][% END %][% IF ( patron.B_country ) %][% IF ( patron.B_zipcode || patron.B_state || patron.B_city ) %], [% END %][% 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) %] >+ [% 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 %] >- <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> >+ [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %] >+ <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 %] >- [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %] >- <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) %] >+ [% 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 %] >- <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> >+ [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %] >+ <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 %] >- [% IF ( patron.B_city || patron.B_state || patron.B_country || patron.B_zipcode ) %] >- <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 %] >+[% END # /FILTER collapse %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc >index a5c95b9c557..7547e1ad1c5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/member-main-address-style.inc >@@ -1,194 +1,196 @@ > [% USE Koha %] > [% USE AuthorisedValues %] >-[% BLOCK 'main-address-style' %] >- <fieldset class="rows" id="memberentry_mainaddress"> >- <legend id="main_address_lgd">Main address</legend> >- <ol> >- [% IF Koha.Preference( 'AddressFormat' ) %] >- [% PROCESS "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }" %] >- [% ELSE %] >- [% PROCESS 'member-main-address-style-us' %] >- [% END %] >- </ol> >- </fieldset> >-[% END %] >+[% FILTER collapse %] >+ [% BLOCK 'main-address-style' %] >+ <fieldset class="rows" id="memberentry_mainaddress"> >+ <legend id="main_address_lgd">Main address</legend> >+ <ol> >+ [% IF Koha.Preference( 'AddressFormat' ) %] >+ [% PROCESS "member-main-address-style-${ Koha.Preference( 'AddressFormat' ) }" %] >+ [% ELSE %] >+ [% PROCESS 'member-main-address-style-us' %] >+ [% END %] >+ </ol> >+ </fieldset> >+ [% END %] > >-[% BLOCK 'member-main-address-style-us' %] >- [% PROCESS 'address-style_streetnumber' %] >- [% PROCESS 'address-style_roadtypes' %] >- [% PROCESS 'address-style_address' %] >- [% PROCESS 'address-style_address2' %] >- [% PROCESS 'address-style_city' %] >- [% PROCESS 'address-style_state' %] >- [% PROCESS 'address-style_zipcode' %] >- [% PROCESS 'address-style_country' %] >-[% END %] >+ [% BLOCK 'member-main-address-style-us' %] >+ [% PROCESS 'address-style_streetnumber' %] >+ [% PROCESS 'address-style_roadtypes' %] >+ [% PROCESS 'address-style_address' %] >+ [% PROCESS 'address-style_address2' %] >+ [% PROCESS 'address-style_city' %] >+ [% PROCESS 'address-style_state' %] >+ [% PROCESS 'address-style_zipcode' %] >+ [% PROCESS 'address-style_country' %] >+ [% END %] > >-[% BLOCK 'member-main-address-style-de' %] >- [% PROCESS 'address-style_roadtypes' %] >- [% PROCESS 'address-style_address' %] >- [% PROCESS 'address-style_streetnumber' %] >- [% PROCESS 'address-style_address2' %] >- [% PROCESS 'address-style_zipcode' %] >- [% PROCESS 'address-style_city' %] >- [% PROCESS 'address-style_state' %] >- [% PROCESS 'address-style_country' %] >-[% END %] >+ [% BLOCK 'member-main-address-style-de' %] >+ [% PROCESS 'address-style_roadtypes' %] >+ [% PROCESS 'address-style_address' %] >+ [% PROCESS 'address-style_streetnumber' %] >+ [% PROCESS 'address-style_address2' %] >+ [% PROCESS 'address-style_zipcode' %] >+ [% PROCESS 'address-style_city' %] >+ [% PROCESS 'address-style_state' %] >+ [% PROCESS 'address-style_country' %] >+ [% END %] > >-[% BLOCK 'member-main-address-style-fr' %] >- [% PROCESS 'address-style_streetnumber' %] >- [% PROCESS 'address-style_roadtypes' %] >- [% PROCESS 'address-style_address' %] >- [% PROCESS 'address-style_address2' %] >- [% PROCESS 'address-style_zipcode' %] >- [% PROCESS 'address-style_city' %] >- [% PROCESS 'address-style_state' %] >- [% PROCESS 'address-style_country' %] >-[% END %] >+ [% BLOCK 'member-main-address-style-fr' %] >+ [% PROCESS 'address-style_streetnumber' %] >+ [% PROCESS 'address-style_roadtypes' %] >+ [% PROCESS 'address-style_address' %] >+ [% PROCESS 'address-style_address2' %] >+ [% PROCESS 'address-style_zipcode' %] >+ [% PROCESS 'address-style_city' %] >+ [% PROCESS 'address-style_state' %] >+ [% PROCESS 'address-style_country' %] >+ [% END %] > >-[% BLOCK 'address-style_roadtypes' %] >- [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %] >- [% IF roadtypes.count %] >- [% UNLESS nostreettype %] >+ [% BLOCK 'address-style_roadtypes' %] >+ [% SET roadtypes = AuthorisedValues.GetAuthValueDropbox('ROADTYPE') %] >+ [% IF roadtypes.count %] >+ [% UNLESS nostreettype %] >+ <li> >+ [% IF ( mandatorystreettype ) %] >+ <label for="streettype" class="required"> >+ [% ELSE %] >+ <label for="streettype"> >+ [% END %] >+ Street type: </label> >+ <select name="streettype"> >+ <option value=""></option> >+ [% FOR roadtype IN roadtypes %] >+ [% IF roadtype.authorised_value == patron.streettype %] >+ <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option> >+ [% ELSE %] >+ <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option> >+ [% END %] >+ [% END %] >+ </select> >+ [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] >+ [% END %] >+ [% END %] >+ >+ [% BLOCK 'address-style_address' %] >+ [% UNLESS noaddress %] > <li> >- [% IF ( mandatorystreettype ) %] >- <label for="streettype" class="required"> >+ [% IF ( mandatoryaddress ) %] >+ <label for="address" class="required"> > [% ELSE %] >- <label for="streettype"> >+ <label for="address"> > [% END %] >- Street type: </label> >- <select name="streettype"> >- <option value=""></option> >- [% FOR roadtype IN roadtypes %] >- [% IF roadtype.authorised_value == patron.streettype %] >- <option value="[% roadtype.authorised_value | html %]" selected="selected">[% roadtype.lib | html %]</option> >- [% ELSE %] >- <option value="[% roadtype.authorised_value | html %]">[% roadtype.lib | html %]</option> >- [% END %] >- [% END %] >- </select> >- [% IF ( mandatorystreettype ) %]<span class="required">Required</span>[% END %] >+ Address: </label> >+ <input type="text" id="address" name="address" size="40" value="[% patron.address | html %]" /> >+ [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %] > </li> > [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'address-style_address' %] >- [% UNLESS noaddress %] >- <li> >- [% IF ( mandatoryaddress ) %] >- <label for="address" class="required"> >- [% ELSE %] >- <label for="address"> >- [% END %] >- Address: </label> >- <input type="text" id="address" name="address" size="40" value="[% patron.address | html %]" /> >- [% IF ( mandatoryaddress ) %]<span class="required">Required</span>[% END %] >- </li> >- [% END %] >-[% END %] >- >-[% BLOCK 'address-style_streetnumber' %] >- [% UNLESS nostreetnumber %] >- <li> >- [% IF ( mandatorystreetnumber ) %] >- <label for="streetnumber" class="required"> >- [% ELSE %] >- <label for="streetnumber"> >- [% END %] >- Street number: </label> >- <input type="text" id="streetnumber" name="streetnumber" size="5" maxlength="10" value="[% patron.streetnumber | html %]" /> >- [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'address-style_streetnumber' %] >+ [% UNLESS nostreetnumber %] >+ <li> >+ [% IF ( mandatorystreetnumber ) %] >+ <label for="streetnumber" class="required"> >+ [% ELSE %] >+ <label for="streetnumber"> >+ [% END %] >+ Street number: </label> >+ <input type="text" id="streetnumber" name="streetnumber" size="5" maxlength="10" value="[% patron.streetnumber | html %]" /> >+ [% IF ( mandatorystreetnumber ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'address-style_address2' %] >- [% UNLESS noaddress2 %] >- <li> >- [% IF ( mandatoryaddress2 ) %] >- <label for="address2" class="required"> >- [% ELSE %] >- <label for="address2"> >- [% END %] >- Address 2: </label> >- <input type="text" id="address2" name="address2" size="40" value="[% patron.address2 | html %]" /> >- [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'address-style_address2' %] >+ [% UNLESS noaddress2 %] >+ <li> >+ [% IF ( mandatoryaddress2 ) %] >+ <label for="address2" class="required"> >+ [% ELSE %] >+ <label for="address2"> >+ [% END %] >+ Address 2: </label> >+ <input type="text" id="address2" name="address2" size="40" value="[% patron.address2 | html %]" /> >+ [% IF ( mandatoryaddress2 ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'address-style_zipcode' %] >- [% UNLESS nozipcode %] >- <li> >- [% IF ( mandatoryzipcode ) %] >- <label for="zipcode" class="required"> >- [% ELSE %] >- <label for="zipcode"> >- [% END %] >- ZIP/Postal code: </label> >- <input type="text" id="zipcode" name="zipcode" maxlength="10" size="10" value="[% patron.zipcode | html %]" /> >- [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'address-style_zipcode' %] >+ [% UNLESS nozipcode %] >+ <li> >+ [% IF ( mandatoryzipcode ) %] >+ <label for="zipcode" class="required"> >+ [% ELSE %] >+ <label for="zipcode"> >+ [% END %] >+ ZIP/Postal code: </label> >+ <input type="text" id="zipcode" name="zipcode" maxlength="10" size="10" value="[% patron.zipcode | html %]" /> >+ [% IF ( mandatoryzipcode ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'address-style_city' %] >- [% UNLESS nocity %] >- <li> >- [% IF ( mandatorycity ) %] >- <label for="city" class="required" > >- [% ELSE %] >- <label for="city"> >- [% END %] >- City: </label> >- [% IF cities.count %] >- <select class="select_city" data-addressfield="" name="select_city"> >- <option value="|||"></option> >- [% FOREACH c IN cities %] >- [% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %] >- <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected"> >- [% ELSE %] >- <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]"> >+ [% BLOCK 'address-style_city' %] >+ [% UNLESS nocity %] >+ <li> >+ [% IF ( mandatorycity ) %] >+ <label for="city" class="required" > >+ [% ELSE %] >+ <label for="city"> >+ [% END %] >+ City: </label> >+ [% IF cities.count %] >+ <select class="select_city" data-addressfield="" name="select_city"> >+ <option value="|||"></option> >+ [% FOREACH c IN cities %] >+ [% IF c.city_name == patron.city && c.city_state == patron.state && c.city_zipcode == patron.zipcode %] >+ <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]" selected="selected"> >+ [% ELSE %] >+ <option value="[% c.city_zipcode | html %]|[% c.city_name | html %]|[% c.city_state | html %]|[% c.city_country | html %]"> >+ [% END %] >+ [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %] >+ </option> > [% END %] >- [% c.city_name | html %] [% c.city_state | html %] [% c.city_zipcode | html %] >- </option> >- [% END %] >- </select> >- <span class="hint">or enter</span> >- [% END %] >- <input type="text" id="city" name="city" size="20" value="[% patron.city | html %]" /> >- [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %] >- </li> >+ </select> >+ <span class="hint">or enter</span> >+ [% END %] >+ <input type="text" id="city" name="city" size="20" value="[% patron.city | html %]" /> >+ [% IF ( mandatorycity ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'address-style_state' %] >- [% UNLESS nostate %] >- <li> >- [% IF ( mandatorystate ) %] >- <label for="state" class="required" > >- [% ELSE %] >- <label for="state"> >- [% END %] >- State: </label> >- <input type="text" id="state" name="state" size="20" value="[% patron.state | html %]" /> >- [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'address-style_state' %] >+ [% UNLESS nostate %] >+ <li> >+ [% IF ( mandatorystate ) %] >+ <label for="state" class="required" > >+ [% ELSE %] >+ <label for="state"> >+ [% END %] >+ State: </label> >+ <input type="text" id="state" name="state" size="20" value="[% patron.state | html %]" /> >+ [% IF ( mandatorystate ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] > >-[% BLOCK 'address-style_country' %] >- [% UNLESS nocountry %] >- <li> >- [% IF ( mandatorycountry ) %] >- <label for="country" class="required"> >- [% ELSE %] >- <label for="country"> >- [% END %] >- Country: </label> >- <input type="text" id="country" name="country" size="20" value="[% patron.country | html %]" /> >- [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %] >- </li> >+ [% BLOCK 'address-style_country' %] >+ [% UNLESS nocountry %] >+ <li> >+ [% IF ( mandatorycountry ) %] >+ <label for="country" class="required"> >+ [% ELSE %] >+ <label for="country"> >+ [% END %] >+ Country: </label> >+ <input type="text" id="country" name="country" size="20" value="[% patron.country | html %]" /> >+ [% IF ( mandatorycountry ) %]<span class="required">Required</span>[% END %] >+ </li> >+ [% END %] > [% END %] >-[% END %] >+[% END # /FILTER collapse %] >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 5d129115c1c..99d85b0e27f 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 >@@ -1,81 +1,83 @@ >-[%~ USE Koha ~%] >-[%~ USE raw ~%] >-[%~ BLOCK 'display-library-address' ~%] >- [%~ SET line_break = "<br/>" ~%] >- [%~ IF no_line_break %][% SET line_break = " " %][% END ~%] >- [%~ IF Koha.Preference( 'AddressFormat' ) == "us" ~%] >- [%~ PROCESS 'display-library-address-us' ~%] >- [%~ ELSE ~%] >- [%~ PROCESS 'display-library-address-de-fr' ~%] >- [%~ END ~%] >-[%~ END ~%] >+[% USE Koha %] >+[% USE raw %] >+[% FILTER collapse %] >+ [% BLOCK 'display-library-address' %] >+ [% SET line_break = "<br/>" %] >+ [% IF no_line_break %][% SET line_break = " " %][% END %] >+ [% IF Koha.Preference( 'AddressFormat' ) == "us" %] >+ [% PROCESS 'display-library-address-us' %] >+ [% ELSE %] >+ [% PROCESS 'display-library-address-de-fr' %] >+ [% END %] >+ [% END %] > >-[%~ BLOCK 'display-library-address-us' ~%] >- [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%] >- <span property="streetAddress"> >- [%~ IF ( library.branchaddress1 ) ~%] >- <div class="branchaddress1"> >- [% library.branchaddress1 | html %] >- </div> >- [%~ END ~%] >- [%~ IF ( library.branchaddress2 ) ~%] >- <div class="branchaddress2"> >- [%~ library.branchaddress2 |html ~%] >- </div> >- [%~ END ~%] >- [%~ IF ( library.branchaddress3 ) ~%] >- <span class="branchaddress3"> >- [%~ library.branchaddress3 | html ~%] >- </span> >- [% line_break | $raw %] >- [%~ END ~%] >- </span> >- [%~ 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 ~%] >- [%~ IF ( library.branchzip ) %] >- <span property="postalCode"> >- [%~ library.branchzip |html ~%] >- </span> >- [%~ END ~%] >- [%~ IF ( library.branchcountry ) %] >- <div property="addressCountry"> >- [% library.branchcountry |html ~%] >- </div> >- [%~ END ~%] >- </div> >- [%~ END ~%] >-[%~ END ~%] >+ [% BLOCK 'display-library-address-us' %] >+ [% IF ( library.branchaddress1 or library.branchaddress2 ) %] >+ <span property="streetAddress"> >+ [% IF ( library.branchaddress1 ) %] >+ <div class="branchaddress1"> >+ [% library.branchaddress1 | html %] >+ </div> >+ [% END %] >+ [% IF ( library.branchaddress2 ) %] >+ <div class="branchaddress2"> >+ [% library.branchaddress2 |html %] >+ </div> >+ [% END %] >+ [% IF ( library.branchaddress3 ) %] >+ <span class="branchaddress3"> >+ [% library.branchaddress3 | html %] >+ </span> >+ [% line_break | $raw %] >+ [% END %] >+ </span> >+ [% 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 %] >+ [% IF ( library.branchzip ) %] >+ <span property="postalCode"> >+ [% library.branchzip |html %] >+ </span> >+ [% END %] >+ [% IF ( library.branchcountry ) %] >+ <div property="addressCountry"> >+ [% library.branchcountry |html %] >+ </div> >+ [% END %] >+ </div> >+ [% END %] >+ [% END %] > >-[%~ BLOCK 'display-library-address-de-fr' ~%] >- [%~ IF ( library.branchaddress1 or library.branchaddress2 ) ~%] >- <span property="streetAddress"> >- [%~ 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 ~%] >- </span> >- [%~ END ~%] >- [%~ IF ( library.branchcity ) ~%] >- <span 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 %]<span property="addressRegion">[%~ library.branchstate | html ~%]</span>[%~ END ~%] >- [%~ IF ( library.branchcountry ) ~%][% line_break | $raw %]<span property="addressCountry">[%~ library.branchcountry | html ~%]</span>[%~ END ~%] >- </span> >- [%~ END ~%] >-[%~ END ~%] >+ [% BLOCK 'display-library-address-de-fr' %] >+ [% IF ( library.branchaddress1 or library.branchaddress2 ) %] >+ <span property="streetAddress"> >+ [% 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 %] >+ </span> >+ [% END %] >+ [% IF ( library.branchcity ) %] >+ <span 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 %]<span property="addressRegion">[% library.branchstate | html %]</span>[% END %] >+ [% IF ( library.branchcountry ) %][% line_break | $raw %]<span property="addressCountry">[% library.branchcountry | html %]</span>[% END %] >+ </span> >+ [% END %] >+ [% END %] >+[% END # /FILTER collapse %] >-- >2.30.2
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 36171
:
162490
|
162516
|
165506
|
170194
|
170195
|
170227
|
170262
|
170342
|
172327
|
172334
|
173252