From ce1642ddad0ac2437982f2cfec1eaaf1ea6450e3 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Tue, 13 Sep 2011 09:51:01 -0400 Subject: [PATCH] Fix for Bug 6458 - incorrect parsing result in translation processing Content-Type: text/plain; charset="utf-8" Fixing improperly nested template logic inside HTML tags in messaging preferences include. --- .../prog/en/includes/messaging-preference-form.inc | 68 ++++++++++++++++---- 1 files changed, 55 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc index 7ece680..577f19a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc @@ -54,15 +54,29 @@ [% IF ( messaging_preference.transport_sms ) %] [% IF ( SMSSendDriver ) %] [% IF ( messaging_form_inactive ) %] + [% IF ( messaging_preference.transports_sms ) %] + value="sms" checked="checked" disabled="disabled" /> + [% ELSE %] + + [% END %] [% ELSE %] + [% IF ( messaging_preference.transports_sms ) %] + + [% ELSE %] + value="sms" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" /> + [% END %] [% END %] [% END %] [% ELSE %] @@ -72,15 +86,29 @@ [% IF ( messaging_preference.transport_email ) %] [% IF ( messaging_form_inactive ) %] + [% IF ( messaging_preference.transports_email ) %] + + [% ELSE %] + + [% END %] + [% ELSE %] + [% IF ( messaging_preference.transports_email ) %] - [% ELSE %] + value="email" checked="checked" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" /> + [% ELSE %] + value="email" onclick = "$('#none'+'[% messaging_preference.message_attribute_id %]').attr('checked','');" /> + [% END %] [% END %] [% ELSE %] @@ -90,15 +118,29 @@ [% IF ( messaging_preference.has_digest ) %] [% IF ( messaging_form_inactive ) %] - + [% IF ( messaging_preference.digest ) %] + + [% ELSE %] + + [% END %] [% ELSE %] - + [% IF ( messaging_preference.digest ) %] + + [% ELSE %] + + [% END %] [% END %] [% ELSE %] -- 1.7.3