From a883f8e2f0df16a91e9c0cc234cbf7f2cb03272a Mon Sep 17 00:00:00 2001 From: larssandergreen Date: Fri, 22 Sep 2023 21:11:29 -0600 Subject: [PATCH] Smarty backticks fixes, etc --- templates/CRM/Admin/Form/PaymentProcessor.tpl | 32 +++++++++---------- .../CRM/Contact/Form/Search/ResultTasks.tpl | 4 +-- templates/CRM/Contact/Form/Task/Batch.tpl | 6 ++-- .../Contribute/Form/ContributionPage/Tab.hlp | 22 ++++++------- .../CRM/Contribute/Page/ContributionPage.hlp | 2 +- .../CRM/Custom/Form/Edit/CustomField.tpl | 6 ++-- templates/CRM/Custom/Form/Preview.tpl | 7 ++-- templates/CRM/Event/Form/Task/Batch.tpl | 6 ++-- templates/CRM/Pledge/Form/Pledge.tpl | 2 +- templates/CRM/Pledge/Form/PledgeView.tpl | 2 +- templates/CRM/Pledge/Form/Selector.tpl | 2 +- templates/CRM/Price/Form/PriceSet.tpl | 10 +++--- templates/CRM/Profile/Form/Dynamic.tpl | 8 ++--- templates/CRM/Profile/Page/Overlay.tpl | 6 ++-- .../Report/Form/Campaign/SurveyCoverSheet.tpl | 2 +- templates/CRM/Report/Form/Contact/Detail.tpl | 4 +-- templates/CRM/Report/Form/Layout/Overlay.tpl | 4 +-- templates/CRM/Report/Form/Layout/Table.tpl | 4 +-- .../CRM/Report/Form/Tabs/FieldSelection.tpl | 4 +-- templates/CRM/Report/Form/Tabs/GroupBy.tpl | 4 +-- .../CRM/Report/Form/Tabs/ReportOptions.tpl | 2 +- templates/CRM/UF/Form/Fields.tpl | 6 ++-- templates/CRM/common/jcalendar.tpl | 4 +-- templates/CRM/common/searchResultTasks.tpl | 4 +-- .../pledge_acknowledge_html.tpl | 4 +-- .../pledge_acknowledge_text.tpl | 4 +-- 26 files changed, 80 insertions(+), 81 deletions(-) diff --git a/templates/CRM/Admin/Form/PaymentProcessor.tpl b/templates/CRM/Admin/Form/PaymentProcessor.tpl index 722f042447..cb79afabc7 100644 --- a/templates/CRM/Admin/Form/PaymentProcessor.tpl +++ b/templates/CRM/Admin/Form/PaymentProcessor.tpl @@ -55,41 +55,41 @@ {ts}Processor Details for Live Payments{/ts} - + {if !empty($form.password)} - + {/if} {if !empty($form.signature)} - + {/if} {if !empty($form.subject)} - + {/if} {if !empty($form.url_site)} - + {/if} {if !empty($form.url_api)} - + {/if} {if !empty($form.url_recur)} - + {/if} {if !empty($form.url_button)} - + {/if}
{$form.user_name.label}{$form.user_name.html} {help id=$ppTypeName|cat:'-live-user-name' title=$form.user_name.label}{$form.user_name.label}{$form.user_name.html} {help id="$ppTypeName-live-user-name" title=$form.user_name.label}
{$form.password.label}{$form.password.html} {help id=$ppTypeName|cat:'-live-password' title=$form.password.label}{$form.password.label}{$form.password.html} {help id="$ppTypeName-live-password" title=$form.password.label}
{$form.signature.label}{$form.signature.html} {help id=$ppTypeName|cat:'-live-signature' title=$form.signature.label}{$form.signature.label}{$form.signature.html} {help id="$ppTypeName-live-signature" title=$form.signature.label}
{$form.subject.label}{$form.subject.html} {help id=$ppTypeName|cat:'-live-subject' title=$form.subject.label}{$form.subject.label}{$form.subject.html} {help id="$ppTypeName-live-subject" title=$form.subject.label}
{$form.url_site.label}{$form.url_site.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-live-url-site' title=$form.url_site.label}{$form.url_site.label}{$form.url_site.html|crmAddClass:huge} {help id="$ppTypeName-live-url-site" title=$form.url_site.label}
{$form.url_api.label}{$form.url_api.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-live-url-api' title=$form.url_api.label}{$form.url_api.label}{$form.url_api.html|crmAddClass:huge} {help id="$ppTypeName-live-url-api" title=$form.url_api.label}
{$form.url_recur.label}{$form.url_recur.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-live-url-recur' title=$form.url_recur.label}{$form.url_recur.label}{$form.url_recur.html|crmAddClass:huge} {help id="$ppTypeName-live-url-recur" title=$form.url_recur.label}
{$form.url_button.label}{$form.url_button.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-live-url-button' title=$form.url_button.label}{$form.url_button.label}{$form.url_button.html|crmAddClass:huge} {help id="$ppTypeName-live-url-button" title=$form.url_button.label}
@@ -99,40 +99,40 @@ {ts}Processor Details for Test Payments{/ts} - + {if !empty($form.test_password)} - + {/if} {if !empty($form.test_signature)} - + {/if} {if !empty($form.test_subject)} - + {/if} {if !empty($form.test_url_site)} - + {/if} {if !empty($form.test_url_api)} - + {/if} {if !empty($form.test_url_recur)} - + {/if} {if !empty($form.test_url_button)} - + {/if} {/if} diff --git a/templates/CRM/Contact/Form/Search/ResultTasks.tpl b/templates/CRM/Contact/Form/Search/ResultTasks.tpl index e7a9bab83c..092e301a22 100644 --- a/templates/CRM/Contact/Form/Search/ResultTasks.tpl +++ b/templates/CRM/Contact/Form/Search/ResultTasks.tpl @@ -34,7 +34,7 @@ {* Search criteria are passed to tpl in the $qill array *} @@ -48,7 +48,7 @@
{$form.test_user_name.label}{$form.test_user_name.html} {help id=$ppTypeName|cat:'-test-user-name' title=$form.test_user_name.label}
{$form.test_user_name.label}{$form.test_user_name.html} {help id="$ppTypeName-test-user-name" title=$form.test_user_name.label}
{$form.test_password.label}{$form.test_password.html} {help id=$ppTypeName|cat:'-test-password' title=$form.test_password.label}{$form.test_password.label}{$form.test_password.html} {help id="$ppTypeName-test-password" title=$form.test_password.label}
{$form.test_signature.label}{$form.test_signature.html} {help id=$ppTypeName|cat:'-test-signature' title=$form.test_signature.label}{$form.test_signature.label}{$form.test_signature.html} {help id="$ppTypeName-test-signature" title=$form.test_signature.label}
{$form.test_subject.label}{$form.test_subject.html} {help id=$ppTypeName|cat:'-test-subject' title=$form.test_subject.label}{$form.test_subject.label}{$form.test_subject.html} {help id="$ppTypeName-test-subject" title=$form.test_subject.label}
{$form.test_url_site.label}{$form.test_url_site.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-test-url-site' title=$form.test_url_site.label}{$form.test_url_site.label}{$form.test_url_site.html|crmAddClass:huge} {help id="$ppTypeName-test-url-site" title=$form.test_url_site.label}
{$form.test_url_api.label}{$form.test_url_api.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-test-url-api' title=$form.test_url_api.label}{$form.test_url_api.label}{$form.test_url_api.html|crmAddClass:huge} {help id="$ppTypeName-test-url-api" title=$form.test_url_api.label}
{$form.test_url_recur.label}{$form.test_url_recur.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-test-url-recur' title=$form.test_url_recur.label}{$form.test_url_recur.label}{$form.test_url_recur.html|crmAddClass:huge} {help id="$ppTypeName-test-url-recur" title=$form.test_url_recur.label}
{$form.test_url_button.label}{$form.test_url_button.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-test-url-button' title=$form.test_url_button.label}{$form.test_url_button.label}{$form.test_url_button.html|crmAddClass:huge} {help id="$ppTypeName-test-url-button" title=$form.test_url_button.label}
{if !empty($savedSearch.name)}{$savedSearch.name} ({ts}smart group{/ts}) - {/if} - {ts count=$pager->_totalItems plural='%count Contacts'}%count Contact{/ts} + {ts count=$pager->_totalItems plural="%count Contacts"}%count Contact{/ts} {ts}Select Records{/ts}: {assign var="checked" value=$selectedContactIds|@count} - {$form.radio_ts.ts_all.html} + {$form.radio_ts.ts_all.html} {if $pager->_totalItems > 1}   {$form.radio_ts.ts_sel.html} {/if} diff --git a/templates/CRM/Contact/Form/Task/Batch.tpl b/templates/CRM/Contact/Form/Task/Batch.tpl index 166630a4db..316ee28dad 100644 --- a/templates/CRM/Contact/Form/Task/Batch.tpl +++ b/templates/CRM/Contact/Form/Task/Batch.tpl @@ -38,7 +38,7 @@ {assign var=n value=$field.name} {if $field.options_per_line} - {assign var="count" value="1"} + {assign var="count" value=1} {strip} @@ -50,9 +50,9 @@ {if $count == $field.options_per_line} - {assign var="count" value="1"} + {assign var="count" value=1} {else} - {assign var="count" value=`$count+1`} + {assign var="count" value=$count+1} {/if} {/if} {/foreach} diff --git a/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp b/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp index 74944271f7..0ad6f249ca 100644 --- a/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp +++ b/templates/CRM/Contribute/Form/ContributionPage/Tab.hlp @@ -13,49 +13,49 @@ {htxt id="id-configure-contrib-pages"}
- + - + - + - + - + - + - + - + - + - + - + diff --git a/templates/CRM/Contribute/Page/ContributionPage.hlp b/templates/CRM/Contribute/Page/ContributionPage.hlp index cb6bbf5919..3c58bfb6da 100644 --- a/templates/CRM/Contribute/Page/ContributionPage.hlp +++ b/templates/CRM/Contribute/Page/ContributionPage.hlp @@ -11,7 +11,7 @@ {ts}Contribution Pages{/ts} {/htxt} {htxt id="id-intro"} - {capture assign=newPageURL}{crmURL p='civicrm/admin/contribute/add' q='action=add&reset=1'}{/capture} + {capture assign=newPageURL}{crmURL p="civicrm/admin/contribute/add" q="action=add&reset=1"}{/capture}

{ts}CiviContribute allows you to create and maintain any number of Online Contribution Pages. You can create different pages for different programs or campaigns, and you can customize text, amounts, types of information collected from contributors, etc.{/ts}

{ts}For existing pages{/ts}:
    diff --git a/templates/CRM/Custom/Form/Edit/CustomField.tpl b/templates/CRM/Custom/Form/Edit/CustomField.tpl index 5a90fb207a..10f2659915 100644 --- a/templates/CRM/Custom/Form/Edit/CustomField.tpl +++ b/templates/CRM/Custom/Form/Edit/CustomField.tpl @@ -18,15 +18,15 @@
{/if} {if !empty($element.options_per_line)} - {*assign var="element_name" value=$element.custom_group_id|cat:_|cat:$field_id|cat:_|cat:$element.name*} {assign var="element_name" value=$element.element_name}
{ts}Title and Settings{/ts} {ts}Title and Settings{/ts} {ts}Use this form to edit the page title, financial type (e.g. donation, campaign contribution, etc.), goal amount, introduction, and status (active/inactive) for this online contribution page.{/ts}
{ts}Amount{/ts} {ts}Amount{/ts} {ts}Use this form to configure Contribution Amount options. You can give contributors the ability to enter their own contribution amounts and/or provide a fixed list of amounts. For fixed amounts, you can enter a label for each 'level' of contribution (e.g. Friend, Sustainer, etc.). If you allow people to enter their own dollar amounts, you can also set minimum and maximum values. Depending on your choice of Payment Processor, you may be able to offer a recurring contribution option.{/ts}
{ts}Memberships{/ts} {ts}Memberships{/ts} {ts}Use this form to enable and configure a Membership Signup and Renewal section for this Online Contribution Page. If you're not using this page for membership signup, leave the Enabled box un-checked.{/ts}
{ts}Thank-you and Receipting{/ts} {ts}Thank-you and Receipting{/ts} {ts}Use this form to configure the thank-you message and receipting options. Contributors will see a confirmation and thank-you page after whenever an online contribution is successfully processed. You provide the content and layout of the thank-you section below. You also control whether an electronic receipt is automatically emailed to each contributor, and you can add a custom message to that receipt.{/ts}
{ts}Tell a Friend{/ts} {ts}Tell a Friend{/ts} {ts}Tell a Friend gives your contributors an easy way to spread the word about this fundraising campaign. The contribution thank-you page will include a link to a form where they can enter their friends' email addresses, along with a personalized message. CiviCRM will record these solicitation activities, and will add the friends to your database.{/ts}
{ts}Include Profiles{/ts} {ts}Include Profiles{/ts} {ts}You may want to collect information from contributors beyond what is required to make a contribution. For example, you may want to inquire about volunteer availability and skills. Add any number of fields to your contribution form by selecting CiviCRM Profiles (collections of fields) to include at the beginning of the page, and/or at the bottom.{/ts}
{capture assign=adminGroupURL}{crmURL p="civicrm/admin/uf/group" q="reset=1&action=browse"}{/capture} {ts 1=$adminGroupURL}You can use existing CiviCRM Profiles on your page or create profile(s) specifically for use in Online Contribution pages. Go to Administer CiviCRM Profiles if you need to review, modify or create profiles (you can come back at any time to select or update the Profile(s) used for this page).{/ts}
{ts}Premiums{/ts} {ts}Premiums{/ts} {ts}Enable the Premiums section for this Online Contribution Page, and customize the title and introductory message (e.g ...in appreciation of your support, you will be able to select from a number of exciting thank-you gifts...). You can optionally provide a contact email address and/or phone number for inquiries. Then select and review the premiums that you want to offer on this contribution page.{/ts}
{ts}Widget{/ts} {ts}Widget{/ts} {ts}Widgets allow you and your supporters to easily promote this fund-raising campaign. Widget code can be added to any web page. They will provide a real-time display of current contribution results, and a direct link to this contribution page.{/ts}
{ts}Personal Campaign Pages{/ts} {ts}Personal Campaign Pages{/ts} {ts}Allow constituents to create their own personal fundraising pages linked to this contribution page.{/ts}
{ts}Online Contribution{/ts}
({ts}Test-drive{/ts})		 {ts}Online Contribution{/ts}
({ts}Test-drive{/ts})		 {ts}Test-drive the entire contribution process—including custom fields, confirmation, thank-you page, and receipting. Transactions will be directed to your payment processor's test server. No live financial transactions will be submitted. However, a contact record will be created or updated and a test contribution record will be saved to the database. Use obvious test contact names so you can review and delete these records as needed. Test contributions are not visible on the Contributions tab, but can be viewed by searching for 'Test Contributions' in the CiviContribute search form.{/ts}
{ts}Online Contribution{/ts}
({ts}Live{/ts})		 {ts}Online Contribution{/ts}
({ts}Live{/ts})		 {ts}Review your customized LIVE online contribution page here. Use the following URL in links and buttons on any website to send visitors to this live page:{/ts}
{crmURL a=1 fe=1 p="civicrm/contribute/transact" q="reset=1&id=`$contributionPageID`"}
{$formElement.label}{if $element.help_post}{help id=$element.id file="CRM/Custom/Form/CustomField.hlp" title=$element.label}{/if} - {assign var="count" value="1"} + {assign var="count" value=1} {foreach name=outer key=key item=item from=$formElement} {if is_array($item) && array_key_exists('html', $item)} {$item.html} {if $count == $element.options_per_line}
- {assign var="count" value="1"} + {assign var="count" value=1} {else} - {assign var="count" value=`$count+1`} + {assign var="count" value=$count+1} {/if} {else} {* Skip because this isn't one of the numeric keyed elements that are the options to display, it's non-numeric keys like the field label and metadata. *} diff --git a/templates/CRM/Custom/Form/Preview.tpl b/templates/CRM/Custom/Form/Preview.tpl index 592b916ea9..1300856f4b 100644 --- a/templates/CRM/Custom/Form/Preview.tpl +++ b/templates/CRM/Custom/Form/Preview.tpl @@ -34,12 +34,11 @@
{$element.help_pre}
{$form.$element_name.label}{if !empty($element.help_post)}{help id=$element.id file="CRM/Custom/Form/CustomField.hlp" title=$form.$element_name.label}{/if} - {assign var="count" value="1"} + {assign var="count" value=1} {* sort by fails for option per line. Added a variable to iterate through the element array*} @@ -48,10 +47,10 @@ {if is_array($item) && array_key_exists('html', $item)} {if $count == $element.options_per_line} - {assign var="count" value="1"} + {assign var="count" value=1} {else} - {assign var="count" value=`$count+1`} + {assign var="count" value=$count+1} {/if} {/if} {/foreach} diff --git a/templates/CRM/Event/Form/Task/Batch.tpl b/templates/CRM/Event/Form/Task/Batch.tpl index 8cbab09496..feafec5e88 100644 --- a/templates/CRM/Event/Form/Task/Batch.tpl +++ b/templates/CRM/Event/Form/Task/Batch.tpl @@ -57,7 +57,7 @@ {* CRM-19860 Copied from templates/CRM/Contact/Form/Task/Batch.tpl *} {if $field.options_per_line} {assign var=skip value=true} - {assign var=skipCount value=`$header.colspan`} + {assign var=skipCount value=$header.colspan} {assign var=skipMade value=1} {else} {assign var=skip value=false} {/if} {else} {* for skip case *} - {assign var=skipMade value=`$skipMade+1`} + {assign var=skipMade value=$skipMade+1} {if $skipMade >= $skipCount}{assign var=skip value=false}{/if} {/if} {/foreach} diff --git a/templates/CRM/Report/Form/Layout/Overlay.tpl b/templates/CRM/Report/Form/Layout/Overlay.tpl index 39e94e4472..c698a1ef37 100644 --- a/templates/CRM/Report/Form/Layout/Overlay.tpl +++ b/templates/CRM/Report/Form/Layout/Overlay.tpl @@ -22,14 +22,14 @@ {if $header.colspan} {assign var=skip value=true} - {assign var=skipCount value=`$header.colspan`} + {assign var=skipCount value=$header.colspan} {assign var=skipMade value=1} {else} {assign var=skip value=false} {/if} {else} {* for skip case *} - {assign var=skipMade value=`$skipMade+1`} + {assign var=skipMade value=$skipMade+1} {if $skipMade >= $skipCount}{assign var=skip value=false}{/if} {/if} {/foreach} diff --git a/templates/CRM/Report/Form/Layout/Table.tpl b/templates/CRM/Report/Form/Layout/Table.tpl index afbb74d372..d27ff1f48e 100644 --- a/templates/CRM/Report/Form/Layout/Table.tpl +++ b/templates/CRM/Report/Form/Layout/Table.tpl @@ -28,14 +28,14 @@ {if $header.colspan} {assign var=skip value=true} - {assign var=skipCount value=`$header.colspan`} + {assign var=skipCount value=$header.colspan} {assign var=skipMade value=1} {else} {assign var=skip value=false} {/if} {else} {* for skip case *} - {assign var=skipMade value=`$skipMade+1`} + {assign var=skipMade value=$skipMade+1} {if $skipMade >= $skipCount}{assign var=skip value=false}{/if} {/if} {/foreach} diff --git a/templates/CRM/Report/Form/Tabs/FieldSelection.tpl b/templates/CRM/Report/Form/Tabs/FieldSelection.tpl index 48af99e39e..339f51cb5d 100644 --- a/templates/CRM/Report/Form/Tabs/FieldSelection.tpl +++ b/templates/CRM/Report/Form/Tabs/FieldSelection.tpl @@ -10,7 +10,7 @@
{foreach from=$colGroups item=grpFields key=dnc} - {assign var="count" value="0"} + {assign var="count" value=0} {* Wrap custom field sets in collapsed accordion pane. *} {if !empty($grpFields.use_accordian_for_field_selection)}
{$form.$element_name.$key.html}
- {assign var="count" value="1"} + {assign var="count" value=1} {strip} @@ -69,9 +69,9 @@ {if $count == $field.options_per_line} - {assign var="count" value="1"} + {assign var="count" value=1} {else} - {assign var="count" value=`$count+1`} + {assign var="count" value=$count+1} {/if} {/if} {/foreach} diff --git a/templates/CRM/Pledge/Form/Pledge.tpl b/templates/CRM/Pledge/Form/Pledge.tpl index 3abc2466b7..a14814bf56 100644 --- a/templates/CRM/Pledge/Form/Pledge.tpl +++ b/templates/CRM/Pledge/Form/Pledge.tpl @@ -22,7 +22,7 @@ {math equation="x / y" x=$amount y=$installments format="%.2f" assign="currentInstallment"} {* Check if current Total Pledge Amount is different from original pledge amount. *} {if $currentInstallment NEQ $eachPaymentAmount} - {assign var=originalPledgeAmount value=`$installments*$eachPaymentAmount`} + {assign var=originalPledgeAmount value=$installments*$eachPaymentAmount} {/if} {/if}
diff --git a/templates/CRM/Pledge/Form/PledgeView.tpl b/templates/CRM/Pledge/Form/PledgeView.tpl index bc9e1aa6b8..534808d2e1 100644 --- a/templates/CRM/Pledge/Form/PledgeView.tpl +++ b/templates/CRM/Pledge/Form/PledgeView.tpl @@ -10,7 +10,7 @@ {math equation="x / y" x=$amount y=$installments format="%.2f" assign="currentInstallment"} {* Check if current Total Pledge Amount is different from original pledge amount. *} {if $currentInstallment NEQ $original_installment_amount} - {assign var=originalPledgeAmount value=`$installments*$original_installment_amount`} + {assign var=originalPledgeAmount value=$installments*$original_installment_amount} {/if}
diff --git a/templates/CRM/Pledge/Form/Selector.tpl b/templates/CRM/Pledge/Form/Selector.tpl index dfc16b8d65..00c7ea84a8 100644 --- a/templates/CRM/Pledge/Form/Selector.tpl +++ b/templates/CRM/Pledge/Form/Selector.tpl @@ -49,7 +49,7 @@ {/if}
- + diff --git a/templates/CRM/Price/Form/PriceSet.tpl b/templates/CRM/Price/Form/PriceSet.tpl index 8410ba5b4f..67c1e9be22 100644 --- a/templates/CRM/Price/Form/PriceSet.tpl +++ b/templates/CRM/Price/Form/PriceSet.tpl @@ -31,18 +31,18 @@ {if $element.help_pre}{$element.help_pre}
{/if}
{if ($element.html_type eq 'CheckBox' || $element.html_type == 'Radio') && $element.options_per_line} - {assign var="element_name" value="price_"|cat:$field_id} + {assign var="element_name" value="price_`$field_id`"}
{$form.$element_name.label}
{assign var="elementCount" value="0"} {assign var="optionCount" value="0"} {assign var="rowCount" value="0"} {foreach name=outer key=key item=item from=$form.$element_name} - {assign var="elementCount" value=`$elementCount+1`} + {assign var="elementCount" value=$elementCount+1} {if is_numeric($key)} - {assign var="optionCount" value=`$optionCount+1`} + {assign var="optionCount" value=$optionCount+1} {if $optionCount == 1} - {assign var="rowCount" value=`$rowCount+1`} + {assign var="rowCount" value=$rowCount+1}
{/if} {$form.$element_name.$key.html} @@ -68,7 +68,7 @@ {foreach item=option from=$element.options} {if ($option.tax_amount || $option.tax_amount == "0") && $displayOpt && $invoicing} - {assign var="amount" value=`$option.amount+$option.tax_amount`} + {assign var="amount" value=$option.amount+$option.tax_amount} {if $displayOpt == 'Do_not_show'} {$amount|crmMoney:$currency} {elseif $displayOpt == 'Inclusive'} diff --git a/templates/CRM/Profile/Form/Dynamic.tpl b/templates/CRM/Profile/Form/Dynamic.tpl index 61bb25deee..f721add52d 100644 --- a/templates/CRM/Profile/Form/Dynamic.tpl +++ b/templates/CRM/Profile/Form/Dynamic.tpl @@ -98,7 +98,7 @@
{$form.$n.label}
- {assign var="count" value="1"} + {assign var="count" value=1} {strip}
{$row.pledge_amount|crmMoney:$row.pledge_currency} {$row.pledge_total_paid|crmMoney:$row.pledge_currency}{$row.pledge_amount-$row.pledge_total_paid|crmMoney:$row.pledge_currency}{($row.pledge_amount-$row.pledge_total_paid)|crmMoney:$row.pledge_currency} {$row.pledge_financial_type} {$row.pledge_create_date|truncate:10:''|crmDate} {$row.pledge_next_pay_date|truncate:10:''|crmDate}
@@ -110,9 +110,9 @@ {if $count == $field.options_per_line} - {assign var="count" value="1"} + {assign var="count" value=1} {else} - {assign var="count" value=`$count+1`} + {assign var="count" value=$count+1} {/if} {/if} {/foreach} @@ -129,7 +129,7 @@
{if $n|substr:0:3 eq 'im-'} - {assign var="provider" value=$n|cat:"-provider_id"} + {assign var="provider" value="$n-provider_id"} {$form.$provider.html}  {/if} {if $n eq 'email_greeting' or $n eq 'postal_greeting' or $n eq 'addressee'} diff --git a/templates/CRM/Profile/Page/Overlay.tpl b/templates/CRM/Profile/Page/Overlay.tpl index 4683435b7a..79e1f7963f 100644 --- a/templates/CRM/Profile/Page/Overlay.tpl +++ b/templates/CRM/Profile/Page/Overlay.tpl @@ -14,7 +14,7 @@
diff --git a/templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl b/templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl index 904735eae3..4d6dcf78c5 100644 --- a/templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl +++ b/templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl @@ -66,7 +66,7 @@ {* clean separation of each response question *} - {assign var=resFldCnt value=`$resFldCnt+1`} + {assign var=resFldCnt value=$resFldCnt+1} {/foreach}
- {assign var="count" value="0"} + {assign var="count" value=0} {assign var="totalRows" value=$row|@count}
{foreach from=$profileFields item=field key=rowName} @@ -23,7 +23,7 @@
- {assign var="count" value="1"} + {assign var="count" value=1} {/if}
@@ -34,7 +34,7 @@
- {assign var="count" value=`$count+1`} + {assign var="count" value=$count+1} {/foreach}

diff --git a/templates/CRM/Report/Form/Contact/Detail.tpl b/templates/CRM/Report/Form/Contact/Detail.tpl index 8b4e9a119b..f7f7aca99f 100644 --- a/templates/CRM/Report/Form/Contact/Detail.tpl +++ b/templates/CRM/Report/Form/Contact/Detail.tpl @@ -63,14 +63,14 @@ {if $header.colspan} 		{$header.title}{$header.title}{$header.title}{$header.title}{$header.title|escape}{$header.title|escape}
{foreach from=$grpFields.fields item=title key=field} - {assign var="count" value=`$count+1`} + {assign var="count" value=$count+1} {if $count is div by 4} diff --git a/templates/CRM/Report/Form/Tabs/GroupBy.tpl b/templates/CRM/Report/Form/Tabs/GroupBy.tpl index 4e5a7e2d1e..f24158777e 100644 --- a/templates/CRM/Report/Form/Tabs/GroupBy.tpl +++ b/templates/CRM/Report/Form/Tabs/GroupBy.tpl @@ -8,11 +8,11 @@ +--------------------------------------------------------------------+ *}
- {assign var="count" value="0"} + {assign var="count" value=0}
{$form.fields.$field.html}
{foreach from=$groupByElements item=gbElem key=dnc} - {assign var="count" value=`$count+1`} + {assign var="count" value=$count+1} {foreach from=$otherOptions item=optionField key=optionName} {if array_key_exists($optionName, $form)} - {assign var="optionCount" value=`$optionCount+1`} + {assign var="optionCount" value=$optionCount+1} {if $optionCount is div by 2} diff --git a/templates/CRM/UF/Form/Fields.tpl b/templates/CRM/UF/Form/Fields.tpl index 05a85e6700..091af731bb 100644 --- a/templates/CRM/UF/Form/Fields.tpl +++ b/templates/CRM/UF/Form/Fields.tpl @@ -52,7 +52,7 @@
{$formElement.label}
- {assign var="count" value="1"} + {assign var="count" value=1} {strip}
{$form.group_bys[$gbElem].html} {if $form.group_bys_freq && array_key_exists($gbElem, $form.group_bys_freq)}:
diff --git a/templates/CRM/Report/Form/Tabs/ReportOptions.tpl b/templates/CRM/Report/Form/Tabs/ReportOptions.tpl index 4306302292..74426b61d3 100644 --- a/templates/CRM/Report/Form/Tabs/ReportOptions.tpl +++ b/templates/CRM/Report/Form/Tabs/ReportOptions.tpl @@ -14,7 +14,7 @@
{if $form.$optionName.label}{$form.$optionName.label} {/if}{$form.$optionName.html}
@@ -64,9 +64,9 @@ {if $count == $field.options_per_line} - {assign var="count" value="1"} + {assign var="count" value=1} {else} - {assign var="count" value=`$count+1`} + {assign var="count" value=$count+1} {/if} {/if} {/foreach} diff --git a/templates/CRM/common/jcalendar.tpl b/templates/CRM/common/jcalendar.tpl index e5c2b07cca..d3044553d2 100644 --- a/templates/CRM/common/jcalendar.tpl +++ b/templates/CRM/common/jcalendar.tpl @@ -18,9 +18,9 @@ {$form.$elementName.$elementIndex.html} {elseif $blockId and $blockSection} {assign var='elementId' value=$form.$blockSection.$blockId.$elementName.id} - {assign var="tElement" value=`$elementName`_time} + {assign var="tElement" value="`$elementName`_time"} {$form.$blockSection.$blockId.$elementName.html} - {assign var="timeElement" value=`$blockSection`_`$blockId`_`$elementName`_time} + {assign var="timeElement" value="`$blockSection`_`$blockId`_`$elementName`_time"} {if $tElement}   {$form.$blockSection.$blockId.$tElement.label}   {$form.$blockSection.$blockId.$tElement.html|crmAddClass:six} diff --git a/templates/CRM/common/searchResultTasks.tpl b/templates/CRM/common/searchResultTasks.tpl index 968fed3c6e..d9810d133c 100644 --- a/templates/CRM/common/searchResultTasks.tpl +++ b/templates/CRM/common/searchResultTasks.tpl @@ -14,7 +14,7 @@ diff --git a/xml/templates/message_templates/pledge_acknowledge_html.tpl b/xml/templates/message_templates/pledge_acknowledge_html.tpl index d55741e5bf..6a172f6326 100644 --- a/xml/templates/message_templates/pledge_acknowledge_html.tpl +++ b/xml/templates/message_templates/pledge_acknowledge_html.tpl @@ -64,7 +64,7 @@ {if $payments} - {assign var="count" value="1"} + {assign var="count" value=1} {foreach from=$payments item=payment} - {assign var="count" value=`$count+1`} + {assign var="count" value=$count+1} {/foreach} {/if} diff --git a/xml/templates/message_templates/pledge_acknowledge_text.tpl b/xml/templates/message_templates/pledge_acknowledge_text.tpl index 3d8a2f62ef..7123f954ee 100644 --- a/xml/templates/message_templates/pledge_acknowledge_text.tpl +++ b/xml/templates/message_templates/pledge_acknowledge_text.tpl @@ -21,11 +21,11 @@ {/if} {if $payments} -{assign var="count" value="1"} +{assign var="count" value=1} {foreach from=$payments item=payment} {ts 1=$count}Payment %1{/ts}: {$payment.amount|crmMoney:$currency} {if $payment.status eq 1}{ts}paid{/ts} {$payment.receive_date|truncate:10:''|crmDate}{else}{ts}due{/ts} {$payment.due_date|truncate:10:''|crmDate}{/if} -{assign var="count" value=`$count+1`} +{assign var="count" value=$count+1} {/foreach} {/if} -- 2.25.1
{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} + {ts count=$pager->_totalItems plural="%count Results"}%count Result{/ts}{if $selectorLabel} - {$selectorLabel}{/if} {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} @@ -36,7 +36,7 @@
{ts}Select Records{/ts}: - {$form.radio_ts.ts_all.html}   {if $pager->_totalItems > 1} {$form.radio_ts.ts_sel.html} {/if} + {$form.radio_ts.ts_all.html}   {if $pager->_totalItems > 1} {$form.radio_ts.ts_sel.html} {/if}
@@ -74,7 +74,7 @@ {$payment.amount|crmMoney:$currency} {if $payment.status eq 1}{ts}paid{/ts} {$payment.receive_date|truncate:10:''|crmDate}{else}{ts}due{/ts} {$payment.due_date|truncate:10:''|crmDate}{/if}