From 06a8e7e398293495ee026035214e75125f10dacb Mon Sep 17 00:00:00 2001 From: larssandergreen Date: Tue, 19 Sep 2023 18:45:51 -0600 Subject: [PATCH] Remove spaces around curly braces to prepare for Smarty 3+ --- .../templates/CRM/Grant/Form/Grant.tpl | 2 +- .../templates/CRM/Grant/Form/Selector.tpl | 6 +-- .../templates/CRM/Grant/Form/Task.tpl | 2 +- .../templates/CRM/Grant/Form/Task/Print.tpl | 2 +- .../templates/CRM/Grant/Page/DashBoard.tpl | 2 +- .../Form/Search/Custom/ActivitySearch.tpl | 8 +-- .../Contact/Form/Search/Custom/FullText.tpl | 16 +++--- templates/CRM/Activity/Form/Activity.tpl | 8 +-- templates/CRM/Activity/Form/ActivityView.tpl | 2 +- templates/CRM/Activity/Form/Search.tpl | 2 +- templates/CRM/Activity/Form/Selector.tpl | 6 +-- templates/CRM/Activity/Form/Task.tpl | 2 +- templates/CRM/Activity/Form/Task/Print.tpl | 2 +- templates/CRM/Admin/Form/ContactType.tpl | 2 +- templates/CRM/Admin/Form/LabelFormats.tpl | 2 +- templates/CRM/Admin/Form/Mapping.tpl | 2 +- templates/CRM/Admin/Form/PdfFormats.tpl | 2 +- templates/CRM/Admin/Page/MessageTemplates.tpl | 4 +- templates/CRM/Batch/Form/Entry.tpl | 4 +- templates/CRM/Campaign/Form/Gotv.tpl | 2 +- .../CRM/Campaign/Form/Petition/Signature.tpl | 2 +- templates/CRM/Campaign/Form/ResultOptions.tpl | 2 +- .../CRM/Campaign/Form/Search/Campaign.tpl | 2 +- .../CRM/Campaign/Form/Search/Petition.tpl | 2 +- templates/CRM/Campaign/Form/Search/Survey.tpl | 4 +- templates/CRM/Campaign/Form/Selector.tpl | 6 +-- templates/CRM/Campaign/Form/SurveyType.tpl | 2 +- templates/CRM/Campaign/Form/Task/Print.tpl | 2 +- templates/CRM/Campaign/Page/SurveyType.tpl | 4 +- templates/CRM/Case/Form/Activity.tpl | 4 +- templates/CRM/Case/Form/ActivityToCase.tpl | 4 +- templates/CRM/Case/Form/Case.tpl | 4 +- templates/CRM/Case/Form/CaseView.tpl | 2 +- templates/CRM/Case/Form/Search/Common.tpl | 2 +- templates/CRM/Case/Form/Selector.tpl | 4 +- templates/CRM/Case/Form/Task.tpl | 2 +- templates/CRM/Case/Form/Task/Print.tpl | 2 +- templates/CRM/Case/Page/Tab.tpl | 2 +- templates/CRM/Contact/Form/Contact.tpl | 4 +- templates/CRM/Contact/Form/Edit/Address.tpl | 2 +- templates/CRM/Contact/Form/Inline/Email.tpl | 2 +- templates/CRM/Contact/Form/Inline/IM.tpl | 2 +- templates/CRM/Contact/Form/Inline/OpenID.tpl | 2 +- templates/CRM/Contact/Form/Inline/Phone.tpl | 2 +- templates/CRM/Contact/Form/Inline/Website.tpl | 2 +- templates/CRM/Contact/Form/Merge.tpl | 4 +- templates/CRM/Contact/Form/Relationship.tpl | 2 +- .../Form/Search/Criteria/Relationship.tpl | 2 +- templates/CRM/Contact/Form/Selector.tpl | 6 +-- .../Contact/Form/Task/AddToParentClass.tpl | 2 +- templates/CRM/Contact/Form/Task/Email.tpl | 2 +- .../CRM/Contact/Form/Task/EmailCommon.tpl | 2 +- .../CRM/Contact/Form/Task/Map/Google.tpl | 4 +- .../Contact/Form/Task/Map/OpenStreetMaps.tpl | 4 +- .../CRM/Contact/Form/Task/PDFLetterCommon.tpl | 4 +- templates/CRM/Contact/Form/Task/SMS.tpl | 2 +- .../CRM/Contact/Page/DedupeException.tpl | 4 +- .../CRM/Contact/Page/View/CustomData.tpl | 2 +- templates/CRM/Contact/Page/View/Group.tpl | 2 +- .../CRM/Contact/Page/View/GroupContact.tpl | 2 +- templates/CRM/Contact/Page/View/Log.tpl | 2 +- templates/CRM/Contact/Page/View/Note.tpl | 2 +- .../CRM/Contact/Page/View/Relationship.tpl | 2 +- .../Page/View/UserDashBoard/GroupContact.tpl | 8 +-- .../Contact/Page/View/ViewRelationship.tpl | 2 +- .../CRM/Contribute/Form/Contribution.tpl | 4 +- .../Contribute/Form/Contribution/Confirm.tpl | 18 +++---- .../CRM/Contribute/Form/Contribution/Main.tpl | 2 +- .../Form/Contribution/MainMembershipBlock.tpl | 6 +-- .../Form/Contribution/MembershipBlock.tpl | 2 +- .../Form/Contribution/PremiumBlock.tpl | 4 +- .../Contribute/Form/Contribution/ThankYou.tpl | 6 +-- .../Form/ContributionPage/AddProduct.tpl | 4 +- .../Form/ContributionPage/Amount.tpl | 2 +- .../CRM/Contribute/Form/ContributionView.tpl | 4 +- .../CRM/Contribute/Form/ManagePremiums.tpl | 2 +- templates/CRM/Contribute/Form/Selector.tpl | 6 +-- templates/CRM/Contribute/Form/Task.tpl | 2 +- templates/CRM/Contribute/Form/Task/Print.tpl | 2 +- .../CRM/Contribute/Page/ContributionPage.tpl | 2 +- .../Contribute/Page/ContributionTotals.tpl | 2 +- templates/CRM/Contribute/Page/Premium.tpl | 2 +- .../CRM/Contribute/Page/UserDashboard.tpl | 2 +- templates/CRM/Core/I18n/Dialog.tpl | 2 +- templates/CRM/Custom/Form/Edit/CustomData.tpl | 2 +- templates/CRM/Custom/Form/Field.tpl | 4 +- templates/CRM/Custom/Form/Option.tpl | 2 +- templates/CRM/Event/Form/EventFees.tpl | 14 +++--- .../CRM/Event/Form/ManageEvent/EventInfo.tpl | 2 +- templates/CRM/Event/Form/ManageEvent/Fee.tpl | 4 +- .../Event/Form/ManageEvent/Registration.tpl | 2 +- templates/CRM/Event/Form/ParticipantView.tpl | 2 +- .../Form/Registration/EventInfoBlock.tpl | 6 +-- .../CRM/Event/Form/Registration/Register.tpl | 8 +-- .../CRM/Event/Form/Registration/ThankYou.tpl | 2 +- templates/CRM/Event/Form/Search/Common.tpl | 2 +- templates/CRM/Event/Form/Selector.tpl | 12 ++--- templates/CRM/Event/Form/Task.tpl | 2 +- templates/CRM/Event/Form/Task/Print.tpl | 2 +- templates/CRM/Event/Page/EventInfo.tpl | 12 ++--- .../CRM/Financial/Form/BatchTransaction.tpl | 2 +- .../CRM/Financial/Form/FinancialType.tpl | 2 +- templates/CRM/Form/attachmentjs.tpl | 2 +- templates/CRM/Friend/Form.tpl | 2 +- templates/CRM/Import/Form/DataSource.tpl | 4 +- templates/CRM/Mailing/Form/InsertTokens.tpl | 4 +- templates/CRM/Mailing/Form/Task.tpl | 2 +- templates/CRM/Mailing/Page/Event.tpl | 8 +-- templates/CRM/Member/Form/Membership.tpl | 4 +- templates/CRM/Member/Form/MembershipBlock.tpl | 2 +- .../CRM/Member/Form/MembershipCommon.tpl | 2 +- .../CRM/Member/Form/MembershipRenewal.tpl | 2 +- templates/CRM/Member/Form/Selector.tpl | 6 +-- templates/CRM/Member/Form/Task.tpl | 2 +- templates/CRM/Member/Form/Task/Print.tpl | 2 +- templates/CRM/Member/Page/DashBoard.tpl | 2 +- templates/CRM/Pledge/Form/Pledge.tpl | 6 +-- templates/CRM/Pledge/Form/Search.tpl | 2 +- templates/CRM/Pledge/Form/Selector.tpl | 10 ++-- templates/CRM/Pledge/Form/Task.tpl | 2 +- templates/CRM/Pledge/Form/Task/Print.tpl | 2 +- templates/CRM/Pledge/Page/DashBoard.tpl | 30 +++++------ templates/CRM/Pledge/Page/Payment.tpl | 8 +-- templates/CRM/Pledge/Page/UserDashboard.tpl | 4 +- templates/CRM/Price/Form/Field.tpl | 2 +- templates/CRM/Price/Form/LineItem.tpl | 2 +- templates/CRM/Price/Form/Option.tpl | 2 +- templates/CRM/Price/Form/PriceSet.tpl | 6 +-- templates/CRM/Price/Page/Field.tpl | 4 +- templates/CRM/Price/Page/LineItem.tpl | 2 +- templates/CRM/Price/Page/Option.tpl | 2 +- templates/CRM/Price/Page/Set.tpl | 2 +- templates/CRM/Profile/Form/Dynamic.tpl | 2 +- templates/CRM/Profile/Form/Search.tpl | 4 +- templates/CRM/Profile/Page/Dynamic.tpl | 2 +- templates/CRM/Profile/Page/Listings.tpl | 2 +- templates/CRM/Profile/Page/Overlay.tpl | 2 +- templates/CRM/Profile/Page/View.tpl | 2 +- .../Report/Form/Campaign/SurveyCoverSheet.tpl | 2 +- templates/CRM/Report/Form/Contact/Detail.tpl | 6 +-- templates/CRM/Report/Form/Event/Income.tpl | 6 +-- templates/CRM/Report/Form/Layout/Overlay.tpl | 2 +- templates/CRM/Tag/Form/Edit.tpl | 2 +- templates/CRM/UF/Form/Field.tpl | 4 +- templates/CRM/UF/Form/Group.tpl | 2 +- templates/CRM/UF/Page/Field.tpl | 10 ++-- templates/CRM/UF/Page/Group.tpl | 2 +- templates/CRM/common/CMSUser.tpl | 2 +- templates/CRM/common/WizardHeader.tpl | 2 +- .../CRM/common/checkUsernameAvailable.tpl | 2 +- templates/CRM/common/dedupe.tpl | 2 +- templates/CRM/common/searchResultTasks.tpl | 2 +- templates/CRM/common/standalone.tpl | 4 +- .../message_templates/case_activity_html.tpl | 4 +- .../contribution_dupalert_html.tpl | 4 +- .../contribution_offline_receipt_html.tpl | 4 +- .../contribution_online_receipt_html.tpl | 4 +- .../contribution_recurring_billing_html.tpl | 4 +- .../contribution_recurring_cancelled_html.tpl | 4 +- .../contribution_recurring_edit_html.tpl | 4 +- .../contribution_recurring_notify_html.tpl | 6 +-- .../contribution_recurring_notify_text.tpl | 2 +- .../event_offline_receipt_html.tpl | 12 ++--- .../event_offline_receipt_text.tpl | 50 +++++++++---------- .../event_online_receipt_html.tpl | 10 ++-- .../event_online_receipt_text.tpl | 10 ++-- .../event_registration_receipt_html.tpl | 4 +- .../message_templates/friend_html.tpl | 4 +- .../membership_autorenew_billing_html.tpl | 4 +- .../membership_autorenew_cancelled_html.tpl | 4 +- .../membership_offline_receipt_html.tpl | 4 +- .../membership_offline_receipt_text.tpl | 2 +- .../membership_online_receipt_html.tpl | 6 +-- .../membership_online_receipt_text.tpl | 6 +-- .../participant_cancelled_html.tpl | 4 +- .../participant_confirm_html.tpl | 8 +-- .../participant_confirm_text.tpl | 2 +- .../participant_expired_html.tpl | 4 +- .../participant_transferred_html.tpl | 4 +- .../payment_or_refund_notification_html.tpl | 8 +-- .../message_templates/pcp_notify_html.tpl | 6 +-- .../pcp_owner_notify_html.tpl | 4 +- .../pcp_supporter_notify_html.tpl | 4 +- .../pledge_acknowledge_html.tpl | 4 +- .../pledge_reminder_html.tpl | 4 +- .../message_templates/uf_notify_html.tpl | 4 +- xml/templates/schema.tpl | 2 +- 187 files changed, 383 insertions(+), 383 deletions(-) diff --git a/ext/civigrant/templates/CRM/Grant/Form/Grant.tpl b/ext/civigrant/templates/CRM/Grant/Form/Grant.tpl index b717a66c1f..a5ecc12cce 100644 --- a/ext/civigrant/templates/CRM/Grant/Form/Grant.tpl +++ b/ext/civigrant/templates/CRM/Grant/Form/Grant.tpl @@ -16,7 +16,7 @@ {ts}Are you sure you want to delete this Grant?{/ts} {ts}This action cannot be undone.{/ts}

