From 011aeb6252015a7ecc9e57848fc8abaebc1dcbad Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 13 May 2013 14:23:02 +1200 Subject: [PATCH] CRM-12595 fix formatting in xml files --- xml/configuration/AdultDayCareReferral.xml | 4 +- xml/configuration/HousingSupport.xml | 4 +- xml/configuration/Settings.xml | 38 +-- xml/schema/ACL/Cache.xml | 2 +- xml/schema/Activity/ActivityTarget.xml | 6 +- xml/schema/Bridge/OG.xml | 120 ++++---- xml/schema/Core/ActionSchedule.xml | 12 +- xml/schema/Core/MappingField.xml | 2 +- xml/schema/Event/Cart/files.xml | 2 +- xml/schema/Mailing/Event/Forward.xml | 2 +- xml/schema/Mailing/Event/Queue.xml | 4 +- xml/schema/Member/Membership.xml | 2 +- .../message_templates/case_activity_html.tpl | 12 +- .../contribution_online_receipt_html.tpl | 2 +- .../contribution_recurring_billing_html.tpl | 2 +- .../contribution_recurring_edit_text.tpl | 6 +- .../contribution_recurring_notify_html.tpl | 4 +- .../contribution_recurring_notify_text.tpl | 2 +- .../event_offline_receipt_html.tpl | 22 +- .../event_offline_receipt_text.tpl | 4 +- .../event_registration_receipt_html.tpl | 256 +++++++++--------- .../event_registration_receipt_text.tpl | 2 +- .../membership_autorenew_billing_html.tpl | 4 +- .../membership_offline_receipt_html.tpl | 8 +- .../membership_offline_receipt_text.tpl | 2 +- .../membership_online_receipt_html.tpl | 6 +- .../participant_confirm_html.tpl | 18 +- .../petition_confirmation_needed_html.tpl | 2 +- .../petition_confirmation_needed_text.tpl | 4 +- .../test_preview_subject.tpl | 2 +- .../message_templates/test_preview_text.tpl | 2 +- 31 files changed, 279 insertions(+), 279 deletions(-) diff --git a/xml/configuration/AdultDayCareReferral.xml b/xml/configuration/AdultDayCareReferral.xml index 42c72a0054..d43daeae17 100644 --- a/xml/configuration/AdultDayCareReferral.xml +++ b/xml/configuration/AdultDayCareReferral.xml @@ -19,7 +19,7 @@ Follow up - + Change Case Type @@ -79,6 +79,6 @@ Benefits Specialist - + diff --git a/xml/configuration/HousingSupport.xml b/xml/configuration/HousingSupport.xml index 8eaa82e97b..6a1681fbd8 100644 --- a/xml/configuration/HousingSupport.xml +++ b/xml/configuration/HousingSupport.xml @@ -25,7 +25,7 @@ Follow up - + Change Case Type @@ -104,6 +104,6 @@ Benefits Specialist - + diff --git a/xml/configuration/Settings.xml b/xml/configuration/Settings.xml index a6cd3cada5..ffd76a0e37 100644 --- a/xml/configuration/Settings.xml +++ b/xml/configuration/Settings.xml @@ -1,25 +1,25 @@ - - - + + + 0 - - 0 - - 0 - - - - Change Case Status - 0 + + 0 + + 0 + + + + Change Case Status + 0 - - Change Case Start Date - 0 + + Change Case Start Date + 0 - + \ No newline at end of file diff --git a/xml/schema/ACL/Cache.xml b/xml/schema/ACL/Cache.xml index 5143df587c..810fb24afc 100644 --- a/xml/schema/ACL/Cache.xml +++ b/xml/schema/ACL/Cache.xml @@ -36,7 +36,7 @@ true Foreign Key to ACL 1.6 - + acl_id civicrm_acl
diff --git a/xml/schema/Activity/ActivityTarget.xml b/xml/schema/Activity/ActivityTarget.xml index bcdeffbfee..6b5cba7867 100644 --- a/xml/schema/Activity/ActivityTarget.xml +++ b/xml/schema/Activity/ActivityTarget.xml @@ -18,7 +18,7 @@ id true - + activity_id int unsigned Activity ID @@ -34,7 +34,7 @@ CASCADE - + target_contact_id Contact ID (match to contact) true @@ -54,7 +54,7 @@ UI_activity_target_contact_id target_contact_id - activity_id + activity_id true 2.0 diff --git a/xml/schema/Bridge/OG.xml b/xml/schema/Bridge/OG.xml index 0274a19b98..c9e8a28e92 100644 --- a/xml/schema/Bridge/OG.xml +++ b/xml/schema/Bridge/OG.xml @@ -17,67 +17,67 @@ id true - - drupal_og_id - int unsigned - Foreign key to the organic group. - 2.0 + + drupal_og_id + int unsigned + Foreign key to the organic group. + 2.0 - - index_drupal_og_id - index_drupal_og_id - 2.0 + + index_drupal_og_id + index_drupal_og_id + 2.0 - - group_id - int unsigned - true - FK to civicrm group. - 2.0 - - - group_id - civicrm_group
- id - 2.0 - - - acl_id - int unsigned - true - FK to civicrm acl. - 2.0 - - - acl_id - civicrm_acl
- id - 2.0 - - - admin_group_id - int unsigned - true - FK to admin civicrm group. - 2.0 - - - admin_group_id - civicrm_group
- id - 2.0 - - - admin_acl_id - int unsigned - true - FK to civicrm acl. + + group_id + int unsigned + true + FK to civicrm group. + 2.0 + + + group_id + civicrm_group
+ id + 2.0 + + + acl_id + int unsigned + true + FK to civicrm acl. + 2.0 + + + acl_id + civicrm_acl
+ id + 2.0 + + + admin_group_id + int unsigned + true + FK to admin civicrm group. 2.0 - - - admin_acl_id - civicrm_acl
- id - 2.0 - + + + admin_group_id + civicrm_group
+ id + 2.0 + + + admin_acl_id + int unsigned + true + FK to civicrm acl. + 2.0 + + + admin_acl_id + civicrm_acl
+ id + 2.0 + diff --git a/xml/schema/Core/ActionSchedule.xml b/xml/schema/Core/ActionSchedule.xml index 828414e3c8..12d6feb003 100644 --- a/xml/schema/Core/ActionSchedule.xml +++ b/xml/schema/Core/ActionSchedule.xml @@ -192,7 +192,7 @@ group_id int unsigned FK to Group - 3.4 + 3.4 group_id @@ -202,14 +202,14 @@ msg_template_id - int unsigned - FK to the message template. + int unsigned + FK to the message template. msg_template_id - civicrm_msg_template
- id - SET NULL + civicrm_msg_template
+ id + SET NULL absolute_date diff --git a/xml/schema/Core/MappingField.xml b/xml/schema/Core/MappingField.xml index c17e575ed2..fd6125ba01 100644 --- a/xml/schema/Core/MappingField.xml +++ b/xml/schema/Core/MappingField.xml @@ -111,7 +111,7 @@ grouping int unsigned - 1 + 1 Used to group mapping_field records into related sets (e.g. for criteria sets in search builder mappings). 1.5 diff --git a/xml/schema/Event/Cart/files.xml b/xml/schema/Event/Cart/files.xml index e7790cfe37..221e1d1004 100644 --- a/xml/schema/Event/Cart/files.xml +++ b/xml/schema/Event/Cart/files.xml @@ -1,5 +1,5 @@ - + diff --git a/xml/schema/Mailing/Event/Forward.xml b/xml/schema/Mailing/Event/Forward.xml index 9b9ab3d3be..813abd255c 100644 --- a/xml/schema/Mailing/Event/Forward.xml +++ b/xml/schema/Mailing/Event/Forward.xml @@ -36,7 +36,7 @@ dest_queue_id civicrm_mailing_event_queue
id - SET NULL + SET NULL time_stamp diff --git a/xml/schema/Mailing/Event/Queue.xml b/xml/schema/Mailing/Event/Queue.xml index 38486b83a6..13c8d775d8 100644 --- a/xml/schema/Mailing/Event/Queue.xml +++ b/xml/schema/Mailing/Event/Queue.xml @@ -30,7 +30,7 @@ email_id int unsigned - NULL + NULL FK to Email @@ -61,7 +61,7 @@ phone_id int unsigned - NULL + NULL FK to Phone diff --git a/xml/schema/Member/Membership.xml b/xml/schema/Member/Membership.xml index d2c3969b80..8c7ef93bb9 100644 --- a/xml/schema/Member/Membership.xml +++ b/xml/schema/Member/Membership.xml @@ -132,7 +132,7 @@ owner_membership_id int unsigned - Primary Member ID + Primary Member ID Optional FK to Parent Membership. true 1.7 diff --git a/xml/templates/message_templates/case_activity_html.tpl b/xml/templates/message_templates/case_activity_html.tpl index 24156e5601..dd54906ce3 100644 --- a/xml/templates/message_templates/case_activity_html.tpl +++ b/xml/templates/message_templates/case_activity_html.tpl @@ -39,25 +39,25 @@ {if $manageCaseURL} - {ts}Manage Case{/ts} + {ts}Manage Case{/ts} {/if} {/if} - {if $editActURL} + {if $editActURL} - {ts}Edit this activity{/ts} + {ts}Edit this activity{/ts} {/if} {if $viewActURL} - {ts}View this activity{/ts} + {ts}View this activity{/ts} - - {/if} + + {/if} {foreach from=$activity.fields item=field} diff --git a/xml/templates/message_templates/contribution_online_receipt_html.tpl b/xml/templates/message_templates/contribution_online_receipt_html.tpl index 976c24ad46..48bde393ba 100644 --- a/xml/templates/message_templates/contribution_online_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_online_receipt_html.tpl @@ -137,7 +137,7 @@ {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by visiting this web page.{/ts} - {/if} + {/if} diff --git a/xml/templates/message_templates/contribution_recurring_billing_html.tpl b/xml/templates/message_templates/contribution_recurring_billing_html.tpl index 3e3ad1b6fc..f2b9d48842 100644 --- a/xml/templates/message_templates/contribution_recurring_billing_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_billing_html.tpl @@ -58,7 +58,7 @@ {ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts} - + diff --git a/xml/templates/message_templates/contribution_recurring_edit_text.tpl b/xml/templates/message_templates/contribution_recurring_edit_text.tpl index 71a02ccbc1..423b00c9cd 100644 --- a/xml/templates/message_templates/contribution_recurring_edit_text.tpl +++ b/xml/templates/message_templates/contribution_recurring_edit_text.tpl @@ -1,8 +1,8 @@ -{ts 1=$contact.display_name}Dear %1{/ts}, +{ts 1=$contact.display_name}Dear %1{/ts}, -{ts}Your recurring contribution has been updated as requested:{/ts} +{ts}Your recurring contribution has been updated as requested:{/ts} {ts 1=$amount 2=$recur_frequency_interval 3=$recur_frequency_unit}Recurring contribution is for %1, every %2(s) %3{/ts} -{if $installments}{ts 1=$installments} for %1 installments.{/ts}{/if} +{if $installments}{ts 1=$installments} for %1 installments.{/ts}{/if} {ts 1=$receipt_from_email}If you have questions please contact us at %1.{/ts} \ No newline at end of file diff --git a/xml/templates/message_templates/contribution_recurring_notify_html.tpl b/xml/templates/message_templates/contribution_recurring_notify_html.tpl index fc8513b2d7..3a6b18bac1 100644 --- a/xml/templates/message_templates/contribution_recurring_notify_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_notify_html.tpl @@ -67,7 +67,7 @@ - {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments details for this recurring contribution by visiting this web page.{/ts} + {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments details for this recurring contribution by visiting this web page.{/ts} {/if} @@ -77,7 +77,7 @@ {if $auto_renew_membership} -

{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}

+

{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}

{else} diff --git a/xml/templates/message_templates/contribution_recurring_notify_text.tpl b/xml/templates/message_templates/contribution_recurring_notify_text.tpl index 86602b7b40..5f54ca1568 100644 --- a/xml/templates/message_templates/contribution_recurring_notify_text.tpl +++ b/xml/templates/message_templates/contribution_recurring_notify_text.tpl @@ -10,7 +10,7 @@ {ts 1=$cancelSubscriptionUrl}This membership will be renewed automatically. You can cancel the auto-renewal option by visiting this web page.{/ts} {ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by visiting this web page.{/ts} - + {else} {ts}Thanks for your recurring contribution sign-up.{/ts} diff --git a/xml/templates/message_templates/event_offline_receipt_html.tpl b/xml/templates/message_templates/event_offline_receipt_html.tpl index c0263439e4..da8df90665 100644 --- a/xml/templates/message_templates/event_offline_receipt_html.tpl +++ b/xml/templates/message_templates/event_offline_receipt_html.tpl @@ -178,12 +178,12 @@ registration process.{/ts}

{ts}Qty{/ts} {ts}Each{/ts} {ts}Total{/ts} - {if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if} + {if $pricesetFieldsCount }{ts}Total Participants{/ts}{/if} {foreach from=$value item=line} - {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} + {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} {$line.qty} @@ -194,11 +194,11 @@ registration process.{/ts}

{$line.line_total|crmMoney} - {if $pricesetFieldsCount } - - {$line.participant_count} + {if $pricesetFieldsCount } + + {$line.participant_count} - {/if} + {/if} {/foreach} @@ -228,10 +228,10 @@ registration process.{/ts}

{if $pricesetFieldsCount } - - {ts}Total Participants{/ts} + + {ts}Total Participants{/ts} - {assign var="count" value= 0} + {assign var="count" value= 0} {foreach from=$lineItem item=pcount} {assign var="lineItemCount" value=0} {if $pcount neq 'skip'} @@ -240,11 +240,11 @@ registration process.{/ts}

{/foreach} {if $lineItemCount < 1 } assign var="lineItemCount" value=1} - {/if} + {/if} {assign var="count" value=$count+$lineItemCount} {/if} {/foreach} - {$count} + {$count} {/if} diff --git a/xml/templates/message_templates/event_offline_receipt_text.tpl b/xml/templates/message_templates/event_offline_receipt_text.tpl index b591f22361..0890ed6e8c 100644 --- a/xml/templates/message_templates/event_offline_receipt_text.tpl +++ b/xml/templates/message_templates/event_offline_receipt_text.tpl @@ -145,14 +145,14 @@ registration process.{/ts} {/foreach} {if $lineItemCount < 1 } {assign var="lineItemCount" value=1} - {/if} + {/if} {assign var="count" value=$count+$lineItemCount} {/if} {/foreach} {ts}Total Participants{/ts}: {$count} {/if} - + {if $is_pay_later } ==========================================================={if $pricesetFieldsCount }===================={/if} diff --git a/xml/templates/message_templates/event_registration_receipt_html.tpl b/xml/templates/message_templates/event_registration_receipt_html.tpl index f23503ea20..56159a7aea 100644 --- a/xml/templates/message_templates/event_registration_receipt_html.tpl +++ b/xml/templates/message_templates/event_registration_receipt_html.tpl @@ -27,40 +27,40 @@

Your order number is #{$transaction_id}. Please print this confirmation for your records.{if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if} Here's a summary of your transaction placed on {$transaction_date|date_format:"%D %I:%M %p %Z"}:

- + {if $billing_name} - +
- + - - + +
- {ts}Billing Name and Address{/ts} - + {ts}Billing Name and Address{/ts} +
- {$billing_name}
- {$billing_street_address}
- {$billing_city}, {$billing_state} {$billing_postal_code}
-
- {$email} -
+ {$billing_name}
+ {$billing_street_address}
+ {$billing_city}, {$billing_state} {$billing_postal_code}
+
+ {$email} +
{/if} {if $credit_card_type} -

 

- +

 

+
- + - - + +
- {ts}Credit Card Information{/ts} - + {ts}Credit Card Information{/ts} +
- {$credit_card_type}
- {$credit_card_number}
- {ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y} -
+ {$credit_card_type}
+ {$credit_card_number}
+ {ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y} +
{/if} {if $source} @@ -70,117 +70,117 @@

 

- + {if $line_items} - - + + {/if} - - - - + + + + - {foreach from=$line_items item=line_item} - - - - - - - {/foreach} + {foreach from=$line_items item=line_item} + + + + + + + {/foreach} - {if $discounts} - - - - - - - {foreach from=$discounts key=myId item=i} - - - - - - - {/foreach} - {/if} - + {if $discounts} + + + + + + + {foreach from=$discounts key=myId item=i} + + + + + + + {/foreach} + {/if} + {if $line_items} - - + + {/if} - - - + + +
- Event - - Participants - + Event + + Participants + - Price - - Total -
+ Price + + Total +
- {$line_item.event->title} ({$line_item.event->start_date|date_format:"%D"})
- {if $line_item.event->is_show_location} - {if $line_item.location.address.1.name} - {$line_item.location.address.1.name}
- {/if} - {if $line_item.location.address.1.street_address} - {$line_item.location.address.1.street_address}
- {/if} - {if $line_item.location.address.1.supplemental_address_1} - {$line_item.location.address.1.supplemental_address_1}
- {/if} - {if $line_item.location.address.1.supplemental_address_2} - {$line_item.location.address.1.supplemental_address_2}
- {/if} - {if $line_item.location.address.1.city} - {$line_item.location.address.1.city}, {$line_item.location.address.1.state_province} {$location.address.1.postal_code} - {/if} - {/if}{*End of isShowLocation condition*}

- {$line_item.event->start_date|date_format:"%D %I:%M %p"} - {$line_item.event->end_date|date_format:"%I:%M %p"} - 		- {$line_item.num_participants} - {if $line_item.num_participants > 0} -
- {foreach from=$line_item.participants item=participant} - {$participant.display_name}
- {/foreach} -
- {/if} - {if $line_item.num_waiting_participants > 0} - Waitlisted:
-
- {foreach from=$line_item.waiting_participants item=participant} - {$participant.display_name}
- {/foreach} -
- {/if} - 		- {$line_item.cost|crmMoney:$currency|string_format:"%10s"} - -  {$line_item.amount|crmMoney:$currency|string_format:"%10s"} -
+ {$line_item.event->title} ({$line_item.event->start_date|date_format:"%D"})
+ {if $line_item.event->is_show_location} + {if $line_item.location.address.1.name} + {$line_item.location.address.1.name}
+ {/if} + {if $line_item.location.address.1.street_address} + {$line_item.location.address.1.street_address}
+ {/if} + {if $line_item.location.address.1.supplemental_address_1} + {$line_item.location.address.1.supplemental_address_1}
+ {/if} + {if $line_item.location.address.1.supplemental_address_2} + {$line_item.location.address.1.supplemental_address_2}
+ {/if} + {if $line_item.location.address.1.city} + {$line_item.location.address.1.city}, {$line_item.location.address.1.state_province} {$location.address.1.postal_code} + {/if} + {/if}{*End of isShowLocation condition*}

+ {$line_item.event->start_date|date_format:"%D %I:%M %p"} - {$line_item.event->end_date|date_format:"%I:%M %p"} + 		+ {$line_item.num_participants} + {if $line_item.num_participants > 0} +
+ {foreach from=$line_item.participants item=participant} + {$participant.display_name}
+ {/foreach} +
+ {/if} + {if $line_item.num_waiting_participants > 0} + Waitlisted:
+
+ {foreach from=$line_item.waiting_participants item=participant} + {$participant.display_name}
+ {/foreach} +
+ {/if} + 		+ {$line_item.cost|crmMoney:$currency|string_format:"%10s"} + +  {$line_item.amount|crmMoney:$currency|string_format:"%10s"} +
- - - Subtotal: - -  {$sub_total|crmMoney:$currency|string_format:"%10s"} -
- {$i.title} - - - - -{$i.amount} -
+ + + Subtotal: + +  {$sub_total|crmMoney:$currency|string_format:"%10s"} +
+ {$i.title} + + + + -{$i.amount} +
- - + + - Total: - -  {$total|crmMoney:$currency|string_format:"%10s"} -
+ Total: + +  {$total|crmMoney:$currency|string_format:"%10s"} +
diff --git a/xml/templates/message_templates/event_registration_receipt_text.tpl b/xml/templates/message_templates/event_registration_receipt_text.tpl index 23e26cd32a..9620798772 100644 --- a/xml/templates/message_templates/event_registration_receipt_text.tpl +++ b/xml/templates/message_templates/event_registration_receipt_text.tpl @@ -9,7 +9,7 @@ Dear {contact.display_name}, {$pay_later_receipt} {/if} - Your order number is #{$transaction_id}. Please print this confirmation for your records.{if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if} + Your order number is #{$transaction_id}. Please print this confirmation for your records.{if $line_items && !$is_refund} Information about the workshops will be sent separately to each participant.{/if} Here's a summary of your transaction placed on {$transaction_date|date_format:"%D %I:%M %p %Z"}: {if $billing_name} diff --git a/xml/templates/message_templates/membership_autorenew_billing_html.tpl b/xml/templates/message_templates/membership_autorenew_billing_html.tpl index 9997c5ef09..a8ec69f116 100644 --- a/xml/templates/message_templates/membership_autorenew_billing_html.tpl +++ b/xml/templates/message_templates/membership_autorenew_billing_html.tpl @@ -58,8 +58,8 @@ {ts 1=$receipt_from_email}If you have questions please contact us at %1{/ts} - - + + diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl index 280d70930d..da729d4433 100644 --- a/xml/templates/message_templates/membership_offline_receipt_html.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_html.tpl @@ -95,13 +95,13 @@ {ts}Item{/ts} {ts}Fee{/ts} - {ts}Membership Start Date{/ts} - {ts}Membership End Date{/ts} + {ts}Membership Start Date{/ts} + {ts}Membership End Date{/ts} {foreach from=$value item=line} - {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} + {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}
{$line.description|truncate:30:"..."}
{/if} {$line.line_total|crmMoney} @@ -109,7 +109,7 @@ {$line.start_date} - + {$line.end_date} diff --git a/xml/templates/message_templates/membership_offline_receipt_text.tpl b/xml/templates/message_templates/membership_offline_receipt_text.tpl index 84e9730464..812606bdce 100644 --- a/xml/templates/message_templates/membership_offline_receipt_text.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_text.tpl @@ -51,7 +51,7 @@ {if $formValues.paidBy} {ts}Paid By{/ts}: {$formValues.paidBy} {if $formValues.check_number} -{ts}Check Number{/ts}: {$formValues.check_number} +{ts}Check Number{/ts}: {$formValues.check_number} {/if} {/if} {/if} diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl index fc46a888a9..c56152bbaa 100644 --- a/xml/templates/message_templates/membership_online_receipt_html.tpl +++ b/xml/templates/message_templates/membership_online_receipt_html.tpl @@ -171,8 +171,8 @@ {ts}Item{/ts} {ts}Fee{/ts} - {ts}Membership Start Date{/ts} - {ts}Membership End Date{/ts} + {ts}Membership Start Date{/ts} + {ts}Membership End Date{/ts} {foreach from=$value item=line} @@ -185,7 +185,7 @@ {$line.start_date} - + {$line.end_date} diff --git a/xml/templates/message_templates/participant_confirm_html.tpl b/xml/templates/message_templates/participant_confirm_html.tpl index ba06676449..10aba0e2cd 100644 --- a/xml/templates/message_templates/participant_confirm_html.tpl +++ b/xml/templates/message_templates/participant_confirm_html.tpl @@ -54,20 +54,20 @@ {if $conference_sessions} - {ts}Your schedule:{/ts} + {ts}Your schedule:{/ts} - {assign var='group_by_day' value='NA'} - {foreach from=$conference_sessions item=session} - {if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"} - {assign var='group_by_day' value=$session.start_date} + {assign var='group_by_day' value='NA'} + {foreach from=$conference_sessions item=session} + {if $session.start_date|date_format:"%Y/%m/%d" != $group_by_day|date_format:"%Y/%m/%d"} + {assign var='group_by_day' value=$session.start_date} {$group_by_day|date_format:"%m/%d/%Y"}
- {/if} - {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}
- {if $session.location}    {$session.location}
{/if} - {/foreach} + {/if} + {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}
+ {if $session.location}    {$session.location}
{/if} + {/foreach} {/if} diff --git a/xml/templates/message_templates/petition_confirmation_needed_html.tpl b/xml/templates/message_templates/petition_confirmation_needed_html.tpl index 5547ac0304..2d30dc11c7 100644 --- a/xml/templates/message_templates/petition_confirmation_needed_html.tpl +++ b/xml/templates/message_templates/petition_confirmation_needed_html.tpl @@ -1,6 +1,6 @@

Thank you for signing {$petition.title}.

-

In order to complete your signature, we must confirm your e-mail. +

In order to complete your signature, we must confirm your e-mail.
Please do so by visiting the following web page by clicking on the link below or pasting the link into your browser. diff --git a/xml/templates/message_templates/petition_confirmation_needed_text.tpl b/xml/templates/message_templates/petition_confirmation_needed_text.tpl index 1d9c3d60d9..8549b39b4c 100644 --- a/xml/templates/message_templates/petition_confirmation_needed_text.tpl +++ b/xml/templates/message_templates/petition_confirmation_needed_text.tpl @@ -1,8 +1,8 @@ Thank you for signing {$petition.title}. -In order to complete your signature, we must confirm your e-mail. +In order to complete your signature, we must confirm your e-mail. Please do so by visiting the following email confirmation web page: -{$petition.confirmUrlPlainText} +{$petition.confirmUrlPlainText} If you did not sign this petition, please ignore this message. diff --git a/xml/templates/message_templates/test_preview_subject.tpl b/xml/templates/message_templates/test_preview_subject.tpl index c0438bc9f9..20cc6a1050 100644 --- a/xml/templates/message_templates/test_preview_subject.tpl +++ b/xml/templates/message_templates/test_preview_subject.tpl @@ -1 +1 @@ -[TEST] +[TEST] diff --git a/xml/templates/message_templates/test_preview_text.tpl b/xml/templates/message_templates/test_preview_text.tpl index bf4c95f105..5821007a01 100644 --- a/xml/templates/message_templates/test_preview_text.tpl +++ b/xml/templates/message_templates/test_preview_text.tpl @@ -1,6 +1,6 @@ *********************************************************** -{ts}Test-drive Email / Receipt{/ts} +{ts}Test-drive Email / Receipt{/ts} {ts}This is a test-drive email. No live financial transaction has occurred.{/ts} -- 2.25.1