Smarty backticks fixes, etc
authorlarssandergreen <lars@wildsight.ca>
Sat, 23 Sep 2023 03:11:29 +0000 (21:11 -0600)
committerlarssandergreen <lars@wildsight.ca>
Sat, 23 Sep 2023 03:12:33 +0000 (21:12 -0600)
26 files changed:
templates/CRM/Admin/Form/PaymentProcessor.tpl
templates/CRM/Contact/Form/Search/ResultTasks.tpl
templates/CRM/Contact/Form/Task/Batch.tpl
templates/CRM/Contribute/Form/ContributionPage/Tab.hlp
templates/CRM/Contribute/Page/ContributionPage.hlp
templates/CRM/Custom/Form/Edit/CustomField.tpl
templates/CRM/Custom/Form/Preview.tpl
templates/CRM/Event/Form/Task/Batch.tpl
templates/CRM/Pledge/Form/Pledge.tpl
templates/CRM/Pledge/Form/PledgeView.tpl
templates/CRM/Pledge/Form/Selector.tpl
templates/CRM/Price/Form/PriceSet.tpl
templates/CRM/Profile/Form/Dynamic.tpl
templates/CRM/Profile/Page/Overlay.tpl
templates/CRM/Report/Form/Campaign/SurveyCoverSheet.tpl
templates/CRM/Report/Form/Contact/Detail.tpl
templates/CRM/Report/Form/Layout/Overlay.tpl
templates/CRM/Report/Form/Layout/Table.tpl
templates/CRM/Report/Form/Tabs/FieldSelection.tpl
templates/CRM/Report/Form/Tabs/GroupBy.tpl
templates/CRM/Report/Form/Tabs/ReportOptions.tpl
templates/CRM/UF/Form/Fields.tpl
templates/CRM/common/jcalendar.tpl
templates/CRM/common/searchResultTasks.tpl
xml/templates/message_templates/pledge_acknowledge_html.tpl
xml/templates/message_templates/pledge_acknowledge_text.tpl

index 722f042447c9a17933a405a483efb4205e7acda5..cb79afabc76c995a8b1c1156482449db749473cb 100644 (file)
 <legend>{ts}Processor Details for Live Payments{/ts}</legend>
     <table class="form-layout-compressed">
         <tr class="crm-paymentProcessor-form-block-user_name">
-            <td class="label">{$form.user_name.label}</td><td>{$form.user_name.html} {help id=$ppTypeName|cat:'-live-user-name' title=$form.user_name.label}</td>
+            <td class="label">{$form.user_name.label}</td><td>{$form.user_name.html} {help id="$ppTypeName-live-user-name" title=$form.user_name.label}</td>
         </tr>
 {if !empty($form.password)}
         <tr class="crm-paymentProcessor-form-block-password">
-            <td class="label">{$form.password.label}</td><td>{$form.password.html} {help id=$ppTypeName|cat:'-live-password' title=$form.password.label}</td>
+            <td class="label">{$form.password.label}</td><td>{$form.password.html} {help id="$ppTypeName-live-password" title=$form.password.label}</td>
         </tr>
 {/if}
 {if !empty($form.signature)}
         <tr class="crm-paymentProcessor-form-block-signature">
-            <td class="label">{$form.signature.label}</td><td>{$form.signature.html} {help id=$ppTypeName|cat:'-live-signature' title=$form.signature.label}</td>
+            <td class="label">{$form.signature.label}</td><td>{$form.signature.html} {help id="$ppTypeName-live-signature" title=$form.signature.label}</td>
         </tr>
 {/if}
 {if !empty($form.subject)}
         <tr class="crm-paymentProcessor-form-block-subject">
-            <td class="label">{$form.subject.label}</td><td>{$form.subject.html} {help id=$ppTypeName|cat:'-live-subject' title=$form.subject.label}</td>
+            <td class="label">{$form.subject.label}</td><td>{$form.subject.html} {help id="$ppTypeName-live-subject" title=$form.subject.label}</td>
         </tr>
 {/if}
 {if !empty($form.url_site)}
         <tr class="crm-paymentProcessor-form-block-url_site">
