From a235e13ca723fd253cc43bdbf400ed7d4dc58c92 Mon Sep 17 00:00:00 2001 From: eileen Date: Tue, 18 Jun 2013 13:39:52 +1200 Subject: [PATCH] space tabs for double spaces --- .../api/v3/dataset/mailing_contact.xml | 4 +- .../api/v3/dataset/mailing_delivered.xml | 220 +++++++++--------- xml/templates/civicrm_data.tpl | 100 ++++---- xml/templates/civicrm_msg_template.tpl | 212 ++++++++--------- xml/templates/civicrm_navigation.tpl | 2 +- xml/templates/joomla.tpl | 8 +- .../event_online_receipt_html.tpl | 44 ++-- .../event_online_receipt_text.tpl | 6 +- 8 files changed, 298 insertions(+), 298 deletions(-) diff --git a/tests/phpunit/api/v3/dataset/mailing_contact.xml b/tests/phpunit/api/v3/dataset/mailing_contact.xml index 3a0a6d77b3..d4d1ddc9ea 100644 --- a/tests/phpunit/api/v3/dataset/mailing_contact.xml +++ b/tests/phpunit/api/v3/dataset/mailing_contact.xml @@ -49,7 +49,7 @@ sic_code user_unique_id employer_id - is_deleted + is_deleted 23 Individual @@ -98,7 +98,7 @@ - 0 + 0 diff --git a/tests/phpunit/api/v3/dataset/mailing_delivered.xml b/tests/phpunit/api/v3/dataset/mailing_delivered.xml index ee74d7962f..44ae5b1a2a 100644 --- a/tests/phpunit/api/v3/dataset/mailing_delivered.xml +++ b/tests/phpunit/api/v3/dataset/mailing_delivered.xml @@ -2,104 +2,104 @@ - id - domain_id - header_id - footer_id - reply_id - unsubscribe_id - resubscribe_id - optout_id - name - from_name - from_email - replyto_email - subject - body_text - body_html - url_tracking - forward_replies - auto_responder - open_tracking - is_completed - msg_template_id - override_verp - created_id - created_date - scheduled_id - scheduled_date - approver_id - approval_date - approval_status_id - approval_note - is_archived - visibility - campaign_id - dedupe_email - sms_provider_id - - 1 - 1 - 1 - 2 - - - - - Test Mailing - - - somereply@testing.org - Some Subject - Just a body... nothing to see here. - Just some html... - - - - 0 - 1 - - - 1 - - - - - - - - 0 - User and User Admin Only - - 0 - - + id + domain_id + header_id + footer_id + reply_id + unsubscribe_id + resubscribe_id + optout_id + name + from_name + from_email + replyto_email + subject + body_text + body_html + url_tracking + forward_replies + auto_responder + open_tracking + is_completed + msg_template_id + override_verp + created_id + created_date + scheduled_id + scheduled_date + approver_id + approval_date + approval_status_id + approval_note + is_archived + visibility + campaign_id + dedupe_email + sms_provider_id + + 1 + 1 + 1 + 2 + + + + + Test Mailing + + + somereply@testing.org + Some Subject + Just a body... nothing to see here. + Just some html... + + + + 0 + 1 + + + 1 + + + + + + + + 0 + User and User Admin Only + + 0 + +
- id - mailing_id - scheduled_date - start_date - end_date - status - is_test - job_type - parent_id - job_offset - job_limit - - 1 - 1 - - - - complete - 0 - - - 0 - 0 - + id + mailing_id + scheduled_date + start_date + end_date + status + is_test + job_type + parent_id + job_offset + job_limit + + 1 + 1 + + + + complete + 0 + + + 0 + 0 +
id @@ -109,22 +109,22 @@ hashphone_id - 1 - 1 - 1 - 23 - 80569af03942f016 - + 1 + 1 + 1 + 23 + 80569af03942f016 +
- id - event_queue_id - time_stamp - - 1 - 1 - 2013-04-30 18:11:26 - + id + event_queue_id + time_stamp + + 1 + 1 + 2013-04-30 18:11:26 +
diff --git a/xml/templates/civicrm_data.tpl b/xml/templates/civicrm_data.tpl index edd46ff039..1a0d0ac74c 100644 --- a/xml/templates/civicrm_data.tpl +++ b/xml/templates/civicrm_data.tpl @@ -201,7 +201,7 @@ VALUES ('batch_status' , '{ts escape="sql"}Batch Status{/ts}' , 1, 1), ('sms_api_type' , '{ts escape="sql"}Api Type{/ts}' , 1, 1), ('sms_provider_name' , '{ts escape="sql"}Sms Provider Internal Name{/ts}' , 1, 1), - ('auto_renew_options' , '{ts escape="sql"}Auto Renew Options{/ts}' , 1, 1), + ('auto_renew_options' , '{ts escape="sql"}Auto Renew Options{/ts}' , 1, 1), ('financial_account_type' , '{ts escape="sql"}Financial Account Type{/ts}' , 1, 1), ('financial_item_status' , '{ts escape="sql"}Financial Item Status{/ts}' , 1, 1); @@ -296,8 +296,8 @@ VALUES (@option_group_id_pcm, '{ts escape="sql"}SMS{/ts}', 4, NULL, NULL, 0, NULL, 4, NULL, 0, 0, 1, NULL, NULL), (@option_group_id_pcm, '{ts escape="sql"}Fax{/ts}', 5, NULL, NULL, 0, NULL, 5, NULL, 0, 0, 1, NULL, NULL), - (@option_group_id_act, '{ts escape="sql"}Meeting{/ts}', 1, 'Meeting', NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL), - (@option_group_id_act, '{ts escape="sql"}Phone Call{/ts}', 2, 'Phone Call', NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL), + (@option_group_id_act, '{ts escape="sql"}Meeting{/ts}', 1, 'Meeting', NULL, 0, NULL, 1, NULL, 0, 1, 1, NULL, NULL), + (@option_group_id_act, '{ts escape="sql"}Phone Call{/ts}', 2, 'Phone Call', NULL, 0, NULL, 2, NULL, 0, 1, 1, NULL, NULL), (@option_group_id_act, '{ts escape="sql"}Email{/ts}', 3, 'Email', NULL, 1, NULL, 3, '{ts escape="sql"}Email sent.{/ts}', 0, 1, 1, NULL, NULL), (@option_group_id_act, '{ts escape="sql"}Outbound SMS{/ts}', 4, 'SMS', NULL, 1, NULL, 4, '{ts escape="sql"}Text message (SMS) sent.{/ts}', 0, 1, 1, NULL, NULL), (@option_group_id_act, '{ts escape="sql"}Event Registration{/ts}', 5, 'Event Registration', NULL, 1, NULL, 5, '{ts escape="sql"}Online or offline event registration.{/ts}', 0, 1, 1, @eventCompId, NULL), @@ -346,7 +346,7 @@ VALUES (@option_group_id_act, '{ts escape="sql"}Update Recurring Contribution Billing Details{/ts}', 38, 'Update Recurring Contribution Billing Details', NULL,1, 0, 38, '', 0, 1, 1, NULL, NULL), (@option_group_id_act, '{ts escape="sql"}Update Recurring Contribution{/ts}', 39, 'Update Recurring Contribution', NULL,1, 0, 39, '', 0, 1, 1, NULL, NULL), - (@option_group_id_act, '{ts escape="sql"}Reminder Sent{/ts}', 40, 'Reminder Sent', NULL, 1, 0, 40, '', 0, 1, 1, NULL, NULL), + (@option_group_id_act, '{ts escape="sql"}Reminder Sent{/ts}', 40, 'Reminder Sent', NULL, 1, 0, 40, '', 0, 1, 1, NULL, NULL), -- Activity Types for Financial Transactions Batch (@option_group_id_act, '{ts escape="sql"}Export Accounting Batch{/ts}', 41, 'Export Accounting Batch', NULL, 1, 0, 41, 'Export Accounting Batch', 0, 1, 1, @contributeCompId, NULL), @@ -1309,8 +1309,8 @@ INSERT INTO civicrm_uf_group (4, 'new_individual', 'Individual,Contact', '{ts escape="sql"}New Individual{/ts}' , 0, 1, NULL), (5, 'new_organization', 'Organization,Contact','{ts escape="sql"}New Organization{/ts}' , 0, 1, NULL), (6, 'new_household', 'Household,Contact', '{ts escape="sql"}New Household{/ts}' , 0, 1, NULL), - (7, 'summary_overlay', 'Contact', '{ts escape="sql"}Summary Overlay{/ts}' , 0, 1, NULL), - (8, 'shared_address', 'Contact', '{ts escape="sql"}Shared Address{/ts}' , 0, 1, NULL), + (7, 'summary_overlay', 'Contact', '{ts escape="sql"}Summary Overlay{/ts}' , 0, 1, NULL), + (8, 'shared_address', 'Contact', '{ts escape="sql"}Shared Address{/ts}' , 0, 1, NULL), (9, 'on_behalf_organization', 'Contact,Organization','{ts escape="sql"}On Behalf Of Organization{/ts}', 0, 1, NULL), (10, 'contribution_batch_entry', 'Contribution', '{ts escape="sql"}Contribution Bulk Entry{/ts}' , 0, 1, NULL), (11, 'membership_batch_entry', 'Membership', '{ts escape="sql"}Membership Bulk Entry{/ts}' , 0, 1, NULL), @@ -1334,41 +1334,41 @@ VALUES (1, 'Profile', NULL, NULL, 9, 12); INSERT INTO civicrm_uf_field - ( uf_group_id, field_name, is_required, is_reserved, weight, visibility, in_selector, is_searchable, location_type_id, label, field_type, help_post, phone_type_id ) VALUES - ( 1, 'first_name', 1, 0, 1, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}First Name{/ts}', 'Individual', NULL, NULL), - ( 1, 'last_name', 1, 0, 2, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Last Name{/ts}', 'Individual', NULL, NULL), - ( 1, 'street_address', 0, 0, 3, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Street Address (Home){/ts}', 'Contact', NULL, NULL), - ( 1, 'city', 0, 0, 4, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}City (Home){/ts}', 'Contact', NULL, NULL), - ( 1, 'postal_code', 0, 0, 5, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Postal Code (Home){/ts}', 'Contact', NULL, NULL), - ( 1, 'country', 0, 0, 6, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Country (Home){/ts}', 'Contact', NULL, NULL), - ( 1, 'state_province', 0, 0, 7, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}State (Home){/ts}', 'Contact', NULL, NULL), - ( 2, 'first_name', 1, 0, 1, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}First Name{/ts}', 'Individual', NULL, NULL), - ( 2, 'last_name', 1, 0, 2, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Last Name{/ts}', 'Individual', NULL, NULL), - ( 2, 'email', 1, 0, 3, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Email Address{/ts}', 'Contact', NULL, NULL), - ( 3, 'participant_status', 1, 1, 1, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Participant Status{/ts}', 'Participant', NULL, NULL), - ( 4, 'first_name', 1, 0, 1, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}First Name{/ts}', 'Individual', NULL, NULL), - ( 4, 'last_name', 1, 0, 2, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Last Name{/ts}', 'Individual', NULL, NULL), - ( 4, 'email', 0, 0, 3, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Email Address{/ts}', 'Contact', NULL, NULL), - ( 5, 'organization_name', 1, 0, 2, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Organization Name{/ts}', 'Organization',NULL, NULL), - ( 5, 'email', 0, 0, 3, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Email Address{/ts}', 'Contact', NULL, NULL), - ( 6, 'household_name', 1, 0, 2, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Household Name{/ts}', 'Household', NULL, NULL), - ( 6, 'email', 0, 0, 3, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Email Address{/ts}', 'Contact', NULL, NULL), - ( 7, 'phone' ,1 ,0 ,1 ,'User and User Admin Only' ,0 ,0 ,1 ,'{ts escape="sql"}Home Phone{/ts}' ,'Contact' ,NULL, 1 ), - ( 7, 'phone' ,1 ,0 ,2 ,'User and User Admin Only' ,0 ,0 ,1 ,'{ts escape="sql"}Home Mobile{/ts}' ,'Contact' ,NULL, 2 ), - ( 7, 'street_address', 1, 0, 3, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Primary Address{/ts}', 'Contact', NULL, NULL), - ( 7, 'city', 1, 0, 4, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}City{/ts}', 'Contact', NULL, NULL), - ( 7, 'state_province', 1, 0, 5, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}State{/ts}', 'Contact', NULL, NULL), - ( 7, 'postal_code', 1, 0, 6, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Postal Code{/ts}', 'Contact', NULL, NULL), - ( 7, 'email', 1, 0, 7, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Primary Email{/ts}', 'Contact', NULL, NULL), - ( 7, 'group', 1, 0, 8, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Groups{/ts}', 'Contact', NULL, NULL), - ( 7, 'tag', 1, 0, 9, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Tags{/ts}', 'Contact', NULL, NULL), - ( 7, 'gender' ,1 ,0 ,10 ,'User and User Admin Only' ,0 ,0 ,NULL, '{ts escape="sql"}Gender{/ts}' ,'Individual' ,NULL, NULL), - ( 7, 'birth_date' ,1 ,0 ,11 ,'User and User Admin Only' ,0 ,0 ,NULL, '{ts escape="sql"}Date of Birth{/ts}' ,'Individual' ,NULL, NULL), - ( 8, 'street_address', 1, 1, 1, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Street Address (Home){/ts}', 'Contact', NULL, NULL), - ( 8, 'city', 1, 1, 2, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}City (Home){/ts}', 'Contact', NULL, NULL), - ( 8, 'postal_code', 0, 0, 3, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Postal Code (Home){/ts}', 'Contact', NULL, NULL), - ( 8, 'country', 0, 0, 4, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Country (Home){/ts}', 'Contact', NULL, NULL), - ( 8, 'state_province', 0, 0, 5, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}State (Home){/ts}', 'Contact', NULL, NULL), + ( uf_group_id, field_name, is_required, is_reserved, weight, visibility, in_selector, is_searchable, location_type_id, label, field_type, help_post, phone_type_id ) VALUES + ( 1, 'first_name', 1, 0, 1, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}First Name{/ts}', 'Individual', NULL, NULL), + ( 1, 'last_name', 1, 0, 2, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Last Name{/ts}', 'Individual', NULL, NULL), + ( 1, 'street_address', 0, 0, 3, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Street Address (Home){/ts}', 'Contact', NULL, NULL), + ( 1, 'city', 0, 0, 4, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}City (Home){/ts}', 'Contact', NULL, NULL), + ( 1, 'postal_code', 0, 0, 5, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Postal Code (Home){/ts}', 'Contact', NULL, NULL), + ( 1, 'country', 0, 0, 6, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Country (Home){/ts}', 'Contact', NULL, NULL), + ( 1, 'state_province', 0, 0, 7, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}State (Home){/ts}', 'Contact', NULL, NULL), + ( 2, 'first_name', 1, 0, 1, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}First Name{/ts}', 'Individual', NULL, NULL), + ( 2, 'last_name', 1, 0, 2, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Last Name{/ts}', 'Individual', NULL, NULL), + ( 2, 'email', 1, 0, 3, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Email Address{/ts}', 'Contact', NULL, NULL), + ( 3, 'participant_status', 1, 1, 1, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Participant Status{/ts}', 'Participant', NULL, NULL), + ( 4, 'first_name', 1, 0, 1, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}First Name{/ts}', 'Individual', NULL, NULL), + ( 4, 'last_name', 1, 0, 2, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Last Name{/ts}', 'Individual', NULL, NULL), + ( 4, 'email', 0, 0, 3, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Email Address{/ts}', 'Contact', NULL, NULL), + ( 5, 'organization_name', 1, 0, 2, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Organization Name{/ts}', 'Organization',NULL, NULL), + ( 5, 'email', 0, 0, 3, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Email Address{/ts}', 'Contact', NULL, NULL), + ( 6, 'household_name', 1, 0, 2, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Household Name{/ts}', 'Household', NULL, NULL), + ( 6, 'email', 0, 0, 3, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Email Address{/ts}', 'Contact', NULL, NULL), + ( 7, 'phone', 1 ,0 ,1 ,'User and User Admin Only' ,0 ,0 ,1 ,'{ts escape="sql"}Home Phone{/ts}' ,'Contact' ,NULL, 1 ), + ( 7, 'phone', 1 ,0 ,2 ,'User and User Admin Only' ,0 ,0 ,1 ,'{ts escape="sql"}Home Mobile{/ts}' ,'Contact' ,NULL, 2 ), + ( 7, 'street_address', 1, 0, 3, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Primary Address{/ts}', 'Contact', NULL, NULL), + ( 7, 'city', 1, 0, 4, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}City{/ts}', 'Contact', NULL, NULL), + ( 7, 'state_province', 1, 0, 5, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}State{/ts}', 'Contact', NULL, NULL), + ( 7, 'postal_code', 1, 0, 6, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Postal Code{/ts}', 'Contact', NULL, NULL), + ( 7, 'email', 1, 0, 7, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Primary Email{/ts}', 'Contact', NULL, NULL), + ( 7, 'group', 1, 0, 8, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Groups{/ts}', 'Contact', NULL, NULL), + ( 7, 'tag', 1, 0, 9, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Tags{/ts}', 'Contact', NULL, NULL), + ( 7, 'gender', 1 ,0 ,10 ,'User and User Admin Only' ,0 ,0 ,NULL, '{ts escape="sql"}Gender{/ts}' ,'Individual' ,NULL, NULL), + ( 7, 'birth_date', 1 ,0 ,11 ,'User and User Admin Only' ,0 ,0 ,NULL, '{ts escape="sql"}Date of Birth{/ts}' ,'Individual' ,NULL, NULL), + ( 8, 'street_address', 1, 1, 1, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Street Address (Home){/ts}', 'Contact', NULL, NULL), + ( 8, 'city', 1, 1, 2, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}City (Home){/ts}', 'Contact', NULL, NULL), + ( 8, 'postal_code', 0, 0, 3, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Postal Code (Home){/ts}', 'Contact', NULL, NULL), + ( 8, 'country', 0, 0, 4, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}Country (Home){/ts}', 'Contact', NULL, NULL), + ( 8, 'state_province', 0, 0, 5, 'User and User Admin Only', 0, 0, 1, '{ts escape="sql"}State (Home){/ts}', 'Contact', NULL, NULL), ( 9, 'organization_name', 1, 0, 1, 'User and User Admin Only', 0, 0, NULL, '{ts escape="sql"}Organization Name{/ts}', 'Organization',NULL, NULL), ( 9, 'phone', 1, 0, 2, 'User and User Admin Only', 0, 0, 3, '{ts escape="sql"}Phone (Main) {/ts}', 'Contact', NULL, 1), ( 9, 'email', 1, 0, 3, 'User and User Admin Only', 0, 0, 3, '{ts escape="sql"}Email (Main) {/ts}', 'Contact', NULL, NULL), @@ -1476,17 +1476,17 @@ SELECT @option_value_rel_id_ar := value FROM civicrm_option_value WHERE option_ SELECT @option_value_rel_id_as := value FROM civicrm_option_value WHERE option_group_id = @option_group_id_arel AND name = 'Asset Account is'; SELECT @option_value_rel_id_cg := value FROM civicrm_option_value WHERE option_group_id = @option_group_id_arel AND name = 'Cost of Sales Account is'; -SELECT @financial_type_id_dtn := max(id) FROM civicrm_financial_type WHERE name = '{ts escape="sql"}Donation{/ts}'; -SELECT @financial_type_id_md := max(id) FROM civicrm_financial_type WHERE name = '{ts escape="sql"}Member Dues{/ts}'; -SELECT @financial_type_id_cc := max(id) FROM civicrm_financial_type WHERE name = '{ts escape="sql"}Campaign Contribution{/ts}'; -SELECT @financial_type_id_ef := max(id) FROM civicrm_financial_type WHERE name = '{ts escape="sql"}Event Fee{/ts}'; +SELECT @financial_type_id_dtn := max(id) FROM civicrm_financial_type WHERE name = '{ts escape="sql"}Donation{/ts}'; +SELECT @financial_type_id_md := max(id) FROM civicrm_financial_type WHERE name = '{ts escape="sql"}Member Dues{/ts}'; +SELECT @financial_type_id_cc := max(id) FROM civicrm_financial_type WHERE name = '{ts escape="sql"}Campaign Contribution{/ts}'; +SELECT @financial_type_id_ef := max(id) FROM civicrm_financial_type WHERE name = '{ts escape="sql"}Event Fee{/ts}'; SELECT @financial_account_id_dtn := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Donation{/ts}'; -SELECT @financial_account_id_md := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Member Dues{/ts}'; -SELECT @financial_account_id_cc := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Campaign Contribution{/ts}'; -SELECT @financial_account_id_ef := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Event Fee{/ts}'; -SELECT @financial_account_id_bf := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Banking Fees{/ts}'; -SELECT @financial_account_id_ap := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Accounts Receivable{/ts}'; +SELECT @financial_account_id_md := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Member Dues{/ts}'; +SELECT @financial_account_id_cc := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Campaign Contribution{/ts}'; +SELECT @financial_account_id_ef := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Event Fee{/ts}'; +SELECT @financial_account_id_bf := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Banking Fees{/ts}'; +SELECT @financial_account_id_ap := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Accounts Receivable{/ts}'; SELECT @financial_account_id_ar := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Deposit Bank Account{/ts}'; SELECT @financial_account_id_pp := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Payment Processor Account{/ts}'; SELECT @financial_account_id_pr := max(id) FROM civicrm_financial_account WHERE name = '{ts escape="sql"}Premiums{/ts}'; diff --git a/xml/templates/civicrm_msg_template.tpl b/xml/templates/civicrm_msg_template.tpl index 7cd13133a5..0e25606053 100644 --- a/xml/templates/civicrm_msg_template.tpl +++ b/xml/templates/civicrm_msg_template.tpl @@ -49,7 +49,7 @@ 'contribution_recurring_notify' => ts('Contributions - Recurring Start and End Notification', array('escape' => 'sql')), 'contribution_recurring_cancelled' => ts('Contributions - Recurring Cancellation Notification', array('escape' => 'sql')), 'contribution_recurring_billing' => ts('Contributions - Recurring Billing Updates', array('escape' => 'sql')), - 'contribution_recurring_edit' => ts('Contributions - Recurring Updates', array('escape' => 'sql')), + 'contribution_recurring_edit' => ts('Contributions - Recurring Updates', array('escape' => 'sql')), 'pcp_notify' => ts('Personal Campaign Pages - Admin Notification', array('escape' => 'sql')), 'pcp_status_change' => ts('Personal Campaign Pages - Supporter Status Change Notification', array('escape' => 'sql')), 'pcp_supporter_notify' => ts('Personal Campaign Pages - Supporter Welcome', array('escape' => 'sql')), @@ -132,120 +132,120 @@ INSERT INTO civicrm_msg_template VALUES ('Sample CiviMail Newsletter Template', 'Sample CiviMail Newsletter', '', ' - + - + - - + - +
- - - - - - -
- Replace this logo with the URL to your own -     - Your Newsletter Title -
- 		+ + + + + + +
+ Replace this logo with the URL to your own +     + Your Newsletter Title +
+
- - - - - -
- - Greetings {literal}{contact.display_name}{/literal}, -

- This is a sample template designed to help you get started creating and sending your own CiviMail messages. This template uses an HTML layout that is generally compatible with the wide variety of email clients that your recipients might be using (e.g. Gmail, Outlook, Yahoo, etc.). -

You can select this "Sample CiviMail Newsletter Template" from the "Use Template" drop-down in Step 3 of creating a mailing, and customize it to your needs. Then check the "Save as New Template" box on the bottom the page to save your customized version for use in future mailings. -

The logo you use must be uploaded to your server. Copy and paste the URL path to the logo into the <img src= tag in the HTML at the top. Click "Source" or the Image button if you are using the text editor. -

- Edit the color of the links and headers using the color button or by editing the HTML. -

- Your newsletter message and donation appeal can go here. Click the link button to create links - remember to use a fully qualified URL starting with http:// in all your links! -

- To use CiviMail: - - Sincerely, -

- Your Team -

- -
- 		+ + + + + +
+ + Greetings {literal}{contact.display_name}{/literal}, +

+ This is a sample template designed to help you get started creating and sending your own CiviMail messages. This template uses an HTML layout that is generally compatible with the wide variety of email clients that your recipients might be using (e.g. Gmail, Outlook, Yahoo, etc.). +

You can select this "Sample CiviMail Newsletter Template" from the "Use Template" drop-down in Step 3 of creating a mailing, and customize it to your needs. Then check the "Save as New Template" box on the bottom the page to save your customized version for use in future mailings. +

The logo you use must be uploaded to your server. Copy and paste the URL path to the logo into the <img src= tag in the HTML at the top. Click "Source" or the Image button if you are using the text editor. +

+ Edit the color of the links and headers using the color button or by editing the HTML. +

+ Your newsletter message and donation appeal can go here. Click the link button to create links - remember to use a fully qualified URL starting with http:// in all your links! +

+ To use CiviMail: + + Sincerely, +

+ Your Team +

+ +
+ 		- - - - - - - +

+ Important Dates
+ Tuesday August 27
+ Wednesday September 8
+ Thursday September 29
+ Saturday October 1
+ Sunday October 20
+ + + +
News and Events
- - Featured Events
- Fundraising Dinner
- Training Meeting
- Board of Directors Annual Meeting
+ 		+ + + + + + + - -
News and Events
+ + Featured Events
+ Fundraising Dinner
+ Training Meeting
+ Board of Directors Annual Meeting
-

- Community Events
- Bake Sale
- Charity Auction
- Art Exhibit
+

+ Community Events
+ Bake Sale
+ Charity Auction
+ Art Exhibit
-

- Important Dates
- Tuesday August 27
- Wednesday September 8
- Thursday September 29
- Saturday October 1
- Sunday October 20
- -
-
+
- - - - -
- - Helpful Tips -

- Tokens
- Click "Insert Tokens" to dynamically insert names, addresses, and other contact data of your recipients. -

- Plain Text Version
- Some people refuse HTML emails altogether. We recommend sending a plain-text version of your important communications to accommodate them. Luckily, CiviCRM accommodates for this! Just click "Plain Text" and copy and paste in some text. Line breaks (carriage returns) and fully qualified URLs like http://www.example.com are all you get, no HTML here! -

- Play by the Rules
- The address of the sender is required by the Can Spam Act law. This is an available token called domain.address. An unsubscribe or opt-out link is also required. There are several available tokens for this. {literal}{action.optOutUrl}{/literal} creates a link for recipients to click if they want to opt out of receiving emails from your organization. {literal}{action.unsubscribeUrl}{/literal} creates a link to unsubscribe from the specific mailing list used to send this message. Click on "Insert Tokens" to find these and look for tokens named "Domain" or "Unsubscribe". This sample template includes both required tokens at the bottom of the message. You can also configure a default Mailing Footer containing these tokens. -

- Composing Offline
- If you prefer to compose an HTML email offline in your own text editor, you can upload this HTML content into CiviMail or simply click "Source" and then copy and paste the HTML in. -

- Images
- Most email clients these days (Outlook, Gmail, etc) block image loading by default. This is to protect their users from annoying or harmful email. Not much we can do about this, so encourage recipients to add you to their contacts or "whitelist". Also use images sparingly, do not rely on images to convey vital information, and always use HTML "alt" tags which describe the image content. -
- 		+ + + + +
+ + Helpful Tips +

+ Tokens
+ Click "Insert Tokens" to dynamically insert names, addresses, and other contact data of your recipients. +

+ Plain Text Version
+ Some people refuse HTML emails altogether. We recommend sending a plain-text version of your important communications to accommodate them. Luckily, CiviCRM accommodates for this! Just click "Plain Text" and copy and paste in some text. Line breaks (carriage returns) and fully qualified URLs like http://www.example.com are all you get, no HTML here! +

+ Play by the Rules
+ The address of the sender is required by the Can Spam Act law. This is an available token called domain.address. An unsubscribe or opt-out link is also required. There are several available tokens for this. {literal}{action.optOutUrl}{/literal} creates a link for recipients to click if they want to opt out of receiving emails from your organization. {literal}{action.unsubscribeUrl}{/literal} creates a link to unsubscribe from the specific mailing list used to send this message. Click on "Insert Tokens" to find these and look for tokens named "Domain" or "Unsubscribe". This sample template includes both required tokens at the bottom of the message. You can also configure a default Mailing Footer containing these tokens. +

+ Composing Offline
+ If you prefer to compose an HTML email offline in your own text editor, you can upload this HTML content into CiviMail or simply click "Source" and then copy and paste the HTML in. +

+ Images
+ Most email clients these days (Outlook, Gmail, etc) block image loading by default. This is to protect their users from annoying or harmful email. Not much we can do about this, so encourage recipients to add you to their contacts or "whitelist". Also use images sparingly, do not rely on images to convey vital information, and always use HTML "alt" tags which describe the image content. +
+
- -
- Click here to unsubscribe from this mailing list.

- Our mailing address is:
- {literal}{domain.address}{/literal} - 		+ +
+ Click here to unsubscribe from this mailing list.

+ Our mailing address is:
+ {literal}{domain.address}{/literal} +
', NULL, 1, 0); diff --git a/xml/templates/civicrm_navigation.tpl b/xml/templates/civicrm_navigation.tpl index f78fd0acdd..d6453a8cd5 100644 --- a/xml/templates/civicrm_navigation.tpl +++ b/xml/templates/civicrm_navigation.tpl @@ -253,7 +253,7 @@ VALUES ( @domainID, 'civicrm/admin/component&reset=1', '{ts escape="sql" skip="true"}Headers, Footers, and Automated Messages{/ts}', 'Headers, Footers, and Automated Messages', 'access CiviMail,administer CiviCRM', 'AND', @mailinglastID, '1', NULL, 6 ), ( @domainID, 'civicrm/admin/messageTemplates&reset=1', '{ts escape="sql" skip="true"}Message Templates{/ts}', 'Message Templates', 'administer CiviCRM', '', @mailinglastID, '1', NULL, 7 ), ( @domainID, 'civicrm/admin/options/from_email&group=from_email_address&reset=1', '{ts escape="sql" skip="true"}From Email Addresses{/ts}', 'From Email Addresses', 'administer CiviCRM', '', @mailinglastID, '1', 1, 8 ), - ( @domainID, 'civicrm/sms/send?reset=1', '{ts escape="sql" skip="true"}New SMS{/ts}', 'New SMS', 'administer CiviCRM', NULL, @mailinglastID, '1', NULL, 9 ), + ( @domainID, 'civicrm/sms/send?reset=1', '{ts escape="sql" skip="true"}New SMS{/ts}', 'New SMS', 'administer CiviCRM', NULL, @mailinglastID, '1', NULL, 9 ), ( @domainID, 'civicrm/mailing/browse?reset=1&sms=1', '{ts escape="sql" skip="true"}Find Mass SMS{/ts}', 'Find Mass SMS', 'administer CiviCRM', NULL, @mailinglastID, '1', 1, 10 ); INSERT INTO civicrm_navigation diff --git a/xml/templates/joomla.tpl b/xml/templates/joomla.tpl index 6868f62e8e..cc8af72241 100644 --- a/xml/templates/joomla.tpl +++ b/xml/templates/joomla.tpl @@ -13,10 +13,10 @@ {$CiviCRMVersion} CiviCRM - civicrm.php - civicrm.html.php - views - elements + civicrm.php + civicrm.html.php + views + elements diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl index d918e50359..769a46666d 100644 --- a/xml/templates/message_templates/event_online_receipt_html.tpl +++ b/xml/templates/message_templates/event_online_receipt_html.tpl @@ -21,13 +21,13 @@ -

Dear {contact.display_name},

+

Dear {contact.display_name},

{if $event.confirm_email_text AND (not $isOnWaitlist AND not $isRequireApproval)}

{$event.confirm_email_text|htmlize}

{else} -

Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to {if $isOnWaitlist}waitlisted{else}registered{/if} for the following:

+

Thank you for your participation. This letter is a confirmation that your registration has been received and your status has been updated to {if $isOnWaitlist}waitlisted{else}registered{/if} for the following:

{/if} @@ -72,20 +72,20 @@ registration process.{/ts}

{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} @@ -180,7 +180,7 @@ registration process.{/ts}

- {$payer.name} + {$payer.name} {/if} @@ -212,7 +212,7 @@ 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} @@ -228,7 +228,7 @@ registration process.{/ts}

