@@ -, +, @@
---
.../intranet-tmpl/prog/en/includes/circ-menu.inc | 7 +++----
.../prog/en/modules/members/moremember.tt | 18 +++++++++---------
2 files changed, 12 insertions(+), 13 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc
@@ -20,13 +20,13 @@
[% END %]
[% IF ( phone ) %]
- [% phone %]
+ [% phone %]
[% ELSE %]
[% IF ( mobile ) %]
- [% mobile %]
+ [% mobile %]
[% ELSE %]
[% IF ( phonepro ) %]
- [% phonepro %]
+ [% phonepro %]
[% END %]
[% END %]
[% END %]
@@ -107,4 +107,3 @@
[% END %]
[% END %]
-
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
@@ -212,17 +212,17 @@ function validate1(date) {
[% IF ( I ) %]
- [% IF ( phonepro ) %]- Organization phone: [% phonepro %]
[% END %]
+ [% IF ( phonepro ) %]- Organization phone: [% phonepro %]
[% END %]
[% IF ( emailpro ) %]- Organization email: [% emailpro %]
[% END %]
[% ELSE %]
- [% IF ( phone ) %]- Primary phone: [% phone %]
[% END %]
- [% IF ( phonepro ) %]- Secondary phone: [% phonepro %]
[% END %]
- [% IF ( mobile ) %]- Other phone: [% mobile %]
[% END %]
+ [% IF ( phone ) %]- Primary phone: [% phone %]
[% END %]
+ [% IF ( phonepro ) %]- Secondary phone: [% phonepro %]
[% END %]
+ [% IF ( mobile ) %]- Other phone: [% mobile %]
[% END %]
[% END %]
[% IF ( P ) %]
- [% IF ( phone ) %]- Primary phone: [% phone %]
[% END %]
- [% IF ( mobile ) %]- Other phone: [% mobile %]
[% END %]
+ [% IF ( phone ) %]- Primary phone: [% phone %]
[% END %]
+ [% IF ( mobile ) %]- Other phone: [% mobile %]
[% END %]
[% END %]
[% IF ( fax ) %]- Fax: [% fax %]
[% END %]
[% UNLESS ( I ) %]
@@ -336,7 +336,7 @@ function validate1(date) {
Patron messaging preferences
[% INCLUDE 'messaging-preference-form.inc' %]
[% IF ( SMSSendDriver ) %]
- - SMS number:[% SMSnumber %]
+
[% END %]
@@ -414,7 +414,7 @@ function validate1(date) {
[% IF ( B_state ) %]- State: [% B_state %]
[% END %]
- ZIP/Postal code: [% B_zipcode %]
[% IF ( B_country ) %]- Country: [% B_country %]
[% END %]
- [% IF ( B_phone ) %]- Phone: [% B_phone %]
[% END %]
+ [% IF ( B_phone ) %]- Phone: [% B_phone %]
[% END %]
[% IF ( B_email ) %]- Email: [% B_email %]
[% END %]
[% IF ( contactnote ) %]- Contact note: [% contactnote %]
[% END %]
@@ -433,7 +433,7 @@ function validate1(date) {
[% IF ( altcontactstate ) %]
State: [% altcontactstate %][% END %]
ZIP/Postal code: [% altcontactzipcode %]
[% IF ( altcontactcountry ) %]
Country: [% altcontactcountry %][% END %]
- [% IF ( altcontactphone ) %]
Phone: [% altcontactphone %][% END %]
+ [% IF ( altcontactphone ) %]
Phone: [% altcontactphone %][% END %]
--