-            <td class="label">{$form.url_site.label}</td><td>{$form.url_site.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-live-url-site' title=$form.url_site.label}</td>
+            <td class="label">{$form.url_site.label}</td><td>{$form.url_site.html|crmAddClass:huge} {help id="$ppTypeName-live-url-site" title=$form.url_site.label}</td>
         </tr>
 {/if}
 {if !empty($form.url_api)}
         <tr class="crm-paymentProcessor-form-block-url_api">
-            <td class="label">{$form.url_api.label}</td><td>{$form.url_api.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-live-url-api' title=$form.url_api.label}</td>
+            <td class="label">{$form.url_api.label}</td><td>{$form.url_api.html|crmAddClass:huge} {help id="$ppTypeName-live-url-api" title=$form.url_api.label}</td>
         </tr>
 {/if}
 {if !empty($form.url_recur)}
         <tr class="crm-paymentProcessor-form-block-url_recur">
-            <td class="label">{$form.url_recur.label}</td><td>{$form.url_recur.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-live-url-recur' title=$form.url_recur.label}</td>
+            <td class="label">{$form.url_recur.label}</td><td>{$form.url_recur.html|crmAddClass:huge} {help id="$ppTypeName-live-url-recur" title=$form.url_recur.label}</td>
         </tr>
 {/if}
 {if !empty($form.url_button)}
         <tr class="crm-paymentProcessor-form-block-url_button">
-            <td class="label">{$form.url_button.label}</td><td>{$form.url_button.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-live-url-button' title=$form.url_button.label}</td>
+            <td class="label">{$form.url_button.label}</td><td>{$form.url_button.html|crmAddClass:huge} {help id="$ppTypeName-live-url-button" title=$form.url_button.label}</td>
         </tr>
 {/if}
     </table>
 <legend>{ts}Processor Details for Test Payments{/ts}</legend>
     <table class="form-layout-compressed">
         <tr class="crm-paymentProcessor-form-block-test_user_name">
-            <td class="label">{$form.test_user_name.label}</td><td>{$form.test_user_name.html} {help id=$ppTypeName|cat:'-test-user-name' title=$form.test_user_name.label}</td></tr>
+            <td class="label">{$form.test_user_name.label}</td><td>{$form.test_user_name.html} {help id="$ppTypeName-test-user-name" title=$form.test_user_name.label}</td></tr>
 {if !empty($form.test_password)}
         <tr class="crm-paymentProcessor-form-block-test_password">
-            <td class="label">{$form.test_password.label}</td><td>{$form.test_password.html} {help id=$ppTypeName|cat:'-test-password' title=$form.test_password.label}</td>
+            <td class="label">{$form.test_password.label}</td><td>{$form.test_password.html} {help id="$ppTypeName-test-password" title=$form.test_password.label}</td>
         </tr>
 {/if}
 {if !empty($form.test_signature)}
         <tr class="crm-paymentProcessor-form-block-test_signature">
-            <td class="label">{$form.test_signature.label}</td><td>{$form.test_signature.html} {help id=$ppTypeName|cat:'-test-signature' title=$form.test_signature.label}</td>
+            <td class="label">{$form.test_signature.label}</td><td>{$form.test_signature.html} {help id="$ppTypeName-test-signature" title=$form.test_signature.label}</td>
         </tr>
 {/if}
 {if !empty($form.test_subject)}
         <tr class="crm-paymentProcessor-form-block-test_subject">
-            <td class="label">{$form.test_subject.label}</td><td>{$form.test_subject.html} {help id=$ppTypeName|cat:'-test-subject' title=$form.test_subject.label}</td>
+            <td class="label">{$form.test_subject.label}</td><td>{$form.test_subject.html} {help id="$ppTypeName-test-subject" title=$form.test_subject.label}</td>
         </tr>
 {/if}
 {if !empty($form.test_url_site)}
         <tr class="crm-paymentProcessor-form-block-test_url_site">
-            <td class="label">{$form.test_url_site.label}</td><td>{$form.test_url_site.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-test-url-site' title=$form.test_url_site.label}</td>
+            <td class="label">{$form.test_url_site.label}</td><td>{$form.test_url_site.html|crmAddClass:huge} {help id="$ppTypeName-test-url-site" title=$form.test_url_site.label}</td>
         </tr>
 {/if}
 {if !empty($form.test_url_api)}
         <tr class="crm-paymentProcessor-form-block-test_url_api">
-            <td class="label">{$form.test_url_api.label}</td><td>{$form.test_url_api.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-test-url-api' title=$form.test_url_api.label}</td>
+            <td class="label">{$form.test_url_api.label}</td><td>{$form.test_url_api.html|crmAddClass:huge} {help id="$ppTypeName-test-url-api" title=$form.test_url_api.label}</td>
         </tr>
 {/if}
 {if !empty($form.test_url_recur)}
         <tr class="crm-paymentProcessor-form-block-test_url_recur">
-            <td class="label">{$form.test_url_recur.label}</td><td>{$form.test_url_recur.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-test-url-recur' title=$form.test_url_recur.label}</td>
+            <td class="label">{$form.test_url_recur.label}</td><td>{$form.test_url_recur.html|crmAddClass:huge} {help id="$ppTypeName-test-url-recur" title=$form.test_url_recur.label}</td>
         </tr>
 {/if}
 {if !empty($form.test_url_button)}
         <tr class="crm-paymentProcessor-form-block-test_url_button">
-            <td class="label">{$form.test_url_button.label}</td><td>{$form.test_url_button.html|crmAddClass:huge} {help id=$ppTypeName|cat:'-test-url-button' title=$form.test_url_button.label}</td>
+            <td class="label">{$form.test_url_button.label}</td><td>{$form.test_url_button.html|crmAddClass:huge} {help id="$ppTypeName-test-url-button" title=$form.test_url_button.label}</td>
         </tr>
 {/if}
 {/if}
index e7a9bab83c91bc2a1de6c21c3efb7e57ef1a7fb1..092e301a22b0e5e9fc835ad42cbd4e59f2bd30f9 100644 (file)
@@ -34,7 +34,7 @@
   <tr>
     <td style="width: 30%;">
         {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}
     </td>
 
     {* Search criteria are passed to tpl in the $qill array *}
@@ -48,7 +48,7 @@
     <td> {ts}Select Records{/ts}:</td>
     <td class="nowrap">
       {assign var="checked" value=$selectedContactIds|@count}
-      {$form.radio_ts.ts_all.html} <label for="{$ts_all_id}">{ts count=$pager->_totalItems plural='All %count records'}The found record{/ts}</label>
+      {$form.radio_ts.ts_all.html} <label for="{$ts_all_id}">{ts count=$pager->_totalItems plural="All %count records"}The found record{/ts}</label>
       {if $pager->_totalItems > 1}
         &nbsp; {$form.radio_ts.ts_sel.html} <label for="{$ts_sel_id}">{ts 1="<span>$checked</span>"}%1 Selected records only{/ts}</label>
       {/if}
index 166630a4dba50e8747e25d19879436c7c708e484..316ee28dada7af528029aef7ed3282bcef779a60 100644 (file)
@@ -38,7 +38,7 @@
       {assign var=n value=$field.name}
       {if $field.options_per_line}
         <td class="compressed">
-          {assign var="count" value="1"}
+          {assign var="count" value=1}
           {strip}
             <table class="form-layout-compressed">
             <tr>
@@ -50,9 +50,9 @@
                   {if $count == $field.options_per_line}
                   </tr>
                   <tr>
-                    {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}
index 74944271f70cb85aaacfebba1dbc6834f2e18205..0ad6f249cac2dfd7eb7c5f57bbef013a2d1abba3 100644 (file)
 {htxt id="id-configure-contrib-pages"}
 <table>
 <tr>
-    <td><a href="{crmURL p='civicrm/admin/contribute/settings' q="reset=1&action=update&id=`$contributionPageID`"}" id="idContribPageSettings"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Title and Settings{/ts}</a></td>
+    <td><a href="{crmURL p="civicrm/admin/contribute/settings" q="reset=1&action=update&id=`$contributionPageID`"}" id="idContribPageSettings"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Title and Settings{/ts}</a></td>
     <td>{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}</td>
 </tr>
 <tr>
-    <td><a href="{crmURL p='civicrm/admin/contribute/amount' q="reset=1&action=update&id=`$contributionPageID`"}" id="idAmount"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Amount{/ts}</a></td>
+    <td><a href="{crmURL p="civicrm/admin/contribute/amount" q="reset=1&action=update&id=`$contributionPageID`"}" id="idAmount"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Amount{/ts}</a></td>
     <td>{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}</td>
 </tr>
 <tr>
-    <td><a href="{crmURL p='civicrm/admin/contribute/membership' q="reset=1&action=update&id=`$contributionPageID`"}" id="idMembership"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Memberships{/ts}</a></td>
+    <td><a href="{crmURL p="civicrm/admin/contribute/membership" q="reset=1&action=update&id=`$contributionPageID`"}" id="idMembership"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Memberships{/ts}</a></td>
      <td>{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}</td>
 </tr>
 <tr>
-    <td><a href="{crmURL p='civicrm/admin/contribute/thankYou' q="reset=1&action=update&id=`$contributionPageID`"}" id="idThanks"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Thank-you and Receipting{/ts}</a></td>
+    <td><a href="{crmURL p="civicrm/admin/contribute/thankYou" q="reset=1&action=update&id=`$contributionPageID`"}" id="idThanks"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Thank-you and Receipting{/ts}</a></td>
     <td>{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}</td>
 </tr>
 <tr>
-    <td><a href="{crmURL p='civicrm/admin/contribute/friend' q="reset=1&action=update&id=`$contributionPageID`"}" id="idFriend"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Tell a Friend{/ts}</a></td>
+    <td><a href="{crmURL p="civicrm/admin/contribute/friend" q="reset=1&action=update&id=`$contributionPageID`"}" id="idFriend"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Tell a Friend{/ts}</a></td>
     <td>{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}</td>
 </tr>
 <tr>
-   <td><a href="{crmURL p='civicrm/admin/contribute/custom' q="reset=1&action=update&id=`$contributionPageID`"}" id="idCustom"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Include Profiles{/ts}</a></td>
+   <td><a href="{crmURL p="civicrm/admin/contribute/custom" q="reset=1&action=update&id=`$contributionPageID`"}" id="idCustom"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Include Profiles{/ts}</a></td>
     <td>{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}<br />
 {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 <a href="%1"><strong>Administer CiviCRM Profiles</strong></a> 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}</td>
 </tr>
 <tr>
-   <td><a href="{crmURL p='civicrm/admin/contribute/premium q="reset=1&action=update&id=`$contributionPageID`"}" id="idPremium"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Premiums{/ts}</a></td>
+   <td><a href="{crmURL p="civicrm/admin/contribute/premium" q="reset=1&action=update&id=`$contributionPageID`"}" id="idPremium"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Premiums{/ts}</a></td>
     <td>{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}</td>
 </tr>
 <tr>
-   <td><a href="{crmURL p='civicrm/admin/contribute/widget' q="reset=1&action=update&id=`$contributionPageID`"}" id="idWidget"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Widget{/ts}</a></td>
+   <td><a href="{crmURL p="civicrm/admin/contribute/widget" q="reset=1&action=update&id=`$contributionPageID`"}" id="idWidget"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Widget{/ts}</a></td>
    <td>{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}</td>
 </tr>
 <tr>
-  <td><a href="{crmURL p='civicrm/admin/contribute/pcp' q="reset=1&action=update&id=`$contributionPageID`"}" id="idPCP"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Personal Campaign Pages{/ts}</a></td>
+  <td><a href="{crmURL p="civicrm/admin/contribute/pcp" q="reset=1&action=update&id=`$contributionPageID`"}" id="idPCP"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Personal Campaign Pages{/ts}</a></td>
   <td>{ts}Allow constituents to create their own personal fundraising pages linked to this contribution page.{/ts}</td>
 </tr>
 <tr>
-  <td><a href="{crmURL p='civicrm/contribute/transact' q="reset=1&action=preview&id=`$contributionPageID`"}" id="idTest"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Online Contribution{/ts}</a><br /> ({ts}Test-drive{/ts})</td>
+  <td><a href="{crmURL p="civicrm/contribute/transact" q="reset=1&action=preview&id=`$contributionPageID`"}" id="idTest"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Online Contribution{/ts}</a><br /> ({ts}Test-drive{/ts})</td>
   <td>{ts}Test-drive the entire contribution process&mdash;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}</td>
 </tr>
 <tr>
-  <td><a href="{crmURL p='civicrm/contribute/transact' q="reset=1&id=`$contributionPageID`"}" id="idLive"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Online Contribution{/ts}</a><br /> ({ts}Live{/ts})</td>
+  <td><a href="{crmURL p="civicrm/contribute/transact" q="reset=1&id=`$contributionPageID`"}" id="idLive"><i class="crm-i fa-chevron-right" aria-hidden="true"></i> {ts}Online Contribution{/ts}</a><br /> ({ts}Live{/ts})</td>
   <td>{ts}Review your customized <strong>LIVE</strong> online contribution page here. Use the following URL in links and buttons on any website to send visitors to this live page:{/ts}<br />
       <strong>{crmURL a=1 fe=1 p="civicrm/contribute/transact" q="reset=1&id=`$contributionPageID`"}</strong></td>
 </tr>
index cb6bbf591934f6dd5de0ea244b9055827a35fb77..3c58bfb6da35f9655684bd5ba097d65a5050568e 100644 (file)
@@ -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}
     <p>{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}</p>
     {ts}For existing pages{/ts}:
     <ul class="indented">
index 5a90fb207a6d9fd95f874e3606d96cb32f5fbf55..10f26599153d1c6e833eaa7e3946db3bc74d7eb6 100644 (file)
   <tr class="custom_field-row {$element.element_name}-row">
     <td class="label">{$formElement.label}{if $element.help_post}{help id=$element.id file="CRM/Custom/Form/CustomField.hlp" title=$element.label}{/if}</td>
     <td class="html-adjust">
-      {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}
             <br />
-            {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. *}
index 592b916ea9c9ec4bc39704655de1f459c8dc426b..1300856f4bc692ce208516fcfa8cbd9ef4ad391d 100644 (file)
             <tr><td class="label"></td><td class="description">{$element.help_pre}</td></tr>
         {/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}
         <tr>
          <td class="label">{$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}</td>
          <td>
-            {assign var="count" value="1"}
+            {assign var="count" value=1}
                 <table class="form-layout-compressed">
                  <tr>
                    {* sort by fails for option per line. Added a variable to iterate through the element array*}
                      {if is_array($item) && array_key_exists('html', $item)}
                           <td class="labels font-light">{$form.$element_name.$key.html}</td>
                               {if $count == $element.options_per_line}
-                                {assign var="count" value="1"}
+                                {assign var="count" value=1}
                            </tr>
                             {else}
-                                {assign var="count" value=`$count+1`}
+                                {assign var="count" value=$count+1}
                             {/if}
                          {/if}
                     {/foreach}
index 8cbab09496bdd01a99432a377ad05c2be22f8c54..feafec5e88941aaa261f74bb9be59d6baff729f0 100644 (file)
@@ -57,7 +57,7 @@
                 {* CRM-19860 Copied from templates/CRM/Contact/Form/Task/Batch.tpl *}
                 {if $field.options_per_line}
                   <td class="compressed">
-                    {assign var="count" value="1"}
+                    {assign var="count" value=1}
                     {strip}
                       <table class="form-layout-compressed">
                       <tr>
@@ -69,9 +69,9 @@
                             {if $count == $field.options_per_line}
                             </tr>
                             <tr>
-                              {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}
index 3abc2466b742b64f906d4f627239fb4d202c7f1f..a14814bf56ebb2f296b702398071fde781378d69 100644 (file)
@@ -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}
 <div class="crm-block crm-form-block crm-pledge-form-block">
index bc9e1aa6b840f5066c06ab14a8a2b29c56a05dbd..534808d2e1bec536516929a78eba4e7e966d7ab1 100644 (file)
@@ -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}
 
 <div class="crm-block crm-content-block crm-pledge-view-block">
index dfc16b8d6549257cfddc573f9b56056e0175f7a6..00c7ea84a80a50278bf2ccc4ad54f86e5c8ebe66 100644 (file)
@@ -49,7 +49,7 @@
             {/if}
             <td class="right">{$row.pledge_amount|crmMoney:$row.pledge_currency}</td>
             <td class="right">{$row.pledge_total_paid|crmMoney:$row.pledge_currency}</td>
-            <td class="right">{$row.pledge_amount-$row.pledge_total_paid|crmMoney:$row.pledge_currency}</td>
+            <td class="right">{($row.pledge_amount-$row.pledge_total_paid)|crmMoney:$row.pledge_currency}</td>
             <td>{$row.pledge_financial_type}</td>
             <td>{$row.pledge_create_date|truncate:10:''|crmDate}</td>
             <td>{$row.pledge_next_pay_date|truncate:10:''|crmDate}</td>
index 8410ba5b4f0cee5d8c4bd40b2deca8fce0744955..67c1e9be22078a9859e3220f18f66505b39fd5ee 100644 (file)
             {if $element.help_pre}<span class="content description">{$element.help_pre}</span><br />{/if}
             <div class="crm-section {$element.name}-section crm-price-field-id-{$field_id}">
             {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`"}
               <div class="label">{$form.$element_name.label}</div>
               <div class="content {$element.name}-content">
                 {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}
                       <div class="price-set-row {$element.name}-row{$rowCount}">
                     {/if}
                     <span class="price-set-option-content">{$form.$element_name.$key.html}</span>
@@ -68,7 +68,7 @@
                     <span class="price-field-amount{if $form.$element_name.frozen EQ 1} sold-out-option{/if}">
                     {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'}
index 61bb25deee26779db787ca6c90670020e5650c71..f721add52d401909164904af7d7e5ac6d301f98d 100644 (file)
@@ -98,7 +98,7 @@
           <div class="crm-section editrow_{$n}-section form-item" id="editrow-{$n}">
             <div class="label">{$form.$n.label}</div>
             <div class="content edit-value">
-              {assign var="count" value="1"}
+              {assign var="count" value=1}
               {strip}
                 <table class="form-layout-compressed">
                 <tr>
                       {if $count == $field.options_per_line}
                       </tr>
                       <tr>
-                        {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}
             </div>
             <div class="edit-value content">
               {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}&nbsp;
               {/if}
               {if $n eq 'email_greeting' or  $n eq 'postal_greeting' or $n eq 'addressee'}
index 4683435b7acfe438dea469046a12455de3f2bf73..79e1f7963fc41668a9e835e50d2b2c55117313f1 100644 (file)
@@ -14,7 +14,7 @@
   </tr>
   <tr>
     <td>
-      {assign var="count" value="0"}
+      {assign var="count" value=0}
       {assign var="totalRows" value=$row|@count}
       <div class="crm-summary-col-0">
     {foreach from=$profileFields item=field key=rowName}
@@ -23,7 +23,7 @@
     </td>
     <td>
       <div class="crm-summary-col-1">
-        {assign var="count" value="1"}
+        {assign var="count" value=1}
         {/if}
       <div class="crm-section {$rowName}-section">
         <div class="label">
@@ -34,7 +34,7 @@
         </div>
         <div class="clear"></div>
       </div>
-      {assign var="count" value=`$count+1`}
+      {assign var="count" value=$count+1}
     {/foreach}
       </div>
     </td>
index 904735eae34c974d5c5cf81daf04799685c05e19..4d6dcf78c594170d2ca0c57d67ed874b2a1617ea 100644 (file)
@@ -66,7 +66,7 @@
    {* clean separation of each response question *}
    <tr><td><br /></td></tr>
 
-     {assign var=resFldCnt value=`$resFldCnt+1`}
+     {assign var=resFldCnt value=$resFldCnt+1}
      {/foreach}
 
 </table>
index 8b4e9a119b11adba8f3b2fd099bb8c0eb5654376..f7f7aca99fadeff9b9631a141e6f93b8a50e39d0 100644 (file)
                                         {if $header.colspan}
                                             <th colspan={$header.colspan}>{$header.title}</th>
                                             {assign var=skip value=true}
-                                            {assign var=skipCount value=`$header.colspan`}
+                                            {assign var=skipCount value=$header.colspan}
                                             {assign var=skipMade  value=1}
                                         {else}
                                             <th>{$header.title}</th>
                                             {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}
index 39e94e4472b5f6e8ebde04053a59122daf68d3c0..c698a1ef37137daedcabb132930e1e1f53872b6f 100644 (file)
                    {if $header.colspan}
                       <td colspan={$header.colspan}>{$header.title}</td>
                       {assign var=skip value=true}
-                      {assign var=skipCount value=`$header.colspan`}
+                      {assign var=skipCount value=$header.colspan}
                       {assign var=skipMade  value=1}
                    {else}
                       <td>{$header.title}</td>
                        {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}
index afbb74d3721e36e4f6b01caf8fca0fc994ff9910..d27ff1f48e37732464c22ec4d3baed0f975a69de 100644 (file)
                    {if $header.colspan}
                        <th colspan={$header.colspan}>{$header.title|escape}</th>
                       {assign var=skip value=true}
-                      {assign var=skipCount value=`$header.colspan`}
+                      {assign var=skipCount value=$header.colspan}
                       {assign var=skipMade  value=1}
                    {else}
                        <th {$class}>{$header.title|escape}</th>
                    {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}
index 48af99e39eb5773cd6af09e330aee6eae50e8843..339f51cb5d8299c9440f6b4ebf6bb10bb7890ae9 100644 (file)
@@ -10,7 +10,7 @@
 
   <div id="report-tab-col-groups" class="civireport-criteria">
     {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)}
         <div class="crm-accordion-wrapper crm-accordion collapsed">
@@ -22,7 +22,7 @@
       <table class="criteria-group">
         <tr class="crm-report crm-report-criteria-field crm-report-criteria-field-{$dnc}">
           {foreach from=$grpFields.fields item=title key=field}
-          {assign var="count" value=`$count+1`}
+          {assign var="count" value=$count+1}
           <td width="25%">{$form.fields.$field.html}</td>
           {if $count is div by 4}
         </tr><tr class="crm-report crm-report-criteria-field crm-report-criteria-field_{$dnc}">
index 4e5a7e2d1ef197c0ea6d9a70a4d755eaa475a8f2..f24158777e76c471811e3da90d52c024a1b814c2 100644 (file)
@@ -8,11 +8,11 @@
  +--------------------------------------------------------------------+
 *}
   <div id="report-tab-group-by-elements" class="civireport-criteria">
-    {assign  var="count" value="0"}
+    {assign  var="count" value=0}
     <table class="report-layout">
       <tr class="crm-report crm-report-criteria-groupby">
         {foreach from=$groupByElements item=gbElem key=dnc}
-        {assign var="count" value=`$count+1`}
+        {assign var="count" value=$count+1}
         <td width="25%">
           {$form.group_bys[$gbElem].html}
           {if $form.group_bys_freq && array_key_exists($gbElem, $form.group_bys_freq)}:<br>
index 4306302292b6d173a21473e93dbf12b95f57a9c5..74426b61d30ff005a983958e855109ba20bda0bb 100644 (file)
@@ -14,7 +14,7 @@
       <tr class="crm-report crm-report-criteria-field">
         {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}
           <td>{if $form.$optionName.label}{$form.$optionName.label}&nbsp;{/if}{$form.$optionName.html}</td>
           {if $optionCount is div by 2}
         </tr><tr class="crm-report crm-report-criteria-field">
index 05a85e67009a5d870b5001ed499e73d5eda4f3b3..091af731bb675df63355c25bf6fbad75f741c0db 100644 (file)
@@ -52,7 +52,7 @@
         <div class="label option-label">{$formElement.label}</div>
         <div class="content 3">
 
-          {assign var="count" value="1"}
+          {assign var="count" value=1}
           {strip}
             <table class="form-layout-compressed">
               <tr>
@@ -64,9 +64,9 @@
                 {if $count == $field.options_per_line}
               </tr>
               <tr>
-                {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}
index e5c2b07cca655508ad3c50b5674e925cd6d79f79..d3044553d212c2f22abf75cf79f5a113849a8826 100644 (file)
@@ -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}
       &nbsp;&nbsp;{$form.$blockSection.$blockId.$tElement.label}
       &nbsp;&nbsp;{$form.$blockSection.$blockId.$tElement.html|crmAddClass:six}
index 968fed3c6edf1644f4e5ca44249902db66b691f7..d9810d133c4e9ea1534f85d620354354f1551ae1 100644 (file)
@@ -14,7 +14,7 @@
   <tr>
     <td style="width: 40%;">
     {if !empty($savedSearch.name)}{$savedSearch.name} ({ts}smart group{/ts}) - {/if}
-    {ts count=$pager->_totalItems plural='%count Results'}%count Result{/ts}{if $selectorLabel}&nbsp;-&nbsp;{$selectorLabel}{/if}
+    {ts count=$pager->_totalItems plural="%count Results"}%count Result{/ts}{if $selectorLabel}&nbsp;-&nbsp;{$selectorLabel}{/if}
     {if $context == 'Event' && $participantCount && ($pager->_totalItems ne $participantCount)}
         <br />{ts}Actual participant count{/ts} : {$participantCount} {help id="id-actual_participant_count" file="CRM/Event/Form/Search/Results.hlp"} &nbsp;
     {/if}
@@ -36,7 +36,7 @@
   <tr>
     <td>{ts}Select Records{/ts}:</td>
     <td class="nowrap">
-      {$form.radio_ts.ts_all.html} <label for="{$ts_all_id}">{ts count=$pager->_totalItems plural='All %count records'}The found record{/ts}</label> &nbsp; {if $pager->_totalItems > 1} {$form.radio_ts.ts_sel.html} <label for="{$ts_sel_id}">{ts 1="<span></span>"}%1 Selected records only{/ts}</label>{/if}
+      {$form.radio_ts.ts_all.html} <label for="{$ts_all_id}">{ts count=$pager->_totalItems plural="All %count records"}The found record{/ts}</label> &nbsp; {if $pager->_totalItems > 1} {$form.radio_ts.ts_sel.html} <label for="{$ts_sel_id}">{ts 1="<span></span>"}%1 Selected records only{/ts}</label>{/if}
     </td>
   </tr>
   <tr>
index d55741e5bf364807f93f414f1fe659fc5a08fd83..6a172f6326b0a454dd614d6f0d8290e595e6e7c5 100644 (file)
@@ -64,7 +64,7 @@
      </tr>
 
      {if $payments}
-      {assign var="count" value="1"}
+      {assign var="count" value=1}
       {foreach from=$payments item=payment}
        <tr>
         <td {$labelStyle}>
@@ -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}
         </td>
        </tr>
-       {assign var="count" value=`$count+1`}
+       {assign var="count" value=$count+1}
       {/foreach}
      {/if}
 
index 3d8a2f62efbee91a32d1f9095d03c0b673bd79c3..7123f954ee7b76e49d9693122f98f2351e88879d 100644 (file)
 {/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}