diff --git a/xml/configuration/AdultDayCareReferral.xml b/xml/configuration/AdultDayCareReferral.xml
index 42c72a0054d6b14c1d3ac4f116cdd9ad065529ec..d43daeae176cd54b2e209c7fa1fd0f12b778f15d 100644
--- a/xml/configuration/AdultDayCareReferral.xml
+++ b/xml/configuration/AdultDayCareReferral.xml
@@ -19,7 +19,7 @@
<ActivityType>
<name>Follow up</name>
</ActivityType>
- <ActivityType>
+ <ActivityType>
<name>Change Case Type</name>
</ActivityType>
<ActivityType>
@@ -79,6 +79,6 @@
</RelationshipType>
<RelationshipType>
<name>Benefits Specialist</name>
- </RelationshipType>
+ </RelationshipType>
</CaseRoles>
</CaseType>
diff --git a/xml/configuration/HousingSupport.xml b/xml/configuration/HousingSupport.xml
index 8eaa82e97bf6c6ce2c0bcd701b07d00c0ef253fa..6a1681fbd8fda50296d1defd2a78550d36f1f00b 100644
--- a/xml/configuration/HousingSupport.xml
+++ b/xml/configuration/HousingSupport.xml
@@ -25,7 +25,7 @@
<ActivityType>
<name>Follow up</name>
</ActivityType>
- <ActivityType>
+ <ActivityType>
<name>Change Case Type</name>
</ActivityType>
<ActivityType>
@@ -104,6 +104,6 @@
</RelationshipType>
<RelationshipType>
<name>Benefits Specialist</name>
- </RelationshipType>
+ </RelationshipType>
</CaseRoles>
</CaseType>
diff --git a/xml/configuration/Settings.xml b/xml/configuration/Settings.xml
index a6cd3cada5a3ce056735622d6a372c8b5ba40a68..ffd76a0e37a0759836fbf5a878d830a7d9ca0101 100644
--- a/xml/configuration/Settings.xml
+++ b/xml/configuration/Settings.xml
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings>
- <!-- List the group whose members should appear as contacts on all Manage Case screens.
- Only one group name is supported for now.
- It needs to match the name column in the civicrm_group table (not the title), so avoid using space characters. -->
- <group name="Case_Resources" />
- <!-- Set this to 1 if you want case activity emails to be redacted -->
+ <!-- List the group whose members should appear as contacts on all Manage Case screens.
+ Only one group name is supported for now.
+ It needs to match the name column in the civicrm_group table (not the title), so avoid using space characters. -->
+ <group name="Case_Resources" />
+ <!-- Set this to 1 if you want case activity emails to be redacted -->
<RedactActivityEmail>0</RedactActivityEmail>
- <!-- Set this to 1 if you want to allow multiple clients to be associated with a single case -->
- <AllowMultipleCaseClients>0</AllowMultipleCaseClients>
- <!-- Set this to 1 if you want to have activity types on Manage Case
- screen sorted in XML file order, default is alphabetical -->
- <NaturalActivityTypeSort>0</NaturalActivityTypeSort>
- <!-- Add activity types which should NOT be editable here with editable = 0 -->
- <ActivityTypes>
- <ActivityType>
- <name>Change Case Status</name>
- <editable>0</editable>
+ <!-- Set this to 1 if you want to allow multiple clients to be associated with a single case -->
+ <AllowMultipleCaseClients>0</AllowMultipleCaseClients>
+ <!-- Set this to 1 if you want to have activity types on Manage Case
+ screen sorted in XML file order, default is alphabetical -->
+ <NaturalActivityTypeSort>0</NaturalActivityTypeSort>
+ <!-- Add activity types which should NOT be editable here with editable = 0 -->
+ <ActivityTypes>
+ <ActivityType>
+ <name>Change Case Status</name>
+ <editable>0</editable>
</ActivityType>
- <ActivityType>
- <name>Change Case Start Date</name>
- <editable>0</editable>
+ <ActivityType>
+ <name>Change Case Start Date</name>
+ <editable>0</editable>
</ActivityType>
- </ActivityTypes>
+ </ActivityTypes>
</Settings>
\ No newline at end of file
diff --git a/xml/schema/ACL/Cache.xml b/xml/schema/ACL/Cache.xml
index 5143df587ccf4e84f9db7f8622696994e34a3334..810fb24afc46e7063330a2590436d6f6cdccd326 100644
--- a/xml/schema/ACL/Cache.xml
+++ b/xml/schema/ACL/Cache.xml
@@ -36,7 +36,7 @@
<required>true</required>
<comment>Foreign Key to ACL</comment>
<add>1.6</add>
- </field>
+ </field>
<foreignKey>
<name>acl_id</name>
<table>civicrm_acl</table>
diff --git a/xml/schema/Activity/ActivityTarget.xml b/xml/schema/Activity/ActivityTarget.xml
index bcdeffbfee07226583009c36818c947c0bfe7229..6b5cba7867d1e5602bdfae1eea27ce58f441d4db 100644
--- a/xml/schema/Activity/ActivityTarget.xml
+++ b/xml/schema/Activity/ActivityTarget.xml
@@ -18,7 +18,7 @@
<name>id</name>
<autoincrement>true</autoincrement>
</primaryKey>
- <field>
+ <field>
<name>activity_id</name>
<type>int unsigned</type>
<title>Activity ID</title>
@@ -34,7 +34,7 @@
<onDelete>CASCADE</onDelete>
</foreignKey>
- <field>
+ <field>
<name>target_contact_id</name>
<title>Contact ID (match to contact)</title>
<import>true</import>
@@ -54,7 +54,7 @@
<index>
<name>UI_activity_target_contact_id</name>
<fieldName>target_contact_id</fieldName>
- <fieldName>activity_id</fieldName>
+ <fieldName>activity_id</fieldName>
<unique>true</unique>
<add>2.0</add>
</index>
diff --git a/xml/schema/Bridge/OG.xml b/xml/schema/Bridge/OG.xml
index 0274a19b9833e100f190fb139bec9be9efe06692..c9e8a28e929f865e2d7659c7067ce8a93aa47d81 100644
--- a/xml/schema/Bridge/OG.xml
+++ b/xml/schema/Bridge/OG.xml
@@ -17,67 +17,67 @@
<name>id</name>
<autoincrement>true</autoincrement>
</primaryKey>
- <field>
- <name>drupal_og_id</name>
- <type>int unsigned</type>
- <comment>Foreign key to the organic group.</comment>
- <add>2.0</add>
+ <field>
+ <name>drupal_og_id</name>
+ <type>int unsigned</type>
+ <comment>Foreign key to the organic group.</comment>
+ <add>2.0</add>
</field>
- <index>
- <name>index_drupal_og_id</name>
- <fieldName>index_drupal_og_id</fieldName>
- <add>2.0</add>
+ <index>
+ <name>index_drupal_og_id</name>
+ <fieldName>index_drupal_og_id</fieldName>
+ <add>2.0</add>
</index>
- <field>
- <name>group_id</name>
- <type>int unsigned</type>
- <required>true</required>
- <comment>FK to civicrm group.</comment>
- <add>2.0</add>
- </field>
- <foreignKey>
- <name>group_id</name>
- <table>civicrm_group</table>
- <key>id</key>
- <add>2.0</add>
- </foreignKey>
- <field>
- <name>acl_id</name>
- <type>int unsigned</type>
- <required>true</required>
- <comment>FK to civicrm acl.</comment>
- <add>2.0</add>
- </field>
- <foreignKey>
- <name>acl_id</name>
- <table>civicrm_acl</table>
- <key>id</key>
- <add>2.0</add>
- </foreignKey>
- <field>
- <name>admin_group_id</name>
- <type>int unsigned</type>
- <required>true</required>
- <comment>FK to admin civicrm group.</comment>
- <add>2.0</add>
- </field>
- <foreignKey>
- <name>admin_group_id</name>
- <table>civicrm_group</table>
- <key>id</key>
- <add>2.0</add>
- </foreignKey>
- <field>
- <name>admin_acl_id</name>
- <type>int unsigned</type>
- <required>true</required>
- <comment>FK to civicrm acl.</comment>
+ <field>
+ <name>group_id</name>
+ <type>int unsigned</type>
+ <required>true</required>
+ <comment>FK to civicrm group.</comment>
+ <add>2.0</add>
+ </field>
+ <foreignKey>
+ <name>group_id</name>
+ <table>civicrm_group</table>
+ <key>id</key>
+ <add>2.0</add>
+ </foreignKey>
+ <field>
+ <name>acl_id</name>
+ <type>int unsigned</type>
+ <required>true</required>
+ <comment>FK to civicrm acl.</comment>
+ <add>2.0</add>
+ </field>
+ <foreignKey>
+ <name>acl_id</name>
+ <table>civicrm_acl</table>
+ <key>id</key>
+ <add>2.0</add>
+ </foreignKey>
+ <field>
+ <name>admin_group_id</name>
+ <type>int unsigned</type>
+ <required>true</required>
+ <comment>FK to admin civicrm group.</comment>
<add>2.0</add>
- </field>
- <foreignKey>
- <name>admin_acl_id</name>
- <table>civicrm_acl</table>
- <key>id</key>
- <add>2.0</add>
- </foreignKey>
+ </field>
+ <foreignKey>
+ <name>admin_group_id</name>
+ <table>civicrm_group</table>
+ <key>id</key>
+ <add>2.0</add>
+ </foreignKey>
+ <field>
+ <name>admin_acl_id</name>
+ <type>int unsigned</type>
+ <required>true</required>
+ <comment>FK to civicrm acl.</comment>
+ <add>2.0</add>
+ </field>
+ <foreignKey>
+ <name>admin_acl_id</name>
+ <table>civicrm_acl</table>
+ <key>id</key>
+ <add>2.0</add>
+ </foreignKey>
</table>
diff --git a/xml/schema/Core/ActionSchedule.xml b/xml/schema/Core/ActionSchedule.xml
index 828414e3c8b659b5cc32afe72ea8a505f456242f..12d6feb003a8de6831a89aff921e297569754521 100644
--- a/xml/schema/Core/ActionSchedule.xml
+++ b/xml/schema/Core/ActionSchedule.xml
@@ -192,7 +192,7 @@
<name>group_id</name>
<type>int unsigned</type>
<comment>FK to Group</comment>
- <add>3.4</add>
+ <add>3.4</add>
</field>
<foreignKey>
<name>group_id</name>
@@ -202,14 +202,14 @@
</foreignKey>
<field>
<name>msg_template_id</name>
- <type>int unsigned</type>
- <comment>FK to the message template.</comment>
+ <type>int unsigned</type>
+ <comment>FK to the message template.</comment>
</field>
<foreignKey>
<name>msg_template_id</name>
- <table>civicrm_msg_template</table>
- <key>id</key>
- <onDelete>SET NULL</onDelete>
+ <table>civicrm_msg_template</table>
+ <key>id</key>
+ <onDelete>SET NULL</onDelete>
</foreignKey>
<field>
<name>absolute_date</name>
diff --git a/xml/schema/Core/MappingField.xml b/xml/schema/Core/MappingField.xml
index c17e575ed280d236bbd1ebceedc9200a67688fd2..fd6125ba012848b110d59f538f35041590ac883d 100644
--- a/xml/schema/Core/MappingField.xml
+++ b/xml/schema/Core/MappingField.xml
@@ -111,7 +111,7 @@
<field>
<name>grouping</name>
<type>int unsigned</type>
- <default>1</default>
+ <default>1</default>
<comment>Used to group mapping_field records into related sets (e.g. for criteria sets in search builder mappings).</comment>
<add>1.5</add>
</field>
diff --git a/xml/schema/Event/Cart/files.xml b/xml/schema/Event/Cart/files.xml
index e7790cfe3726019496558467f7960d7b0b60e681..221e1d1004f51d5a3f7709e8b55d0720922007e2 100644
--- a/xml/schema/Event/Cart/files.xml
+++ b/xml/schema/Event/Cart/files.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1" ?>
<tables xmlns:xi="http://www.w3.org/2001/XInclude">
- <xi:include href="Cart.xml" parse="xml" />
+ <xi:include href="Cart.xml" parse="xml" />
<xi:include href="EventInCart.xml" parse="xml" />
</tables>
diff --git a/xml/schema/Mailing/Event/Forward.xml b/xml/schema/Mailing/Event/Forward.xml
index 9b9ab3d3bed230099286651aed6669993d556daa..813abd255ceb52db18343b838cf5f64b1a69b919 100644
--- a/xml/schema/Mailing/Event/Forward.xml
+++ b/xml/schema/Mailing/Event/Forward.xml
@@ -36,7 +36,7 @@
<name>dest_queue_id</name>
<table>civicrm_mailing_event_queue</table>
<key>id</key>
- <onDelete>SET NULL</onDelete>
+ <onDelete>SET NULL</onDelete>
</foreignKey>
<field>
<name>time_stamp</name>
diff --git a/xml/schema/Mailing/Event/Queue.xml b/xml/schema/Mailing/Event/Queue.xml
index 38486b83a698b3dbade44841463313952583e568..13c8d775d822954b5eded6463343d4d6197df7cf 100644
--- a/xml/schema/Mailing/Event/Queue.xml
+++ b/xml/schema/Mailing/Event/Queue.xml
@@ -30,7 +30,7 @@
<field>
<name>email_id</name>
<type>int unsigned</type>
- <default>NULL</default>
+ <default>NULL</default>
<comment>FK to Email</comment>
</field>
<foreignKey>
@@ -61,7 +61,7 @@
<field>
<name>phone_id</name>
<type>int unsigned</type>
- <default>NULL</default>
+ <default>NULL</default>
<comment>FK to Phone</comment>
</field>
<foreignKey>
diff --git a/xml/schema/Member/Membership.xml b/xml/schema/Member/Membership.xml
index d2c3969b80d92ed7de36b286115f919525c16c86..8c7ef93bb9505a6382b2dec4d32d6b5370d388c7 100644
--- a/xml/schema/Member/Membership.xml
+++ b/xml/schema/Member/Membership.xml
@@ -132,7 +132,7 @@
<field>
<name>owner_membership_id</name>
<type>int unsigned</type>
- <title>Primary Member ID</title>
+ <title>Primary Member ID</title>
<comment>Optional FK to Parent Membership.</comment>
<export>true</export>
<add>1.7</add>
diff --git a/xml/templates/message_templates/case_activity_html.tpl b/xml/templates/message_templates/case_activity_html.tpl
index 24156e560171e2662279bbb9f7bdf22792874598..dd54906ce3e6582a62381b06a67f29fbbeda0a11 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}
<tr>
<td colspan="2" {$valueStyle}>
- <a href="{$manageCaseURL}" title="{ts}Manage Case{/ts}">{ts}Manage Case{/ts}</a>
+ <a href="{$manageCaseURL}" title="{ts}Manage Case{/ts}">{ts}Manage Case{/ts}</a>
</td>
</tr>
{/if}
{/if}
- {if $editActURL}
+ {if $editActURL}
<tr>
<td colspan="2" {$valueStyle}>
- <a href="{$editActURL}" title="{ts}Edit this activity{/ts}">{ts}Edit this activity{/ts}</a>
+ <a href="{$editActURL}" title="{ts}Edit this activity{/ts}">{ts}Edit this activity{/ts}</a>
</td>
</tr>
{/if}
{if $viewActURL}
<tr>
<td colspan="2" {$valueStyle}>
- <a href="{$viewActURL}" title="{ts}View this activity{/ts}">{ts}View this activity{/ts}</a>
+ <a href="{$viewActURL}" title="{ts}View this activity{/ts}">{ts}View this activity{/ts}</a>
</td>
- </tr>
- {/if}
+ </tr>
+ {/if}
{foreach from=$activity.fields item=field}
<tr>
<td {$labelStyle}>
diff --git a/xml/templates/message_templates/contribution_online_receipt_html.tpl b/xml/templates/message_templates/contribution_online_receipt_html.tpl
index 976c24ad461157cf036eedccb6a21701b577e9fe..48bde393ba5a7792977f812dfb340440ada61c76 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 @@
<td colspan="2" {$labelStyle}>
{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this recurring contribution by <a href="%1">visiting this web page</a>.{/ts}
</td>
- {/if}
+ {/if}
<tr>
</tr>
<td colspan="2" {$labelStyle}>
diff --git a/xml/templates/message_templates/contribution_recurring_billing_html.tpl b/xml/templates/message_templates/contribution_recurring_billing_html.tpl
index 3e3ad1b6fc7b60c0130278de3db527a4448902c4..f2b9d48842391578f8bc0d227c5260e4755200a3 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}
</td>
</tr>
- </table>
+ </table>
</center>
</body>
diff --git a/xml/templates/message_templates/contribution_recurring_edit_text.tpl b/xml/templates/message_templates/contribution_recurring_edit_text.tpl
index 71a02ccbc195a12375eb292bc0bf63d77bb14778..423b00c9cd62a9d62eb5105898dafca2199cef14 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 fc8513b2d7676356049e0cfc93fda90ce67ee15e..3a6b18bac14f896d3823db2ab2afb8c02481e513 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 @@
</tr>
<tr>
<td {$labelStyle}>
- {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments details for this recurring contribution by <a href="%1">visiting this web page</a>.{/ts}
+ {ts 1=$updateSubscriptionUrl}You can update recurring contribution amount or change the number of installments details for this recurring contribution by <a href="%1">visiting this web page</a>.{/ts}
</td>
</tr>
{/if}
@@ -77,7 +77,7 @@
{if $auto_renew_membership}
<tr>
<td>
- <p>{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}</p>
+ <p>{ts}Your auto renew membership sign-up has ended and your membership will not be automatically renewed.{/ts}</p>
</td>
</tr>
{else}
diff --git a/xml/templates/message_templates/contribution_recurring_notify_text.tpl b/xml/templates/message_templates/contribution_recurring_notify_text.tpl
index 86602b7b40af8facdadd6bb0ddf19eccc540b312..5f54ca1568dc1b6f8b1b8c8e68db979d6b3e178c 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 <a href="%1">visiting this web page</a>.{/ts}
{ts 1=$updateSubscriptionBillingUrl}You can update billing details for this automatically renewed membership by <a href="%1">visiting this web page</a>.{/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 c0263439e4efab83d57515178a1c2f0e78950d0d..da8df90665f88e3283784572586ccd11b5b681e2 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}</p>
<th>{ts}Qty{/ts}</th>
<th>{ts}Each{/ts}</th>
<th>{ts}Total{/ts}</th>
- {if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}
+ {if $pricesetFieldsCount }<th>{ts}Total Participants{/ts}</th>{/if}
</tr>
{foreach from=$value item=line}
<tr>
<td>
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:"..."}</div>{/if}
+ {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:"..."}</div>{/if}
</td>
<td>
{$line.qty}
@@ -194,11 +194,11 @@ registration process.{/ts}</p>
<td>
{$line.line_total|crmMoney}
</td>
- {if $pricesetFieldsCount }
- <td>
- {$line.participant_count}
+ {if $pricesetFieldsCount }
+ <td>
+ {$line.participant_count}
</td>
- {/if}
+ {/if}
</tr>
{/foreach}
</table>
@@ -228,10 +228,10 @@ registration process.{/ts}</p>
</tr>
{if $pricesetFieldsCount }
<tr>
- <td {$labelStyle}>
- {ts}Total Participants{/ts}</td>
+ <td {$labelStyle}>
+ {ts}Total Participants{/ts}</td>
<td {$valueStyle}>
- {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}</p>
{/foreach}
{if $lineItemCount < 1 }
assign var="lineItemCount" value=1}
- {/if}
+ {/if}
{assign var="count" value=$count+$lineItemCount}
{/if}
{/foreach}
- {$count}
+ {$count}
</td>
</tr>
{/if}
diff --git a/xml/templates/message_templates/event_offline_receipt_text.tpl b/xml/templates/message_templates/event_offline_receipt_text.tpl
index b591f22361c04c8b202de23515a4ecb9bfcfa8df..0890ed6e8c3e09b1e75b20d8ab7afb28753a910f 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 f23503ea20e707c20391ef7f12538d1f793d1edb..56159a7aea563d9e7633a41514758ceccd79c022 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 @@
<p>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"}:</p>
-
+
{if $billing_name}
- <table class="billing-info">
+ <table class="billing-info">
<tr>
- <th style="text-align: left;">
- {ts}Billing Name and Address{/ts}
- </th>
+ <th style="text-align: left;">
+ {ts}Billing Name and Address{/ts}
+ </th>
</tr>
<tr>
- <td>
- {$billing_name}<br />
- {$billing_street_address}<br />
- {$billing_city}, {$billing_state} {$billing_postal_code}<br/>
- <br/>
- {$email}
- </td>
- </tr>
+ <td>
+ {$billing_name}<br />
+ {$billing_street_address}<br />
+ {$billing_city}, {$billing_state} {$billing_postal_code}<br/>
+ <br/>
+ {$email}
+ </td>
+ </tr>
</table>
{/if}
{if $credit_card_type}
- <p> </p>
- <table class="billing-info">
+ <p> </p>
+ <table class="billing-info">
<tr>
- <th style="text-align: left;">
- {ts}Credit Card Information{/ts}
- </th>
+ <th style="text-align: left;">
+ {ts}Credit Card Information{/ts}
+ </th>
</tr>
<tr>
- <td>
- {$credit_card_type}<br />
- {$credit_card_number}<br />
- {ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y}
- </td>
- </tr>
+ <td>
+ {$credit_card_type}<br />
+ {$credit_card_number}<br />
+ {ts}Expires{/ts}: {$credit_card_exp_date.M}/{$credit_card_exp_date.Y}
+ </td>
+ </tr>
</table>
{/if}
{if $source}
@@ -70,117 +70,117 @@
<p> </p>
<table width="600">
<thead>
- <tr>
+ <tr>
{if $line_items}
- <th style="text-align: left;">
- Event
- </th>
- <th style="text-align: left;">
- Participants
- </th>
+ <th style="text-align: left;">
+ Event
+ </th>
+ <th style="text-align: left;">
+ Participants
+ </th>
{/if}
- <th style="text-align: left;">
- Price
- </th>
- <th style="text-align: left;">
- Total
- </th>
- </tr>
- </thead>
+ <th style="text-align: left;">
+ Price
+ </th>
+ <th style="text-align: left;">
+ Total
+ </th>
+ </tr>
+ </thead>
<tbody>
- {foreach from=$line_items item=line_item}
- <tr>
- <td style="width: 220px">
- {$line_item.event->title} ({$line_item.event->start_date|date_format:"%D"})<br />
- {if $line_item.event->is_show_location}
- {if $line_item.location.address.1.name}
- {$line_item.location.address.1.name}<br />
- {/if}
- {if $line_item.location.address.1.street_address}
- {$line_item.location.address.1.street_address}<br />
- {/if}
- {if $line_item.location.address.1.supplemental_address_1}
- {$line_item.location.address.1.supplemental_address_1}<br />
- {/if}
- {if $line_item.location.address.1.supplemental_address_2}
- {$line_item.location.address.1.supplemental_address_2}<br />
- {/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*}<br /><br />
- {$line_item.event->start_date|date_format:"%D %I:%M %p"} - {$line_item.event->end_date|date_format:"%I:%M %p"}
- </td>
- <td style="width: 180px">
- {$line_item.num_participants}
- {if $line_item.num_participants > 0}
- <div class="participants" style="padding-left: 10px;">
- {foreach from=$line_item.participants item=participant}
- {$participant.display_name}<br />
- {/foreach}
- </div>
- {/if}
- {if $line_item.num_waiting_participants > 0}
- Waitlisted:<br/>
- <div class="participants" style="padding-left: 10px;">
- {foreach from=$line_item.waiting_participants item=participant}
- {$participant.display_name}<br />
- {/foreach}
- </div>
- {/if}
- </td>
- <td style="width: 100px">
- {$line_item.cost|crmMoney:$currency|string_format:"%10s"}
- </td>
- <td style="width: 100px">
- {$line_item.amount|crmMoney:$currency|string_format:"%10s"}
- </td>
- </tr>
- {/foreach}
+ {foreach from=$line_items item=line_item}
+ <tr>
+ <td style="width: 220px">
+ {$line_item.event->title} ({$line_item.event->start_date|date_format:"%D"})<br />
+ {if $line_item.event->is_show_location}
+ {if $line_item.location.address.1.name}
+ {$line_item.location.address.1.name}<br />
+ {/if}
+ {if $line_item.location.address.1.street_address}
+ {$line_item.location.address.1.street_address}<br />
+ {/if}
+ {if $line_item.location.address.1.supplemental_address_1}
+ {$line_item.location.address.1.supplemental_address_1}<br />
+ {/if}
+ {if $line_item.location.address.1.supplemental_address_2}
+ {$line_item.location.address.1.supplemental_address_2}<br />
+ {/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*}<br /><br />
+ {$line_item.event->start_date|date_format:"%D %I:%M %p"} - {$line_item.event->end_date|date_format:"%I:%M %p"}
+ </td>
+ <td style="width: 180px">
+ {$line_item.num_participants}
+ {if $line_item.num_participants > 0}
+ <div class="participants" style="padding-left: 10px;">
+ {foreach from=$line_item.participants item=participant}
+ {$participant.display_name}<br />
+ {/foreach}
+ </div>
+ {/if}
+ {if $line_item.num_waiting_participants > 0}
+ Waitlisted:<br/>
+ <div class="participants" style="padding-left: 10px;">
+ {foreach from=$line_item.waiting_participants item=participant}
+ {$participant.display_name}<br />
+ {/foreach}
+ </div>
+ {/if}
+ </td>
+ <td style="width: 100px">
+ {$line_item.cost|crmMoney:$currency|string_format:"%10s"}
+ </td>
+ <td style="width: 100px">
+ {$line_item.amount|crmMoney:$currency|string_format:"%10s"}
+ </td>
+ </tr>
+ {/foreach}
</tbody>
<tfoot>
- {if $discounts}
- <tr>
- <td>
- </td>
- <td>
- </td>
- <td>
- Subtotal:
- </td>
- <td>
- {$sub_total|crmMoney:$currency|string_format:"%10s"}
- </td>
- </tr>
- {foreach from=$discounts key=myId item=i}
- <tr>
- <td>
- {$i.title}
- </td>
- <td>
- </td>
- <td>
- </td>
- <td>
- -{$i.amount}
- </td>
- </tr>
- {/foreach}
- {/if}
- <tr>
+ {if $discounts}
+ <tr>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ Subtotal:
+ </td>
+ <td>
+ {$sub_total|crmMoney:$currency|string_format:"%10s"}
+ </td>
+ </tr>
+ {foreach from=$discounts key=myId item=i}
+ <tr>
+ <td>
+ {$i.title}
+ </td>
+ <td>
+ </td>
+ <td>
+ </td>
+ <td>
+ -{$i.amount}
+ </td>
+ </tr>
+ {/foreach}
+ {/if}
+ <tr>
{if $line_items}
- <td>
- </td>
- <td>
- </td>
+ <td>
+ </td>
+ <td>
+ </td>
{/if}
- <td>
- <strong>Total:</strong>
- </td>
- <td>
- <strong> {$total|crmMoney:$currency|string_format:"%10s"}</strong>
- </td>
- </tr>
+ <td>
+ <strong>Total:</strong>
+ </td>
+ <td>
+ <strong> {$total|crmMoney:$currency|string_format:"%10s"}</strong>
+ </td>
+ </tr>
</tfoot>
</table>
diff --git a/xml/templates/message_templates/event_registration_receipt_text.tpl b/xml/templates/message_templates/event_registration_receipt_text.tpl
index 23e26cd32ac11d1dc69479f450df650352cc6fd4..9620798772d80e3304c8bb5d7fd6986850bc17bb 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 9997c5ef09bd3df46025dcc6052507d6ca2e0dee..a8ec69f11623ee3b10e87810029832ec2e3290b8 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}
</td>
</tr>
-
- </table>
+
+ </table>
</center>
</body>
diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl
index 280d70930da37811eccfca8a11ddec3888064cfe..da729d44331b461cb28567991624c3286be11a3b 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 @@
<tr>
<th>{ts}Item{/ts}</th>
<th>{ts}Fee{/ts}</th>
- <th>{ts}Membership Start Date{/ts}</th>
- <th>{ts}Membership End Date{/ts}</th>
+ <th>{ts}Membership Start Date{/ts}</th>
+ <th>{ts}Membership End Date{/ts}</th>
</tr>
{foreach from=$value item=line}
<tr>
<td>
- {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:"..."}</div>{/if}
+ {if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description}<div>{$line.description|truncate:30:"..."}</div>{/if}
</td>
<td>
{$line.line_total|crmMoney}
@@ -109,7 +109,7 @@
<td>
{$line.start_date}
</td>
- <td>
+ <td>
{$line.end_date}
</td>
</tr>
diff --git a/xml/templates/message_templates/membership_offline_receipt_text.tpl b/xml/templates/message_templates/membership_offline_receipt_text.tpl
index 84e9730464fc8b4325c3c5ab7df4de4e5c117698..812606bdcec628b581b4f3a14ba919af0cc37348 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 fc46a888a93ac1a3bf40990864e804f5899b7d69..c56152bbaa360954434236521e4f90c5d2aea8ef 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 @@
<tr>
<th>{ts}Item{/ts}</th>
<th>{ts}Fee{/ts}</th>
- <th>{ts}Membership Start Date{/ts}</th>
- <th>{ts}Membership End Date{/ts}</th>
+ <th>{ts}Membership Start Date{/ts}</th>
+ <th>{ts}Membership End Date{/ts}</th>
</tr>
{foreach from=$value item=line}
<tr>
@@ -185,7 +185,7 @@
<td>
{$line.start_date}
</td>
- <td>
+ <td>
{$line.end_date}
</td>
</tr>
diff --git a/xml/templates/message_templates/participant_confirm_html.tpl b/xml/templates/message_templates/participant_confirm_html.tpl
index ba066764493719776f8d0aa099cd94b269386981..10aba0e2cd194d445b80b59e85e8840e72b26f66 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}
<tr>
<td colspan="2" {$labelStyle}>
- {ts}Your schedule:{/ts}
+ {ts}Your schedule:{/ts}
</td>
</tr>
<tr>
<td colspan="2" {$valueStyle}>
- {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}
<em>{$group_by_day|date_format:"%m/%d/%Y"}</em><br />
- {/if}
- {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />
- {if $session.location} {$session.location}<br />{/if}
- {/foreach}
+ {/if}
+ {$session.start_date|crmDate:0:1}{if $session.end_date}-{$session.end_date|crmDate:0:1}{/if} {$session.title}<br />
+ {if $session.location} {$session.location}<br />{/if}
+ {/foreach}
</td>
</tr>
{/if}
diff --git a/xml/templates/message_templates/petition_confirmation_needed_html.tpl b/xml/templates/message_templates/petition_confirmation_needed_html.tpl
index 5547ac0304d1e911dbf9f6fd77c8572cfa5c20ae..2d30dc11c79d99d58938c9342e725e7f2909edf6 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 @@
<p>Thank you for signing {$petition.title}.</p>
-<p>In order to <b>complete your signature</b>, we must confirm your e-mail.
+<p>In order to <b>complete your signature</b>, we must confirm your e-mail.
<br />
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 1d9c3d60d92b91052f136383387aaef8666c2e7d..8549b39b4c41d3544a1d04a508bfcf2ad0d20445 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 c0438bc9f9895be38c552319b384bf8b5c8acbb6..20cc6a1050b7103ea792c42c10e14206e4bc0c3f 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 bf4c95f1052dd262ac592ecd0163271f9d33e97d..5821007a01be32e6d2b4f2a2c00d27f6fb9f2790 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}