{include file="CRM/Grant/Form/Task.tpl"}

- {elseif $action eq 4 } + {elseif $action eq 4} {include file="CRM/Grant/Form/GrantView.tpl"} {else}
{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/ext/civigrant/templates/CRM/Grant/Form/Selector.tpl b/ext/civigrant/templates/CRM/Grant/Form/Selector.tpl index c4911193ed..be64bb0d67 100644 --- a/ext/civigrant/templates/CRM/Grant/Form/Selector.tpl +++ b/ext/civigrant/templates/CRM/Grant/Form/Selector.tpl @@ -15,7 +15,7 @@ - {if ! $single and $context eq 'Search' } + {if ! $single and $context eq 'Search'} {/if} {foreach from=$columnHeaders item=header} @@ -35,8 +35,8 @@ {foreach from=$rows item=row} - {if !$single } - {if $context eq 'Search' } + {if !$single} + {if $context eq 'Search'} {assign var=cbName value=$row.checkbox} {/if} diff --git a/ext/civigrant/templates/CRM/Grant/Form/Task.tpl b/ext/civigrant/templates/CRM/Grant/Form/Task.tpl index fa60b22d74..7f674842a2 100644 --- a/ext/civigrant/templates/CRM/Grant/Form/Task.tpl +++ b/ext/civigrant/templates/CRM/Grant/Form/Task.tpl @@ -10,7 +10,7 @@ {if $totalSelectedGrants} {ts 1=$totalSelectedGrants}Number of selected grants: %1{/ts} {/if} -{if $rows } +{if $rows}
{$form.toggleSelect.html}
{$form.$cbName.html}
diff --git a/ext/civigrant/templates/CRM/Grant/Form/Task/Print.tpl b/ext/civigrant/templates/CRM/Grant/Form/Task/Print.tpl index 98e16d5d4a..0e2d85760d 100644 --- a/ext/civigrant/templates/CRM/Grant/Form/Task/Print.tpl +++ b/ext/civigrant/templates/CRM/Grant/Form/Task/Print.tpl @@ -9,7 +9,7 @@ *}

-{if $rows } +{if $rows}

{$form.buttons.html}

diff --git a/ext/civigrant/templates/CRM/Grant/Page/DashBoard.tpl b/ext/civigrant/templates/CRM/Grant/Page/DashBoard.tpl index 9f28e412ab..bf3fadba01 100644 --- a/ext/civigrant/templates/CRM/Grant/Page/DashBoard.tpl +++ b/ext/civigrant/templates/CRM/Grant/Page/DashBoard.tpl @@ -10,7 +10,7 @@ {* CiviGrant DashBoard (launch page) *}
{capture assign=findContactURL}{crmURL p="civicrm/contact/search/basic" q="reset=1"}{/capture} -

{ts 1=$findContactURL }CiviGrant allows you to input and track grants to Organizations, Individuals or Households. The grantee must first be entered as a contact in CiviCRM. Use Find Contacts to see if there's already a record for the grantee. Once you've located or created the contact record, click View to go to their summary page, select the Grants tab and click New Grant.{/ts} +

{ts 1=$findContactURL}CiviGrant allows you to input and track grants to Organizations, Individuals or Households. The grantee must first be entered as a contact in CiviCRM. Use Find Contacts to see if there's already a record for the grantee. Once you've located or created the contact record, click View to go to their summary page, select the Grants tab and click New Grant.{/ts}

{ts}Grants Summary{/ts}

diff --git a/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl b/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl index ff69a607a9..fe35dced90 100644 --- a/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl +++ b/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/ActivitySearch.tpl @@ -60,8 +60,8 @@ {foreach from=$columnHeaders item=header} - {if ($header.sort eq 'activity_id') or ($header.sort eq 'case_id') } - {elseif ($header.sort eq 'sort_name') or ($header.sort eq 'activity_status_id') or ($header.sort eq 'activity_type_id') or ($header.sort eq 'activity_subject') or ($header.sort eq 'source_contact') or ($header.SORT eq 'activity_date') or ($header.name eq null) } + {if ($header.sort eq 'activity_id') or ($header.sort eq 'case_id')} + {elseif ($header.sort eq 'sort_name') or ($header.sort eq 'activity_status_id') or ($header.sort eq 'activity_type_id') or ($header.sort eq 'activity_subject') or ($header.sort eq 'source_contact') or ($header.SORT eq 'activity_date') or ($header.name eq null)} {foreach from=$columnHeaders item=header} - {if ($header.sort eq 'sort_name') or ($header.sort eq 'activity_status_id') or ($header.sort eq 'activity_type_id') or ($header.sort eq 'activity_subject') or ($header.sort eq 'source_contact') or ($header.SORT eq 'activity_date') or ($header.name eq null) } + {if ($header.sort eq 'sort_name') or ($header.sort eq 'activity_status_id') or ($header.sort eq 'activity_type_id') or ($header.sort eq 'activity_subject') or ($header.sort eq 'source_contact') or ($header.SORT eq 'activity_date') or ($header.name eq null)} {assign var=fName value=$header.sort} {if $fName eq 'sort_name'} {elseif $fName eq 'activity_subject'} {if $allowFileSearch}{/if} - + {if (array_key_exists('mailingId', $values) && $values.mailingId)} diff --git a/templates/CRM/Activity/Form/Search.tpl b/templates/CRM/Activity/Form/Search.tpl index 9dd7bebde2..97d6869538 100644 --- a/templates/CRM/Activity/Form/Search.tpl +++ b/templates/CRM/Activity/Form/Search.tpl @@ -44,7 +44,7 @@ -{if $rowsEmpty || $rows } +{if $rowsEmpty || $rows}
{if $rowsEmpty}
diff --git a/templates/CRM/Activity/Form/Selector.tpl b/templates/CRM/Activity/Form/Selector.tpl index a6ad72efe5..48d97a3b8f 100644 --- a/templates/CRM/Activity/Form/Selector.tpl +++ b/templates/CRM/Activity/Form/Selector.tpl @@ -16,7 +16,7 @@
{$form.toggleSelect.html} {if $header.sort} {assign var='key' value=$header.sort} @@ -81,13 +81,13 @@ {assign var=cbName value=$row.checkbox} {$form.$cbName.html}{$row.sort_name} - {if $row.case_id } + {if $row.case_id} {else} diff --git a/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/FullText.tpl b/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/FullText.tpl index 1c58d077f2..8a80e9d2ed 100644 --- a/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/FullText.tpl +++ b/ext/legacycustomsearches/templates/CRM/Contact/Form/Search/Custom/FullText.tpl @@ -37,7 +37,7 @@ {* @TODO: This is confusing - the variable `table` is already set and used above, and now we set it again to something that is technically different but has the same value, except on a blank form where it doesn't exist, but effectively then is the same value that it already has which is ''. So do we need this line even? *} {if $form.table.value && (array_key_exists(0, $form.table.value))}{assign var=table value=$form.table.value.0}{/if} {assign var=text value=$form.text.value} -{if !empty($summary.Contact) } +{if !empty($summary.Contact)}
{* Search request has returned 1 or more matching rows. Display results. *}

{ts}Contacts{/ts} @@ -75,7 +75,7 @@

{/if} -{if !empty($summary.Activity) } +{if !empty($summary.Activity)}
{* Search request has returned 1 or more matching rows. Display results. *} @@ -115,7 +115,7 @@
{$row.fileHtml} - {if $row.case_id } + {if $row.case_id} {else} @@ -138,7 +138,7 @@ {/if} -{if !empty($summary.Case) } +{if !empty($summary.Case)}
{* Search request has returned 1 or more matching rows. Display results. *}

{ts}Cases{/ts} @@ -195,7 +195,7 @@

{/if} -{if !empty($summary.Contribution) } +{if !empty($summary.Contribution)}
{* Search request has returned 1 or more matching rows. Display results. *} @@ -249,7 +249,7 @@
{/if} -{if !empty($summary.Participant) } +{if !empty($summary.Participant)}
{* Search request has returned 1 or more matching rows. *} @@ -305,7 +305,7 @@
{/if} -{if !empty($summary.Membership) } +{if !empty($summary.Membership)}
{* Search request has returned 1 or more matching rows. *} @@ -362,7 +362,7 @@
{/if} -{if !empty($summary.File) } +{if !empty($summary.File)}
{* Search request has returned 1 or more matching rows. *} diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl index f554bff1b4..bde0f91cb4 100644 --- a/templates/CRM/Activity/Form/Activity.tpl +++ b/templates/CRM/Activity/Form/Activity.tpl @@ -11,7 +11,7 @@ {if $action eq 4}
{else} - {if $activityTypeDescription } + {if $activityTypeDescription}
{$activityTypeDescription}
{/if}
@@ -28,7 +28,7 @@ {if $action eq 4} - {if $activityTypeDescription } + {if $activityTypeDescription}
{$activityTypeDescription}
{/if} {else} @@ -147,7 +147,7 @@ - {if !empty($surveyActivity) } + {if !empty($surveyActivity)} @@ -232,7 +232,7 @@
{$form.priority_id.label}{$form.priority_id.html}
{$form.result.label}{$form.result.html}
{if $action eq 4 && ($activityTypeNameAndLabel.machineName neq 'Inbound Email' || $allow_edit_inbound_emails == 1)} - {if !$context } + {if !$context} {assign var="context" value='activity'} {/if} {if $permission EQ 'edit'} diff --git a/templates/CRM/Activity/Form/ActivityView.tpl b/templates/CRM/Activity/Form/ActivityView.tpl index db41ef0a78..fa736453b2 100644 --- a/templates/CRM/Activity/Form/ActivityView.tpl +++ b/templates/CRM/Activity/Form/ActivityView.tpl @@ -41,7 +41,7 @@ {/if}
{ts}Date and Time{/ts}{$values.activity_date_time|crmDate }{ts}Date and Time{/ts}{$values.activity_date_time|crmDate}
- {if !$single and $context eq 'Search' } + {if !$single and $context eq 'Search'} {/if} {foreach from=$columnHeaders item=header} @@ -38,8 +38,8 @@ {counter start=0 skip=1 print=false} {foreach from=$rows item=row} - {if !$single } - {if $context eq 'Search' } + {if !$single} + {if $context eq 'Search'} {assign var=cbName value=$row.checkbox} {/if} diff --git a/templates/CRM/Activity/Form/Task.tpl b/templates/CRM/Activity/Form/Task.tpl index 9e8b505b1c..6b7b6ce6b7 100644 --- a/templates/CRM/Activity/Form/Task.tpl +++ b/templates/CRM/Activity/Form/Task.tpl @@ -9,7 +9,7 @@ *} {ts 1=$totalSelectedActivities}Number of selected Activities: %1{/ts} -{if $rows } +{if $rows}
{$form.toggleSelect.html}
{$form.$cbName.html}
diff --git a/templates/CRM/Activity/Form/Task/Print.tpl b/templates/CRM/Activity/Form/Task/Print.tpl index d71d4408c4..d1dba9b8e3 100644 --- a/templates/CRM/Activity/Form/Task/Print.tpl +++ b/templates/CRM/Activity/Form/Task/Print.tpl @@ -9,7 +9,7 @@ *}