{$line.line_total|crmMoney:$currency} - {if $pricesetFieldsCount }{$line.participant_count} {/if} + {if $pricesetFieldsCount }{$line.participant_count} {/if} {/foreach} @@ -252,17 +252,17 @@ registration process.{/ts}

{ts}Total Amount{/ts} - + {$totalAmount|crmMoney:$currency} {if $hookDiscount.message}({$hookDiscount.message}){/if} {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'} @@ -271,7 +271,7 @@ registration process.{/ts}

{/foreach} {if $lineItemCount < 1 } {assign var="lineItemCount" value=1} - {/if} + {/if} {assign var="count" value=$count+$lineItemCount} {/if} {/foreach} @@ -414,8 +414,8 @@ registration process.{/ts}

{$customProfile.title.$pid} {foreach from=$eachProfile item=val key=field} {foreach from=$val item=v key=f} - {$field} - {$v} + {$field} + {$v} {/foreach} {/foreach} @@ -442,7 +442,7 @@ registration process.{/ts}

{/foreach} {/foreach} {/if} - + diff --git a/xml/templates/message_templates/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl index ccaf777476..ffc380b196 100644 --- a/xml/templates/message_templates/event_online_receipt_text.tpl +++ b/xml/templates/message_templates/event_online_receipt_text.tpl @@ -162,14 +162,14 @@ You were registered by: {$payer.name} {/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 $register_date} {ts}Registration Date{/ts}: {$register_date|crmDate} {/if} @@ -233,7 +233,7 @@ You were registered by: {$payer.name} {foreach from=$customPost item=customPos key=j} ==========================================================={if $pricesetFieldsCount }===================={/if} -{$customPost_grouptitle.$j} +{$customPost_grouptitle.$j} ==========================================================={if $pricesetFieldsCount }===================={/if} {foreach from=$customPos item=customValue key=customName} -- 2.25.1