-{if $rows } +{if $rows}

{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Admin/Form/ContactType.tpl b/templates/CRM/Admin/Form/ContactType.tpl index 41f99a21d0..5cf5a33111 100644 --- a/templates/CRM/Admin/Form/ContactType.tpl +++ b/templates/CRM/Admin/Form/ContactType.tpl @@ -19,7 +19,7 @@
diff --git a/templates/CRM/Admin/Form/LabelFormats.tpl b/templates/CRM/Admin/Form/LabelFormats.tpl index 1965a0a1f7..4c112cfb2a 100644 --- a/templates/CRM/Admin/Form/LabelFormats.tpl +++ b/templates/CRM/Admin/Form/LabelFormats.tpl @@ -120,7 +120,7 @@ selectPaper(document.getElementById('paper_size').value); function selectPaper(val) { - dataUrl = {/literal}"{crmURL p='civicrm/ajax/paperSize' h=0 }"{literal}; + dataUrl = {/literal}"{crmURL p='civicrm/ajax/paperSize' h=0}"{literal}; cj.post(dataUrl, {paperSizeName: val}, function (data) { cj("#paper_size").val(data.name); metric = document.getElementById('metric').value; diff --git a/templates/CRM/Admin/Form/Mapping.tpl b/templates/CRM/Admin/Form/Mapping.tpl index f71003752d..e27755b8af 100644 --- a/templates/CRM/Admin/Form/Mapping.tpl +++ b/templates/CRM/Admin/Form/Mapping.tpl @@ -9,7 +9,7 @@ *} {* this template is used for adding/editing a saved mapping *}
- {if $action eq 1 or $action eq 2 } + {if $action eq 1 or $action eq 2}
{$form.label.label} {if $action eq 2} - {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='label' id= $cid } + {include file='CRM/Core/I18n/Dialog.tpl' table='civicrm_contact_type' field='label' id= $cid} {/if} {$form.label.html}
diff --git a/templates/CRM/Admin/Form/PdfFormats.tpl b/templates/CRM/Admin/Form/PdfFormats.tpl index e7d8ce32d8..6e21dc82aa 100644 --- a/templates/CRM/Admin/Form/PdfFormats.tpl +++ b/templates/CRM/Admin/Form/PdfFormats.tpl @@ -74,7 +74,7 @@ selectPaper( document.getElementById('paper_size').value ); function selectPaper( val ) { - dataUrl = {/literal}"{crmURL p='civicrm/ajax/paperSize' h=0 }"{literal}; + dataUrl = {/literal}"{crmURL p='civicrm/ajax/paperSize' h=0}"{literal}; cj.post( dataUrl, {paperSizeName: val}, function( data ) { cj("#paper_size").val( data.name ); metric = document.getElementById('metric').value; diff --git a/templates/CRM/Admin/Page/MessageTemplates.tpl b/templates/CRM/Admin/Page/MessageTemplates.tpl index aabb8a72c2..f313faed2a 100644 --- a/templates/CRM/Admin/Page/MessageTemplates.tpl +++ b/templates/CRM/Admin/Page/MessageTemplates.tpl @@ -111,7 +111,7 @@
{/if} - {if !empty( $template_row) } + {if !empty( $template_row)}
{$form.name.label}
@@ -145,7 +145,7 @@
{/if} - {if empty( $template_row) } + {if empty( $template_row)}
{icon icon="fa-info-circle"}{/icon} {ts 1=$crmURL}There are no User-driven Message Templates entered. You can add one.{/ts} diff --git a/templates/CRM/Batch/Form/Entry.tpl b/templates/CRM/Batch/Form/Entry.tpl index 082c31679a..496770023a 100644 --- a/templates/CRM/Batch/Form/Entry.tpl +++ b/templates/CRM/Batch/Form/Entry.tpl @@ -95,7 +95,7 @@ {elseif $n eq 'total_amount'}
{$form.field.$rowNumber.$n.html} - {if $batchType eq 3 } + {if $batchType eq 3} {ts}adjust payment amount{/ts} {$form.option_type.$rowNumber.html} {/if} @@ -155,7 +155,7 @@ CRM.$(function($) { calculateActualTotal(); }); - {/literal}{if $batchType eq 1 }{literal} + {/literal}{if $batchType eq 1}{literal} // hide all dates if send receipt is checked hideSendReceipt(); diff --git a/templates/CRM/Campaign/Form/Gotv.tpl b/templates/CRM/Campaign/Form/Gotv.tpl index 3a6f311067..0d6a7ea630 100644 --- a/templates/CRM/Campaign/Form/Gotv.tpl +++ b/templates/CRM/Campaign/Form/Gotv.tpl @@ -106,7 +106,7 @@ function loadVoterList( ) { - var sourceUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='snippet=4&className=CRM_Campaign_Page_AJAX&fnName=voterList' }"{literal}; + var sourceUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='snippet=4&className=CRM_Campaign_Page_AJAX&fnName=voterList'}"{literal}; var searchVoterFor = {/literal}'{$searchVoterFor}'{literal}; CRM.$( 'table.gotvVoterRecords', 'form.{/literal}{$form.formClass}{literal}').dataTable({ diff --git a/templates/CRM/Campaign/Form/Petition/Signature.tpl b/templates/CRM/Campaign/Form/Petition/Signature.tpl index 8433b4c192..25d57dd7c9 100644 --- a/templates/CRM/Campaign/Form/Petition/Signature.tpl +++ b/templates/CRM/Campaign/Form/Petition/Signature.tpl @@ -15,7 +15,7 @@ {/literal} -{if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCampaign') } +{if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCampaign')} {capture assign="buttonTitle"}{ts}Edit Petition{/ts}{/capture} {crmButton target="_blank" p="civicrm/petition/add" q="reset=1&action=update&id=`$petition.id`" fb=1 title="$buttonTitle" icon="fa-wrench"}{ts}Configure{/ts}{/crmButton}
diff --git a/templates/CRM/Campaign/Form/ResultOptions.tpl b/templates/CRM/Campaign/Form/ResultOptions.tpl index 87dd610dbd..ae02fb3629 100644 --- a/templates/CRM/Campaign/Form/ResultOptions.tpl +++ b/templates/CRM/Campaign/Form/ResultOptions.tpl @@ -118,7 +118,7 @@ return false; } - var dataUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Campaign_Page_AJAX&fnName=loadOptionGroupDetails' }"{literal} + var dataUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Campaign_Page_AJAX&fnName=loadOptionGroupDetails'}"{literal} // build new options cj.post( dataUrl, data, function( opGroup ) { diff --git a/templates/CRM/Campaign/Form/Search/Campaign.tpl b/templates/CRM/Campaign/Form/Search/Campaign.tpl index 3379eb3234..95d4f9a73f 100644 --- a/templates/CRM/Campaign/Form/Search/Campaign.tpl +++ b/templates/CRM/Campaign/Form/Search/Campaign.tpl @@ -144,7 +144,7 @@ }; window.loadCampaignList = function() { - var sourceUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='snippet=4&className=CRM_Campaign_Page_AJAX&fnName=campaignList' }"{literal}; + var sourceUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='snippet=4&className=CRM_Campaign_Page_AJAX&fnName=campaignList'}"{literal}; //build the search qill. //get the search criteria. diff --git a/templates/CRM/Campaign/Form/Search/Petition.tpl b/templates/CRM/Campaign/Form/Search/Petition.tpl index afb84dde62..9c14d98d60 100644 --- a/templates/CRM/Campaign/Form/Search/Petition.tpl +++ b/templates/CRM/Campaign/Form/Search/Petition.tpl @@ -136,7 +136,7 @@ function searchPetitions( qfKey ) function loadPetitionList( ) { - var sourceUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='snippet=4&className=CRM_Campaign_Page_AJAX&fnName=petitionList' }"{literal}; + var sourceUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='snippet=4&className=CRM_Campaign_Page_AJAX&fnName=petitionList'}"{literal}; //build the search qill. //get the search criteria. diff --git a/templates/CRM/Campaign/Form/Search/Survey.tpl b/templates/CRM/Campaign/Form/Search/Survey.tpl index 324f403a04..91ec99f30b 100644 --- a/templates/CRM/Campaign/Form/Search/Survey.tpl +++ b/templates/CRM/Campaign/Form/Search/Survey.tpl @@ -144,7 +144,7 @@ function searchSurveys( qfKey ) function loadSurveyList( ) { - var sourceUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='snippet=4&className=CRM_Campaign_Page_AJAX&fnName=surveyList' }"{literal}; + var sourceUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='snippet=4&className=CRM_Campaign_Page_AJAX&fnName=surveyList'}"{literal}; //build the search qill. //get the search criteria. @@ -254,7 +254,7 @@ function displayResultSet( surveyId, surveyTitle, OptionGroupId ) { data['option_group_id'] = OptionGroupId; data['survey_id'] = surveyId; - var dataUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Campaign_Page_AJAX&fnName=loadOptionGroupDetails' }"{literal}; + var dataUrl = {/literal}"{crmURL p='civicrm/ajax/rest' h=0 q='className=CRM_Campaign_Page_AJAX&fnName=loadOptionGroupDetails'}"{literal}; var content = '
'; var setTitle = '{/literal}{ts escape='js'}Result Set for{/ts} {literal}' + surveyTitle; diff --git a/templates/CRM/Campaign/Form/Selector.tpl b/templates/CRM/Campaign/Form/Selector.tpl index 0bafc8eef6..727b3722fe 100644 --- a/templates/CRM/Campaign/Form/Selector.tpl +++ b/templates/CRM/Campaign/Form/Selector.tpl @@ -15,7 +15,7 @@
{/literal}{ts escape='js'}Label{/ts}{literal}{/literal}{ts escape='js'}Value{/ts}{literal}{/literal}{ts escape='js'}Recontact Interval{/ts}{literal}{/literal}{ts escape='js'}Order{/ts}{literal}
- {if !$single and $context eq 'Search' } + {if !$single and $context eq 'Search'} {/if} @@ -36,8 +36,8 @@ {counter start=0 skip=1 print=false} {foreach from=$rows item=row} - {if !$single } - {if $context eq 'Search' } + {if !$single} + {if $context eq 'Search'} {assign var=cbName value=$row.checkbox} {/if} diff --git a/templates/CRM/Campaign/Form/SurveyType.tpl b/templates/CRM/Campaign/Form/SurveyType.tpl index 9e26a0e5fe..28fcc726ce 100644 --- a/templates/CRM/Campaign/Form/SurveyType.tpl +++ b/templates/CRM/Campaign/Form/SurveyType.tpl @@ -1 +1 @@ -{include file="CRM/Admin/Form/Options.tpl" } +{include file="CRM/Admin/Form/Options.tpl"} diff --git a/templates/CRM/Campaign/Form/Task/Print.tpl b/templates/CRM/Campaign/Form/Task/Print.tpl index 9c7023da1e..88ee0d9c2b 100644 --- a/templates/CRM/Campaign/Form/Task/Print.tpl +++ b/templates/CRM/Campaign/Form/Task/Print.tpl @@ -11,7 +11,7 @@ {$form.buttons.html} -{if $rows } +{if $rows}

{include file="CRM/Campaign/Form/Selector.tpl"} diff --git a/templates/CRM/Campaign/Page/SurveyType.tpl b/templates/CRM/Campaign/Page/SurveyType.tpl index 9fed46dd17..f3492147e5 100644 --- a/templates/CRM/Campaign/Page/SurveyType.tpl +++ b/templates/CRM/Campaign/Page/SurveyType.tpl @@ -1,6 +1,6 @@
-{if ($action eq 1) or ($action eq 2) or ($action eq 8) } - {include file="CRM/Campaign/Form/SurveyType.tpl" } +{if ($action eq 1) or ($action eq 2) or ($action eq 8)} + {include file="CRM/Campaign/Form/SurveyType.tpl"} {else} {if $rows}
diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl index 9f2e59923f..90744ee0c6 100644 --- a/templates/CRM/Case/Form/Activity.tpl +++ b/templates/CRM/Case/Form/Activity.tpl @@ -10,7 +10,7 @@ {* this template is used for adding/editing activities for a case. *}
- {if $action eq 8 or $action eq 32768 } + {if $action eq 8 or $action eq 32768}
  {if $action eq 8} @@ -23,7 +23,7 @@

{else}
{$form.toggleSelect.html}
{$form.$cbName.html}
- {if $activityTypeDescription } + {if $activityTypeDescription}
{$activityTypeDescription}
diff --git a/templates/CRM/Case/Form/ActivityToCase.tpl b/templates/CRM/Case/Form/ActivityToCase.tpl index 0968dd970c..774c84fcc6 100644 --- a/templates/CRM/Case/Form/ActivityToCase.tpl +++ b/templates/CRM/Case/Form/ActivityToCase.tpl @@ -59,13 +59,13 @@ subject = $("#file_on_case_activity_subject").val(), targetContactId = $("#file_on_case_target_contact_id").val(); - var postUrl = {/literal}"{crmURL p='civicrm/ajax/activity/convert' h=0 }"{literal}; + var postUrl = {/literal}"{crmURL p='civicrm/ajax/activity/convert' h=0}"{literal}; $.post( postUrl, { activityID: activityID, caseID: selectedCaseId, contactID: contactId, newSubject: subject, targetContactIds: targetContactId, mode: action, key: {/literal}"{crmKey name='civicrm/ajax/activity/convert'}"{literal} }, function( values ) { if ( values.error_msg ) { $().crmError(values.error_msg, "{/literal}{ts escape='js'}Unable to file on case.{/ts}{literal}"); } else { - var destUrl = {/literal}"{crmURL p='civicrm/contact/view/case' q='reset=1&action=view&id=' h=0 }"{literal}; + var destUrl = {/literal}"{crmURL p='civicrm/contact/view/case' q='reset=1&action=view&id=' h=0}"{literal}; var context = ''; {/literal}{if !empty($fulltext)}{literal} context = '&context={/literal}{$fulltext}{literal}'; diff --git a/templates/CRM/Case/Form/Case.tpl b/templates/CRM/Case/Form/Case.tpl index 3b26a979de..92ab07e2fa 100644 --- a/templates/CRM/Case/Form/Case.tpl +++ b/templates/CRM/Case/Form/Case.tpl @@ -14,7 +14,7 @@

{if $action eq 8}{ts}Delete Case{/ts}{elseif $action eq 32768}{ts}Restore Case{/ts}{/if}

-{if $action eq 8 or $action eq 32768 } +{if $action eq 8 or $action eq 32768}
{icon icon="fa-info-circle"}{/icon} {if $action eq 8} @@ -25,7 +25,7 @@
{else}
- {if $activityTypeDescription } + {if $activityTypeDescription}
{$activityTypeDescription}
diff --git a/templates/CRM/Case/Form/CaseView.tpl b/templates/CRM/Case/Form/CaseView.tpl index fba20e624d..bb5d90f058 100644 --- a/templates/CRM/Case/Form/CaseView.tpl +++ b/templates/CRM/Case/Form/CaseView.tpl @@ -309,7 +309,7 @@

{/foreach} - {if !$tags && !$tagSetTags } + {if !$tags && !$tagSetTags}
{ts}There are no tags currently assigned to this case.{/ts}
diff --git a/templates/CRM/Case/Form/Search/Common.tpl b/templates/CRM/Case/Form/Search/Common.tpl index a720113051..46c319f77f 100644 --- a/templates/CRM/Case/Form/Search/Common.tpl +++ b/templates/CRM/Case/Form/Search/Common.tpl @@ -25,7 +25,7 @@ {include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="case_start_date" to='' from='' colspan='' class ='' hideRelativeLabel=0} - {include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="case_end_date" to='' from='' colspan='' class ='' hideRelativeLabel=0 } + {include file="CRM/Core/DatePickerRangeWrapper.tpl" fieldName="case_end_date" to='' from='' colspan='' class ='' hideRelativeLabel=0} diff --git a/templates/CRM/Case/Form/Selector.tpl b/templates/CRM/Case/Form/Selector.tpl index 27e8c7384a..36d9402fea 100644 --- a/templates/CRM/Case/Form/Selector.tpl +++ b/templates/CRM/Case/Form/Selector.tpl @@ -12,7 +12,7 @@
- {if ! $single and $context eq 'Search' } + {if ! $single and $context eq 'Search'} {/if} @@ -59,7 +59,7 @@ {/foreach} {* Dashboard only lists 10 most recent cases. *} - {if $context EQ 'dashboard' and $limit and $pager->_totalItems GT $limit } + {if $context EQ 'dashboard' and $limit and $pager->_totalItems GT $limit} diff --git a/templates/CRM/Case/Form/Task.tpl b/templates/CRM/Case/Form/Task.tpl index e43c5e35fb..de8584c046 100644 --- a/templates/CRM/Case/Form/Task.tpl +++ b/templates/CRM/Case/Form/Task.tpl @@ -9,7 +9,7 @@ *} {ts 1=$totalSelectedCases}Number of selected cases: %1{/ts} -{if $rows } +{if $rows}
{$form.toggleSelect.html}
{ts}Find more cases{/ts}...
diff --git a/templates/CRM/Case/Form/Task/Print.tpl b/templates/CRM/Case/Form/Task/Print.tpl index e15d076c6f..fa7941d1b4 100644 --- a/templates/CRM/Case/Form/Task/Print.tpl +++ b/templates/CRM/Case/Form/Task/Print.tpl @@ -9,7 +9,7 @@ *}

-{if $rows } +{if $rows}

{include file="CRM/common/formButtons.tpl" location="top"}
diff --git a/templates/CRM/Case/Page/Tab.tpl b/templates/CRM/Case/Page/Tab.tpl index 9d54b54171..f24a05c430 100644 --- a/templates/CRM/Case/Page/Tab.tpl +++ b/templates/CRM/Case/Page/Tab.tpl @@ -25,7 +25,7 @@ {capture assign=newCaseURL}{crmURL p="civicrm/case/add" q="reset=1&action=add&cid=`$contactId`&context=case"}{/capture} - {if $action eq 1 or $action eq 2 or $action eq 8 or $action eq 32768 } {* add, update, delete, restore*} + {if $action eq 1 or $action eq 2 or $action eq 8 or $action eq 32768} {* add, update, delete, restore*} {include file="CRM/Case/Form/Case.tpl"} {elseif $action eq 4 } {include file="CRM/Case/Form/CaseView.tpl"} diff --git a/templates/CRM/Contact/Form/Contact.tpl b/templates/CRM/Contact/Form/Contact.tpl index 962359cfab..8e05bf6e88 100644 --- a/templates/CRM/Contact/Form/Contact.tpl +++ b/templates/CRM/Contact/Form/Contact.tpl @@ -15,7 +15,7 @@ {include file="CRM/Contact/Form/Edit/Lock.tpl"} {/if}
- {if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM') } + {if call_user_func(array('CRM_Core_Permission','check'), 'administer CiviCRM')} {/if} {ts}Expand all tabs{/ts} @@ -77,7 +77,7 @@
{foreach from = $editOptions item = "title" key="name"} - {if $name eq 'CustomData' } + {if $name eq 'CustomData'}
{include file="CRM/Contact/Form/Edit/CustomData.tpl" isSingleRecordEdit=false}
{else} {include file="CRM/Contact/Form/Edit/$name.tpl"} diff --git a/templates/CRM/Contact/Form/Edit/Address.tpl b/templates/CRM/Contact/Form/Edit/Address.tpl index d89db16ae8..6a1365111e 100644 --- a/templates/CRM/Contact/Form/Edit/Address.tpl +++ b/templates/CRM/Contact/Form/Edit/Address.tpl @@ -22,7 +22,7 @@
{if $blockId gt 1}
{ts}Supplemental Address{/ts}{/if}
- {if $masterAddress && $masterAddress.$blockId gt 0 } + {if $masterAddress && $masterAddress.$blockId gt 0} {/if} diff --git a/templates/CRM/Contact/Form/Inline/Email.tpl b/templates/CRM/Contact/Form/Inline/Email.tpl index bcd1447ee0..8cad9e1249 100644 --- a/templates/CRM/Contact/Form/Inline/Email.tpl +++ b/templates/CRM/Contact/Form/Inline/Email.tpl @@ -19,7 +19,7 @@ diff --git a/templates/CRM/Contact/Form/Inline/OpenID.tpl b/templates/CRM/Contact/Form/Inline/OpenID.tpl index 7fd73b6118..2ba0e42acc 100644 --- a/templates/CRM/Contact/Form/Inline/OpenID.tpl +++ b/templates/CRM/Contact/Form/Inline/OpenID.tpl @@ -20,7 +20,7 @@ diff --git a/templates/CRM/Contact/Form/Inline/Phone.tpl b/templates/CRM/Contact/Form/Inline/Phone.tpl index fa90b955ce..ed00232af0 100644 --- a/templates/CRM/Contact/Form/Inline/Phone.tpl +++ b/templates/CRM/Contact/Form/Inline/Phone.tpl @@ -19,7 +19,7 @@ diff --git a/templates/CRM/Contact/Form/Inline/Website.tpl b/templates/CRM/Contact/Form/Inline/Website.tpl index f58852cc8d..dd59149593 100644 --- a/templates/CRM/Contact/Form/Inline/Website.tpl +++ b/templates/CRM/Contact/Form/Inline/Website.tpl @@ -21,7 +21,7 @@ diff --git a/templates/CRM/Contact/Form/Merge.tpl b/templates/CRM/Contact/Form/Merge.tpl index 45b96032b7..7728817431 100644 --- a/templates/CRM/Contact/Form/Merge.tpl +++ b/templates/CRM/Contact/Form/Merge.tpl @@ -142,12 +142,12 @@
{icon icon="fa-info-circle"}{/icon} {ts 1=$masterAddress.$blockId}This address is shared with %1 contact record(s). Modifying this address will automatically update the shared address for these contacts.{/ts}
{ts}Email{/ts}  - {if $actualBlockCount lt 5 } + {if $actualBlockCount lt 5} {ts}add{/ts} diff --git a/templates/CRM/Contact/Form/Inline/IM.tpl b/templates/CRM/Contact/Form/Inline/IM.tpl index 5291433fbb..53a986d7ca 100644 --- a/templates/CRM/Contact/Form/Inline/IM.tpl +++ b/templates/CRM/Contact/Form/Inline/IM.tpl @@ -19,7 +19,7 @@
{ts}Instant Messenger{/ts}  - {if $actualBlockCount lt 5 } + {if $actualBlockCount lt 5} {ts}add{/ts} {/if}
{ts}Open ID{/ts}  - {if $actualBlockCount lt 5 } + {if $actualBlockCount lt 5} {ts}add{/ts} {/if}
{ts}Phone{/ts}  - {if $actualBlockCount lt 5 } + {if $actualBlockCount lt 5} {ts}add{/ts} {/if}
{ts}Website{/ts} {help id="id-website" file="CRM/Contact/Form/Contact.hlp"} - {if $actualBlockCount lt 25 } + {if $actualBlockCount lt 25}   {ts}add{/ts} {/if} {* Display location for fields with locations *} - {if $blockName eq 'email' || $blockName eq 'phone' || $blockName eq 'address' || $blockName eq 'im' } + {if $blockName eq 'email' || $blockName eq 'phone' || $blockName eq 'address' || $blockName eq 'im'} {$form.location_blocks.$blockName.$blockId.locTypeId.html}  {/if} {* Display other_type_id for websites, ims and phones *} - {if $blockName eq 'website' || $blockName eq 'im' || $blockName eq 'phone' } + {if $blockName eq 'website' || $blockName eq 'im' || $blockName eq 'phone'} {$form.location_blocks.$blockName.$blockId.typeTypeId.html}  {/if} diff --git a/templates/CRM/Contact/Form/Relationship.tpl b/templates/CRM/Contact/Form/Relationship.tpl index f1fc994faa..63cc618691 100644 --- a/templates/CRM/Contact/Form/Relationship.tpl +++ b/templates/CRM/Contact/Form/Relationship.tpl @@ -60,7 +60,7 @@
{/if} - {if ($action EQ 1) OR ($action EQ 2) } + {if ($action EQ 1) OR ($action EQ 2)} {*include custom data js file *} {include file="CRM/common/customData.tpl"} {/literal} {* Give link to view/edit option group *} -{if $action eq 2 && !empty($hasOptionGroup) } +{if $action eq 2 && !empty($hasOptionGroup)}
{crmButton p="civicrm/admin/custom/group/field/option" q="reset=1&action=browse&fid=`$id`&gid=`$gid`" icon="pencil"}{ts}View / Edit Multiple Choice Options{/ts}{/crmButton}
diff --git a/templates/CRM/Custom/Form/Option.tpl b/templates/CRM/Custom/Form/Option.tpl index 0080f20ae2..b2adedd987 100644 --- a/templates/CRM/Custom/Form/Option.tpl +++ b/templates/CRM/Custom/Form/Option.tpl @@ -8,7 +8,7 @@ +--------------------------------------------------------------------+ *}
-

{if $action eq 4 }{ts}View Option{/ts}{elseif $action eq 2}{ts}Edit Option{/ts}{elseif $action eq 8}{ts 1=$label}Delete Option "%1"{/ts}{else}{ts}Add Option{/ts}{/if}

+

{if $action eq 4}{ts}View Option{/ts}{elseif $action eq 2}{ts}Edit Option{/ts}{elseif $action eq 8}{ts 1=$label}Delete Option "%1"{/ts}{else}{ts}Add Option{/ts}{/if}

{if $action eq 8}
{icon icon="fa-info-circle"}{/icon} diff --git a/templates/CRM/Event/Form/EventFees.tpl b/templates/CRM/Event/Form/EventFees.tpl index b74911069a..943ea0abc6 100644 --- a/templates/CRM/Event/Form/EventFees.tpl +++ b/templates/CRM/Event/Form/EventFees.tpl @@ -7,7 +7,7 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{assign var=isRecordPayment value=1 } +{assign var=isRecordPayment value=1} {capture assign="isShowBillingBlock"}{if $action neq 2}1{else}0{/if}{/capture} {if $paid} {* We retrieve this tpl when event is selected - keep it empty if event is not paid *} @@ -43,7 +43,7 @@ {/if} - {if $accessContribution and ! $participantMode and ($action neq 2 or !$rows.0.contribution_id or $onlinePendingContributionId) and $isRecordPayment and ! $registeredByParticipantId } + {if $accessContribution and ! $participantMode and ($action neq 2 or !$rows.0.contribution_id or $onlinePendingContributionId) and $isRecordPayment and ! $registeredByParticipantId} {assign var=isShowBillingBlock value=true} @@ -71,7 +71,7 @@ - {if $showTransactionId } + {if $showTransactionId} {/if} @@ -117,7 +117,7 @@
{include file="CRM/Price/Form/PriceSet.tpl" extends="Event" hideTotal=false} {else} - {assign var=isRecordPayment value=0 } + {assign var=isRecordPayment value=0}
{ts}No active price fields found for this event!{/ts}
{/if}
@@ -52,7 +52,7 @@
{$form.record_contribution.label}{$form.receive_date.label} {$form.receive_date.html}
{$form.trxn_id.label}{$form.trxn_id.html}
{$form.contribution_status_id.label}{$form.contribution_status_id.html}
-{elseif $context eq 'standalone' and $outBound_option != 2 } +{elseif $context eq 'standalone' and $outBound_option != 2}
{/if} - {if !$section } + {if !$section} {*Statistics at the bottom of the page*} {include file="CRM/Report/Form/Statistics.tpl" top=false bottom=true} {/if} diff --git a/templates/CRM/Report/Form/Event/Income.tpl b/templates/CRM/Report/Form/Event/Income.tpl index 25072c85c5..a48a4f65e6 100644 --- a/templates/CRM/Report/Form/Event/Income.tpl +++ b/templates/CRM/Report/Form/Event/Income.tpl @@ -8,7 +8,7 @@ +--------------------------------------------------------------------+ *} {* this div is being used to apply special css *} - {if !$section } + {if !$section}
{include file="CRM/Report/Form/Fields.tpl"}
@@ -17,7 +17,7 @@
{include file="CRM/Report/Form/Actions.tpl"} {*Statistics at the Top of the page*} - {if !$section } + {if !$section} {include file="CRM/Report/Form/Statistics.tpl" top=true bottom=false} {/if} @@ -68,7 +68,7 @@
{include file="CRM/common/pager.tpl"}
- {if !$section } + {if !$section} {*Statistics at the bottom of the page*} {include file="CRM/Report/Form/Statistics.tpl" top=false bottom=true} {/if} diff --git a/templates/CRM/Report/Form/Layout/Overlay.tpl b/templates/CRM/Report/Form/Layout/Overlay.tpl index a75e03b04f..39e94e4472 100644 --- a/templates/CRM/Report/Form/Layout/Overlay.tpl +++ b/templates/CRM/Report/Form/Layout/Overlay.tpl @@ -135,7 +135,7 @@
{if $pager and $pager->_response and $pager->_response.numPages > 1}
- {include file="CRM/common/pager.tpl" } + {include file="CRM/common/pager.tpl"}
{/if} {/if} diff --git a/templates/CRM/Tag/Form/Edit.tpl b/templates/CRM/Tag/Form/Edit.tpl index affb637f89..434ef8ecfb 100644 --- a/templates/CRM/Tag/Form/Edit.tpl +++ b/templates/CRM/Tag/Form/Edit.tpl @@ -9,7 +9,7 @@ *} {* this template is used for adding/editing a tag (admin) *}
- {if $action eq 1 or $action eq 2 } + {if $action eq 1 or $action eq 2} diff --git a/templates/CRM/UF/Form/Field.tpl b/templates/CRM/UF/Form/Field.tpl index 1743782aac..63b516deeb 100644 --- a/templates/CRM/UF/Form/Field.tpl +++ b/templates/CRM/UF/Form/Field.tpl @@ -144,7 +144,7 @@ function showLabel( ) { // Code to set Profile Field help, from custom data field help if (fieldId.substring(0, 7) == 'custom_') { fieldId = fieldId.substring( fieldId.length, 7); - var dataUrl = {/literal}"{crmURL p='civicrm/ajax/custom' h=0 }"{literal}; + var dataUrl = {/literal}"{crmURL p='civicrm/ajax/custom' h=0}"{literal}; cj.post( dataUrl, { id: fieldId }, function(data) { cj('#help_post').val(data.help_post); cj('#help_pre').val(data.help_pre); @@ -203,7 +203,7 @@ CRM.$(function($) { function multiSummaryToggle(customId) { if (customId && customId.match(/custom_[\d]/)) { - var dataUrl = "{/literal}{crmURL p='civicrm/ajax/rest' q='className=CRM_UF_Page_AJAX&fnName=checkIsMultiRecord&json=1' h=0 }"{literal}; + var dataUrl = "{/literal}{crmURL p='civicrm/ajax/rest' q='className=CRM_UF_Page_AJAX&fnName=checkIsMultiRecord&json=1' h=0}"{literal}; dataUrl = dataUrl + '&customId=' + customId; cj.ajax({ url: dataUrl, async: false, diff --git a/templates/CRM/UF/Form/Group.tpl b/templates/CRM/UF/Form/Group.tpl index a7d8d5bf53..1a28192bd0 100644 --- a/templates/CRM/UF/Form/Group.tpl +++ b/templates/CRM/UF/Form/Group.tpl @@ -12,7 +12,7 @@

{ts}Delete CiviCRM Profile{/ts} - {$profileTitle}

{/if}
-{if ($action eq 2 or $action eq 4) and $snippet neq 'json' } {* Update or View*} +{if ($action eq 2 or $action eq 4) and $snippet neq 'json'} {* Update or View*}
{ts}View or Edit Fields for this Profile{/ts}
diff --git a/templates/CRM/UF/Page/Field.tpl b/templates/CRM/UF/Page/Field.tpl index aad5e08c3d..115fdd527b 100644 --- a/templates/CRM/UF/Page/Field.tpl +++ b/templates/CRM/UF/Page/Field.tpl @@ -8,9 +8,9 @@ +--------------------------------------------------------------------+ *} -{if $action eq 1 or $action eq 2 or $action eq 4 or $action eq 8 } +{if $action eq 1 or $action eq 2 or $action eq 4 or $action eq 8} {include file="CRM/UF/Form/Field.tpl"} -{elseif $action eq 1024 } +{elseif $action eq 1024} {include file="CRM/UF/Form/Preview.tpl"} {else}
@@ -23,7 +23,7 @@
- {if in_array("Profile",$otherModules) or in_array("Search Profile",$otherModules) } + {if in_array("Profile",$otherModules) or in_array("Search Profile",$otherModules)} @@ -38,7 +38,7 @@ {foreach from=$ufField item=row} - {if in_array("Profile",$otherModules) or in_array("Search Profile",$otherModules) } + {if in_array("Profile",$otherModules) or in_array("Search Profile",$otherModules)} @@ -54,7 +54,7 @@ {/strip} {if not ($action eq 2 or $action eq 1)}
- {crmButton p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid" icon="plus-circle"}{ts}Add Field{/ts}{/crmButton}{if !$isGroupReserved}{crmButton p="civicrm/admin/uf/group" q="action=update&id=`$gid`&reset=1&context=field" icon="wrench"}{ts}Edit Settings{/ts}{/crmButton}{/if}{crmButton p="civicrm/admin/uf/group" q="action=preview&id=`$gid`&reset=1&field=0&context=field" icon="television"}{ts}Preview (all fields){/ts}{/crmButton}{if !$skipCreate }{crmButton p="civicrm/profile/create" q="gid=$gid&reset=1" icon="play-circle"}{ts}Use (create mode){/ts}{/crmButton}{/if} + {crmButton p="civicrm/admin/uf/group/field/add" q="reset=1&action=add&gid=$gid" icon="plus-circle"}{ts}Add Field{/ts}{/crmButton}{if !$isGroupReserved}{crmButton p="civicrm/admin/uf/group" q="action=update&id=`$gid`&reset=1&context=field" icon="wrench"}{ts}Edit Settings{/ts}{/crmButton}{/if}{crmButton p="civicrm/admin/uf/group" q="action=preview&id=`$gid`&reset=1&field=0&context=field" icon="television"}{ts}Preview (all fields){/ts}{/crmButton}{if !$skipCreate}{crmButton p="civicrm/profile/create" q="gid=$gid&reset=1" icon="play-circle"}{ts}Use (create mode){/ts}{/crmButton}{/if}
{/if} diff --git a/templates/CRM/UF/Page/Group.tpl b/templates/CRM/UF/Page/Group.tpl index 4bcd418556..7521d51e80 100644 --- a/templates/CRM/UF/Page/Group.tpl +++ b/templates/CRM/UF/Page/Group.tpl @@ -68,7 +68,7 @@ {foreach from=$rows item=row} - {if !$row.is_reserved } + {if !$row.is_reserved} diff --git a/templates/CRM/common/CMSUser.tpl b/templates/CRM/common/CMSUser.tpl index de6f24407c..350797295f 100644 --- a/templates/CRM/common/CMSUser.tpl +++ b/templates/CRM/common/CMSUser.tpl @@ -7,7 +7,7 @@ | and copyright information, see https://civicrm.org/licensing | +--------------------------------------------------------------------+ *} -{if $showCMS }{*true if is_cms_user field is set *} +{if $showCMS}{*true if is_cms_user field is set *}
{ts}Account{/ts}
diff --git a/templates/CRM/common/WizardHeader.tpl b/templates/CRM/common/WizardHeader.tpl index 3ca60b9cb9..77e08ab592 100644 --- a/templates/CRM/common/WizardHeader.tpl +++ b/templates/CRM/common/WizardHeader.tpl @@ -12,7 +12,7 @@
    {section name=step loop=$wizard.steps} - {if count ( $wizard.steps ) > 5 } + {if count ( $wizard.steps ) > 5} {* truncate step titles so header isn't too wide *} {assign var="title" value=$wizard.steps[step].title|crmFirstWord} {else} diff --git a/templates/CRM/common/checkUsernameAvailable.tpl b/templates/CRM/common/checkUsernameAvailable.tpl index c20db4381a..d8be9aada7 100644 --- a/templates/CRM/common/checkUsernameAvailable.tpl +++ b/templates/CRM/common/checkUsernameAvailable.tpl @@ -47,7 +47,7 @@ cj("#checkavailability").click(function() { cj("#msgbox").removeClass().addClass('cmsmessagebox').css({"color":"#000","backgroundColor":"#FFC","border":"1px solid #c93"}).text(check).fadeIn("slow"); //check the username exists or not from ajax - var contactUrl = {/literal}"{crmURL p='civicrm/ajax/cmsuser' h=0 }"{literal}; + var contactUrl = {/literal}"{crmURL p='civicrm/ajax/cmsuser' h=0}"{literal}; var checkUserParams = { cms_name: cj("#cms_name").val(), diff --git a/templates/CRM/common/dedupe.tpl b/templates/CRM/common/dedupe.tpl index 23fc3a8129..d81b7bdb4b 100644 --- a/templates/CRM/common/dedupe.tpl +++ b/templates/CRM/common/dedupe.tpl @@ -62,7 +62,7 @@ function saveProcessDupes( cid, oid, oper, context ) { var statusMsg = {/literal}'{ts escape="js"}Marked as duplicates.{/ts}'{literal}; } - var url = {/literal}"{crmURL p='civicrm/ajax/rest' q='className=CRM_Contact_Page_AJAX&fnName=processDupes' h=0 }"{literal}; + var url = {/literal}"{crmURL p='civicrm/ajax/rest' q='className=CRM_Contact_Page_AJAX&fnName=processDupes' h=0}"{literal}; //post the data to process dupes. cj.post( url, {cid: cid, oid: oid, op: oper}, diff --git a/templates/CRM/common/searchResultTasks.tpl b/templates/CRM/common/searchResultTasks.tpl index 2451473f2d..968fed3c6e 100644 --- a/templates/CRM/common/searchResultTasks.tpl +++ b/templates/CRM/common/searchResultTasks.tpl @@ -15,7 +15,7 @@
diff --git a/templates/CRM/common/standalone.tpl b/templates/CRM/common/standalone.tpl index 3c5b3f4627..58acc88223 100644 --- a/templates/CRM/common/standalone.tpl +++ b/templates/CRM/common/standalone.tpl @@ -17,8 +17,8 @@ {/crmRegion} {* @todo This is probably not required? *} -{if isset($buildNavigation) and !$urlIsPublic } - {include file="CRM/common/Navigation.tpl" } +{if isset($buildNavigation) and !$urlIsPublic} + {include file="CRM/common/Navigation.tpl"} {/if} {$docTitle} diff --git a/xml/templates/message_templates/case_activity_html.tpl b/xml/templates/message_templates/case_activity_html.tpl index 6c4e30ee98..cdaa456838 100644 --- a/xml/templates/message_templates/case_activity_html.tpl +++ b/xml/templates/message_templates/case_activity_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} - {capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} - {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + {capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} + {capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
{$form.name.label}
{ts}Field Name{/ts}{ts}Visibility{/ts} {ts}Searchable?{/ts} {ts}Results Column?{/ts}
{$row.label}({$row.field_type}){$row.visibility_display} {if $row.is_searchable eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if} {if $row.in_selector eq 1} {ts}Yes{/ts} {else} {ts}No{/ts} {/if}
{$row.title} {$row.frontend_title} {if !empty($savedSearch.name)}{$savedSearch.name} ({ts}smart group{/ts}) - {/if} {ts count=$pager->_totalItems plural='%count Results'}%count Result{/ts}{if $selectorLabel} - {$selectorLabel}{/if} - {if $context == 'Event' && $participantCount && ( $pager->_totalItems ne $participantCount ) } + {if $context == 'Event' && $participantCount && ($pager->_totalItems ne $participantCount)}
{ts}Actual participant count{/ts} : {$participantCount} {help id="id-actual_participant_count" file="CRM/Event/Form/Search/Results.hlp"}   {/if}
diff --git a/xml/templates/message_templates/contribution_dupalert_html.tpl b/xml/templates/message_templates/contribution_dupalert_html.tpl index 4c6867f0dc..28ef49022a 100644 --- a/xml/templates/message_templates/contribution_dupalert_html.tpl +++ b/xml/templates/message_templates/contribution_dupalert_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/contribution_offline_receipt_html.tpl b/xml/templates/message_templates/contribution_offline_receipt_html.tpl index a4d76250a2..7a4a10778f 100644 --- a/xml/templates/message_templates/contribution_offline_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_offline_receipt_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/contribution_online_receipt_html.tpl b/xml/templates/message_templates/contribution_online_receipt_html.tpl index faa9e2611f..9d1fe4e8e2 100644 --- a/xml/templates/message_templates/contribution_online_receipt_html.tpl +++ b/xml/templates/message_templates/contribution_online_receipt_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/contribution_recurring_billing_html.tpl b/xml/templates/message_templates/contribution_recurring_billing_html.tpl index 84d6938af0..0826f61f2e 100644 --- a/xml/templates/message_templates/contribution_recurring_billing_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_billing_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/contribution_recurring_cancelled_html.tpl b/xml/templates/message_templates/contribution_recurring_cancelled_html.tpl index ac2c48790e..acacc2c5f2 100644 --- a/xml/templates/message_templates/contribution_recurring_cancelled_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_cancelled_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/contribution_recurring_edit_html.tpl b/xml/templates/message_templates/contribution_recurring_edit_html.tpl index a4a89db2f3..8d51d06a90 100644 --- a/xml/templates/message_templates/contribution_recurring_edit_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_edit_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/contribution_recurring_notify_html.tpl b/xml/templates/message_templates/contribution_recurring_notify_html.tpl index 22d39121b4..34a9d17681 100644 --- a/xml/templates/message_templates/contribution_recurring_notify_html.tpl +++ b/xml/templates/message_templates/contribution_recurring_notify_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
@@ -54,7 +54,7 @@ diff --git a/xml/templates/message_templates/contribution_recurring_notify_text.tpl b/xml/templates/message_templates/contribution_recurring_notify_text.tpl index 6aead9e1a5..673b228f16 100644 --- a/xml/templates/message_templates/contribution_recurring_notify_text.tpl +++ b/xml/templates/message_templates/contribution_recurring_notify_text.tpl @@ -20,7 +20,7 @@ {ts}Thanks for your recurring contribution sign-up.{/ts} -{ts 1=$recur_frequency_interval 2=$recur_frequency_unit 3=$recur_installments}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments } {ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}. +{ts 1=$recur_frequency_interval 2=$recur_frequency_unit 3=$recur_installments}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments} {ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}. {ts}Start Date{/ts}: {$recur_start_date|crmDate} diff --git a/xml/templates/message_templates/event_offline_receipt_html.tpl b/xml/templates/message_templates/event_offline_receipt_html.tpl index 50a7584736..ef4cb9c201 100644 --- a/xml/templates/message_templates/event_offline_receipt_html.tpl +++ b/xml/templates/message_templates/event_offline_receipt_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}

{ts}Thanks for your recurring contribution sign-up.{/ts}

-

{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments }{ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}.

+

{ts 1=$recur_frequency_interval 2=$recur_frequency_unit}This recurring contribution will be automatically processed every %1 %2(s){/ts}{if $recur_installments}{ts 1=$recur_installments} for a total of %1 installment(s){/ts}{/if}.

{ts}Start Date{/ts}: {$recur_start_date|crmDate}
@@ -194,7 +194,7 @@ {/if} - {if !empty($pricesetFieldsCount) }{/if} + {if !empty($pricesetFieldsCount)}{/if} {foreach from=$value item=line} @@ -226,7 +226,7 @@ - {if !empty($pricesetFieldsCount) } + {if !empty($pricesetFieldsCount)} @@ -299,7 +299,7 @@ {/if} - {if !empty($pricesetFieldsCount) } + {if !empty($pricesetFieldsCount)} @@ -311,7 +311,7 @@ {foreach from=$pcount item=p_count} {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} {/foreach} - {if $lineItemCount < 1 } + {if $lineItemCount < 1} assign var="lineItemCount" value=1} {/if} {assign var="count" value=$count+$lineItemCount} diff --git a/xml/templates/message_templates/event_offline_receipt_text.tpl b/xml/templates/message_templates/event_offline_receipt_text.tpl index 17f9d9caf4..01c536252b 100644 --- a/xml/templates/message_templates/event_offline_receipt_text.tpl +++ b/xml/templates/message_templates/event_offline_receipt_text.tpl @@ -4,38 +4,38 @@ {/if} {if !empty($isOnWaitlist)} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {ts}You have been added to the WAIT LIST for this event.{/ts} {ts}If space becomes available you will receive an email with a link to a web page where you can complete your registration.{/ts} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {elseif !empty($isRequireApproval)} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {ts}Your registration has been submitted.{/ts} {ts}Once your registration has been reviewed, you will receive an email with a link to a web page where you can complete the registration process.{/ts} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {elseif $isPrimary && {contribution.balance_amount|boolean} && {contribution.is_pay_later|boolean}} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {$pay_later_receipt} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {/if} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {ts}Event Information and Location{/ts} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {event.title} {event.start_date|crmDate}{if {event.end_date|boolean}}-{if '{event.end_date|crmDate:"%Y%m%d"}' === '{event.start_date|crmDate:"%Y%m%d"}'}{event.end_date|crmDate:"Time"}{else}{event.end_date}{/if}{/if} @@ -76,20 +76,20 @@ {if !empty($email)} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {ts}Registered Email{/ts} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {$email} {/if} {if {event.is_monetary|boolean}} {* This section for Paid events only.*} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {event.fee_label} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {if !empty($lineItem)}{foreach from=$lineItem item=value key=priceset} @@ -99,7 +99,7 @@ {ts 1=$priceset+1}Participant %1{/ts} {/if} {/if} ----------------------------------------------------------{if !empty($pricesetFieldsCount) }--------------------{/if} +---------------------------------------------------------{if !empty($pricesetFieldsCount)}--------------------{/if} {capture assign=ts_item}{ts}Item{/ts}{/capture} {capture assign=ts_qty}{ts}Qty{/ts}{/capture} @@ -110,12 +110,12 @@ {capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture} {/if} {capture assign=ts_total}{ts}Total{/ts}{/capture} -{capture assign=ts_participant_total}{if !empty($pricesetFieldsCount) }{ts}Total Participants{/ts}{/if}{/capture} +{capture assign=ts_participant_total}{if !empty($pricesetFieldsCount)}{ts}Total Participants{/ts}{/if}{/capture} {$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if !empty($dataArray)} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} {if !empty($ts_participant_total)}{$ts_participant_total|string_format:"%10s"}{/if} -----------------------------------------------------------{if !empty($pricesetFieldsCount) }--------------------{/if} +----------------------------------------------------------{if !empty($pricesetFieldsCount)}--------------------{/if} {foreach from=$value item=line} -{if !empty($pricesetFieldsCount) }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} +{if !empty($pricesetFieldsCount)}{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} {capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney|string_format:"%10s"} {if !empty($dataArray)} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {/if} {$line.line_total+$line.tax_amount|crmMoney|string_format:"%10s"} {if !empty($ts_participant_count)}{$ts_participant_count|string_format:"%10s"}{/if} {/foreach} {/if} @@ -149,7 +149,7 @@ {else}{ts}Total Amount{/ts}: {contribution.total_amount} {if !empty($hookDiscount.message)}({$hookDiscount.message}){/if} {/if} -{if !empty($pricesetFieldsCount) } +{if !empty($pricesetFieldsCount)} {assign var="count" value= 0} {foreach from=$lineItem item=pcount} {assign var="lineItemCount" value=0} @@ -157,7 +157,7 @@ {foreach from=$pcount item=p_count} {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} {/foreach} - {if $lineItemCount < 1 } + {if $lineItemCount < 1} {assign var="lineItemCount" value=1} {/if} {assign var="count" value=$count+$lineItemCount} @@ -168,10 +168,10 @@ {/if} {if $isPrimary && {contribution.balance_amount|boolean} && {contribution.is_pay_later|boolean}} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {$pay_later_receipt} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {/if} @@ -195,11 +195,11 @@ {/if} {if !empty($billingName)} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {ts}Billing Name and Address{/ts} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {$billingName} {$address} @@ -209,7 +209,7 @@ =========================================================== {ts}Credit Card Information{/ts} -==========================================================={if !empty($pricesetFieldsCount) }===================={/if} +==========================================================={if !empty($pricesetFieldsCount)}===================={/if} {$credit_card_type} {$credit_card_number} @@ -220,10 +220,10 @@ {if !empty($customGroup)} {foreach from=$customGroup item=value key=customName} -=========================================================={if !empty($pricesetFieldsCount) }===================={/if} +=========================================================={if !empty($pricesetFieldsCount)}===================={/if} {$customName} -=========================================================={if !empty($pricesetFieldsCount) }===================={/if} +=========================================================={if !empty($pricesetFieldsCount)}===================={/if} {foreach from=$value item=v key=n} {$n}: {$v} diff --git a/xml/templates/message_templates/event_online_receipt_html.tpl b/xml/templates/message_templates/event_online_receipt_html.tpl index e1239f5e80..a18fd97da7 100644 --- a/xml/templates/message_templates/event_online_receipt_html.tpl +++ b/xml/templates/message_templates/event_online_receipt_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture} {capture assign=tdfirstStyle}style="width: 180px; padding-bottom: 15px;"{/capture} {capture assign=tdStyle}style="width: 100px;"{/capture} {capture assign=participantTotalStyle}style="margin: 0.5em 0 0.5em;padding: 0.5em;background-color: #999999;font-weight: bold;color: #FAFAFA;border-radius: 2px;"{/capture} @@ -294,7 +294,7 @@ {contribution.total_amount} {if !empty($hookDiscount.message)}({$hookDiscount.message}){/if} - {if !empty($pricesetFieldsCount) } + {if !empty($pricesetFieldsCount)} @@ -306,7 +306,7 @@ {foreach from=$pcount item=p_count} {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} {/foreach} - {if $lineItemCount < 1 } + {if $lineItemCount < 1} {assign var="lineItemCount" value=1} {/if} {assign var="count" value=$count+$lineItemCount} @@ -465,7 +465,7 @@ {/if}
{ts}Tax Amount{/ts}{ts}Total{/ts}{ts}Total Participants{/ts}{ts}Total Participants{/ts}
{$line.line_total+$line.tax_amount|crmMoney} {$line.participant_count}
{ts}Total Participants{/ts}
{ts}Total Participants{/ts}
- {if !empty($event.allow_selfcancelxfer) } + {if !empty($event.allow_selfcancelxfer)} {ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if !empty($totalAmount)}{ts}Cancellations are not refundable.{/ts}{/if}
diff --git a/xml/templates/message_templates/event_online_receipt_text.tpl b/xml/templates/message_templates/event_online_receipt_text.tpl index 6ab598f21b..d207556479 100644 --- a/xml/templates/message_templates/event_online_receipt_text.tpl +++ b/xml/templates/message_templates/event_online_receipt_text.tpl @@ -107,12 +107,12 @@ You were registered by: {$payer.name} {capture assign=ts_taxAmount}{ts}Tax Amount{/ts}{/capture} {/if} {capture assign=ts_total}{ts}Total{/ts}{/capture} -{if !empty($pricesetFieldsCount) }{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if} +{if !empty($pricesetFieldsCount)}{capture assign=ts_participant_total}{ts}Total Participants{/ts}{/capture}{/if} {$ts_item|string_format:"%-30s"} {$ts_qty|string_format:"%5s"} {$ts_each|string_format:"%10s"} {if $isShowTax && {contribution.tax_amount|boolean}} {$ts_subtotal|string_format:"%10s"} {$ts_taxRate|string_format:"%10s"} {$ts_taxAmount|string_format:"%10s"} {/if} {$ts_total|string_format:"%10s"} {if !empty($ts_participant_total)}{$ts_participant_total|string_format:"%10s"}{/if} -----------------------------------------------------------{if !empty($pricesetFieldsCount)}-----------------------------------------------------{/if} {foreach from=$value item=line} -{if !empty($pricesetFieldsCount) }{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} +{if !empty($pricesetFieldsCount)}{capture assign=ts_participant_count}{$line.participant_count}{/capture}{/if} {capture assign=ts_item}{if $line.html_type eq 'Text'}{$line.label}{else}{$line.field_title} - {$line.label}{/if} {if $line.description} {$line.description}{/if}{/capture}{$ts_item|truncate:30:"..."|string_format:"%-30s"} {$line.qty|string_format:"%5s"} {$line.unit_price|crmMoney:$currency|string_format:"%10s"} {if $isShowTax && {contribution.tax_amount|boolean}} {$line.unit_price*$line.qty|crmMoney:$currency|string_format:"%10s"} {if $line.tax_rate || $line.tax_amount != ""} {$line.tax_rate|string_format:"%.2f"} % {$line.tax_amount|crmMoney:$currency|string_format:"%10s"} {else} {/if} {/if} {$line.line_total+$line.tax_amount|crmMoney:$currency|string_format:"%10s"}{if !empty($ts_participant_count)}{$ts_participant_count|string_format:"%10s"}{/if} {/foreach} ---------------------------------------------------------------------------------------------------------------- @@ -143,7 +143,7 @@ You were registered by: {$payer.name} {ts}Total Amount{/ts}: {if !empty($totalAmount)}{$totalAmount|crmMoney:$currency}{/if} {if !empty($hookDiscount.message)}({$hookDiscount.message}){/if} -{if !empty($pricesetFieldsCount) } +{if !empty($pricesetFieldsCount)} {assign var="count" value= 0} {foreach from=$lineItem item=pcount} {assign var="lineItemCount" value=0} @@ -151,7 +151,7 @@ You were registered by: {$payer.name} {foreach from=$pcount item=p_count} {assign var="lineItemCount" value=$lineItemCount+$p_count.participant_count} {/foreach} - {if $lineItemCount < 1 } + {if $lineItemCount < 1} {assign var="lineItemCount" value=1} {/if} {assign var="count" value=$count+$lineItemCount} @@ -254,7 +254,7 @@ You were registered by: {$payer.name} {/foreach} {/if} -{if !empty($event.allow_selfcancelxfer) } +{if !empty($event.allow_selfcancelxfer)} {ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if !empty($totalAmount)}{ts}Cancellations are not refundable.{/ts}{/if} {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}" h=0 a=1 fe=1}{/capture} {ts}Transfer or cancel your registration:{/ts} {$selfService} diff --git a/xml/templates/message_templates/event_registration_receipt_html.tpl b/xml/templates/message_templates/event_registration_receipt_html.tpl index 4dbb912e0f..6bada4d6da 100644 --- a/xml/templates/message_templates/event_registration_receipt_html.tpl +++ b/xml/templates/message_templates/event_registration_receipt_html.tpl @@ -6,8 +6,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} - {capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} - {capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} + {capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} + {capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture} {assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}

{$greeting},

{/if} {if $is_pay_later} diff --git a/xml/templates/message_templates/friend_html.tpl b/xml/templates/message_templates/friend_html.tpl index a83a119a43..6da12532a0 100644 --- a/xml/templates/message_templates/friend_html.tpl +++ b/xml/templates/message_templates/friend_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture} diff --git a/xml/templates/message_templates/membership_autorenew_billing_html.tpl b/xml/templates/message_templates/membership_autorenew_billing_html.tpl index 10719b4ddb..872ff21b7e 100644 --- a/xml/templates/message_templates/membership_autorenew_billing_html.tpl +++ b/xml/templates/message_templates/membership_autorenew_billing_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl b/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl index 738a71b90a..b4fc722488 100644 --- a/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl +++ b/xml/templates/message_templates/membership_autorenew_cancelled_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/membership_offline_receipt_html.tpl b/xml/templates/message_templates/membership_offline_receipt_html.tpl index 4eed6e5ad9..b95821a37f 100644 --- a/xml/templates/message_templates/membership_offline_receipt_html.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_html.tpl @@ -8,8 +8,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/membership_offline_receipt_text.tpl b/xml/templates/message_templates/membership_offline_receipt_text.tpl index dd5248f741..74b52870ed 100644 --- a/xml/templates/message_templates/membership_offline_receipt_text.tpl +++ b/xml/templates/message_templates/membership_offline_receipt_text.tpl @@ -70,7 +70,7 @@ {/if} {/if} -{if !empty($isPrimary) } +{if !empty($isPrimary)} {if !empty($billingName)} =========================================================== diff --git a/xml/templates/message_templates/membership_online_receipt_html.tpl b/xml/templates/message_templates/membership_online_receipt_html.tpl index 61dc61912d..00854d6e9e 100644 --- a/xml/templates/message_templates/membership_online_receipt_html.tpl +++ b/xml/templates/message_templates/membership_online_receipt_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
@@ -88,7 +88,7 @@ {$membership_amount|crmMoney} - {if $amount && !$is_separate_payment } + {if $amount && !$is_separate_payment} - {if $event.allow_selfcancelxfer } + {if $event.allow_selfcancelxfer}
{ts}Contribution Amount{/ts} diff --git a/xml/templates/message_templates/membership_online_receipt_text.tpl b/xml/templates/message_templates/membership_online_receipt_text.tpl index 50c8c03663..b692a4fa8a 100644 --- a/xml/templates/message_templates/membership_online_receipt_text.tpl +++ b/xml/templates/message_templates/membership_online_receipt_text.tpl @@ -28,7 +28,7 @@ =========================================================== {if !$useForMember && isset($membership_amount) && !empty($is_quick_config)} {ts 1=$membership_name}%1 Membership{/ts}: {$membership_amount|crmMoney} -{if $amount && !$is_separate_payment } +{if $amount && !$is_separate_payment} {ts}Contribution Amount{/ts}: {$amount|crmMoney} ------------------------------------------- {ts}Total{/ts}: {$amount+$membership_amount|crmMoney} @@ -87,7 +87,7 @@ {ts}Total Tax Amount{/ts}: {$totalTaxAmount|crmMoney:$currency} {/if} -{ts}Amount{/ts}: {$amount|crmMoney} {if isset($amount_level) } - {$amount_level} {/if} +{ts}Amount{/ts}: {$amount|crmMoney} {if isset($amount_level)} - {$amount_level} {/if} {/if} {elseif isset($membership_amount)} =========================================================== @@ -123,7 +123,7 @@ {/if} {/if} -{if $honor_block_is_active } +{if $honor_block_is_active} =========================================================== {$soft_credit_type} =========================================================== diff --git a/xml/templates/message_templates/participant_cancelled_html.tpl b/xml/templates/message_templates/participant_cancelled_html.tpl index c0da77d4d5..8011f94862 100644 --- a/xml/templates/message_templates/participant_cancelled_html.tpl +++ b/xml/templates/message_templates/participant_cancelled_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture} diff --git a/xml/templates/message_templates/participant_confirm_html.tpl b/xml/templates/message_templates/participant_confirm_html.tpl index 039f985862..9adb27725c 100644 --- a/xml/templates/message_templates/participant_confirm_html.tpl +++ b/xml/templates/message_templates/participant_confirm_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
@@ -36,7 +36,7 @@ {/if} - {if $event.allow_selfcancelxfer } + {if $event.allow_selfcancelxfer} {ts}This event allows for{/ts} {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}" h=0 a=1 fe=1}{/capture} {ts}self service cancel or transfer{/ts} @@ -147,7 +147,7 @@
{ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if}
diff --git a/xml/templates/message_templates/participant_confirm_text.tpl b/xml/templates/message_templates/participant_confirm_text.tpl index 259fd8ef22..4804454474 100644 --- a/xml/templates/message_templates/participant_confirm_text.tpl +++ b/xml/templates/message_templates/participant_confirm_text.tpl @@ -12,7 +12,7 @@ Click this link to go to a web page where you can confirm your registration online: {$confirmUrl} {/if} -{if $event.allow_selfcancelxfer } +{if $event.allow_selfcancelxfer} {ts 1=$selfcancelxfer_time 2=$selfservice_preposition}You may transfer your registration to another participant or cancel your registration up to %1 hours %2 the event.{/ts} {if $totalAmount}{ts}Cancellations are not refundable.{/ts}{/if} {capture assign=selfService}{crmURL p='civicrm/event/selfsvcupdate' q="reset=1&pid=`$participant.id`&{contact.checksum}" h=0 a=1 fe=1}{/capture} {ts}Transfer or cancel your registration:{/ts} {$selfService} diff --git a/xml/templates/message_templates/participant_expired_html.tpl b/xml/templates/message_templates/participant_expired_html.tpl index d25fb796f9..1945198657 100644 --- a/xml/templates/message_templates/participant_expired_html.tpl +++ b/xml/templates/message_templates/participant_expired_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture} diff --git a/xml/templates/message_templates/participant_transferred_html.tpl b/xml/templates/message_templates/participant_transferred_html.tpl index f064922015..ecd2e9e62f 100644 --- a/xml/templates/message_templates/participant_transferred_html.tpl +++ b/xml/templates/message_templates/participant_transferred_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/payment_or_refund_notification_html.tpl b/xml/templates/message_templates/payment_or_refund_notification_html.tpl index 118435dc6d..9da9560b5c 100644 --- a/xml/templates/message_templates/payment_or_refund_notification_html.tpl +++ b/xml/templates/message_templates/payment_or_refund_notification_html.tpl @@ -7,10 +7,10 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} -{capture assign=emptyBlockStyle }style="padding: 10px; border-bottom: 1px solid #999;background-color: #f7f7f7;"{/capture} -{capture assign=emptyBlockValueStyle }style="padding: 10px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=emptyBlockStyle}style="padding: 10px; border-bottom: 1px solid #999;background-color: #f7f7f7;"{/capture} +{capture assign=emptyBlockValueStyle}style="padding: 10px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/pcp_notify_html.tpl b/xml/templates/message_templates/pcp_notify_html.tpl index 8ea10a44ec..45904b2369 100644 --- a/xml/templates/message_templates/pcp_notify_html.tpl +++ b/xml/templates/message_templates/pcp_notify_html.tpl @@ -7,9 +7,9 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} -{capture assign=pcpURL }{crmURL p="civicrm/pcp/info" q="reset=1&id=`$pcpId`" h=0 a=1 fe=1}{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=pcpURL}{crmURL p="civicrm/pcp/info" q="reset=1&id=`$pcpId`" h=0 a=1 fe=1}{/capture}
diff --git a/xml/templates/message_templates/pcp_owner_notify_html.tpl b/xml/templates/message_templates/pcp_owner_notify_html.tpl index e24d5a4257..0f7a34b7a3 100644 --- a/xml/templates/message_templates/pcp_owner_notify_html.tpl +++ b/xml/templates/message_templates/pcp_owner_notify_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture} {assign var="greeting" value="{contact.email_greeting_display}"}{if $greeting}

{$greeting},

{/if}

{ts}You have received a donation at your personal page{/ts}: {$page_title}

diff --git a/xml/templates/message_templates/pcp_supporter_notify_html.tpl b/xml/templates/message_templates/pcp_supporter_notify_html.tpl index 8cd2d2895e..4692428035 100644 --- a/xml/templates/message_templates/pcp_supporter_notify_html.tpl +++ b/xml/templates/message_templates/pcp_supporter_notify_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/pledge_acknowledge_html.tpl b/xml/templates/message_templates/pledge_acknowledge_html.tpl index b95281be17..d55741e5bf 100644 --- a/xml/templates/message_templates/pledge_acknowledge_html.tpl +++ b/xml/templates/message_templates/pledge_acknowledge_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/pledge_reminder_html.tpl b/xml/templates/message_templates/pledge_reminder_html.tpl index de9ebeadfe..190be18b79 100644 --- a/xml/templates/message_templates/pledge_reminder_html.tpl +++ b/xml/templates/message_templates/pledge_reminder_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/message_templates/uf_notify_html.tpl b/xml/templates/message_templates/uf_notify_html.tpl index 8439f29a41..09e6b31530 100644 --- a/xml/templates/message_templates/uf_notify_html.tpl +++ b/xml/templates/message_templates/uf_notify_html.tpl @@ -7,8 +7,8 @@ {capture assign=headerStyle}colspan="2" style="text-align: left; padding: 4px; border-bottom: 1px solid #999; background-color: #eee;"{/capture} -{capture assign=labelStyle }style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} -{capture assign=valueStyle }style="padding: 4px; border-bottom: 1px solid #999;"{/capture} +{capture assign=labelStyle}style="padding: 4px; border-bottom: 1px solid #999; background-color: #f7f7f7;"{/capture} +{capture assign=valueStyle}style="padding: 4px; border-bottom: 1px solid #999;"{/capture}
diff --git a/xml/templates/schema.tpl b/xml/templates/schema.tpl index 50a11fd18b..cb7dae48f8 100644 --- a/xml/templates/schema.tpl +++ b/xml/templates/schema.tpl @@ -51,5 +51,5 @@ CREATE TABLE `{$table.name}` ({assign var='first' value=true} CONSTRAINT {$foreign.uniqName} FOREIGN KEY (`{$foreign.name}`) REFERENCES `{$foreign.table}`(`{$foreign.key}`){if $foreign.onDelete} ON DELETE {$foreign.onDelete}{/if}{/foreach}{* table.foreignKey *}{/if}{strip} {* table.foreignKey *}{/strip} ) -{if $mysql eq 'modern' }{$table.attributes_modern}{else}{$table.attributes_simple}{/if}; +{if $mysql eq 'modern'}{$table.attributes_modern}{else}{$table.attributes_simple}{/if}; {/foreach}{* tables *} -- 2.25.1