diff --git a/templates/CRM/Activity/Import/Form/Preview.tpl b/templates/CRM/Activity/Import/Form/Preview.tpl index c71111ef8177..007f3d4f166b 100644 --- a/templates/CRM/Activity/Import/Form/Preview.tpl +++ b/templates/CRM/Activity/Import/Form/Preview.tpl @@ -54,13 +54,13 @@ {include file="CRM/common/importProgress.tpl"} {* Summary Preview (record counts) *} - + {if $invalidRowCount} - + + {/if} - + diff --git a/templates/CRM/Activity/Import/Form/Summary.tpl b/templates/CRM/Activity/Import/Form/Summary.tpl index 614ef3a1f5eb..b6f7afb0dce4 100644 --- a/templates/CRM/Activity/Import/Form/Summary.tpl +++ b/templates/CRM/Activity/Import/Form/Summary.tpl @@ -74,13 +74,13 @@
{include file="CRM/common/formButtons.tpl" location="top"}
{* Summary of Import Results (record counts) *}
{ts}Total Rows{/ts}
{ts}Total Rows{/ts} {$totalRowCount} {ts}Total rows (activity records) in uploaded file.{/ts}
{ts}Rows with Errors{/ts}
{ts}Rows with Errors{/ts} {$invalidRowCount} {ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts} {if $invalidRowCount} @@ -71,7 +71,7 @@ {/if} {if $conflictRowCount} -
{ts}Conflicting Rows{/ts}
{ts}Conflicting Rows{/ts} {$conflictRowCount} {ts}Rows with conflicting transaction ids within this file. These rows will be skipped (not imported).{/ts} {if $conflictRowCount} @@ -81,7 +81,7 @@
{ts}Valid Rows{/ts}
{ts}Valid Rows{/ts} {$validRowCount} {ts}Total rows to be imported.{/ts}
- + {if $invalidRowCount } - + + + + {/if} - + diff --git a/templates/CRM/Contact/Import/Form/Preview.tpl b/templates/CRM/Contact/Import/Form/Preview.tpl index a2ab5af0186b..4f4a5a9ee116 100644 --- a/templates/CRM/Contact/Import/Form/Preview.tpl +++ b/templates/CRM/Contact/Import/Form/Preview.tpl @@ -54,13 +54,13 @@
{* Summary Preview (record counts) *}
{ts}Total Rows{/ts}
{ts}Total Rows{/ts} {$totalRowCount} {ts}Total rows (activity records) in uploaded file.{/ts}
{ts}Invalid Rows (skipped){/ts}
{ts}Invalid Rows (skipped){/ts} {$invalidRowCount} {ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts} {if $invalidRowCount} @@ -91,7 +91,7 @@ {/if} {if $unMatchCount } -
{ts}Mismatched Rows (skipped){/ts}
{ts}Mismatched Rows (skipped){/ts} {$unMatchCount} {ts}Rows with mismatched activity IDs (NOT updated).{/ts} {if $unMatchCount} @@ -102,7 +102,7 @@ {/if} {if $conflictRowCount} -
{ts}Conflicting Rows (skipped){/ts}
{ts}Conflicting Rows (skipped){/ts} {$conflictRowCount} {ts}Rows with conflicting transaction IDs (NOT imported).{/ts} {if $conflictRowCount} @@ -113,7 +113,7 @@ {/if} {if $duplicateRowCount} -
{ts}Duplicate Rows{/ts}
{ts}Duplicate Rows{/ts} {$duplicateRowCount} {ts}Rows which are duplicates of existing CiviCRM activity records.{/ts} {$dupeActionString} {if $duplicateRowCount} @@ -123,7 +123,7 @@
{ts}Records Imported{/ts}
{ts}Records Imported{/ts} {$validRowCount} {ts}Rows imported successfully.{/ts}
- + {if $invalidRowCount} - + + - + diff --git a/templates/CRM/Contact/Import/Form/Summary.tpl b/templates/CRM/Contact/Import/Form/Summary.tpl index 503dd3c8b530..6ac1b035548b 100644 --- a/templates/CRM/Contact/Import/Form/Summary.tpl +++ b/templates/CRM/Contact/Import/Form/Summary.tpl @@ -81,13 +81,13 @@
{include file="CRM/common/formButtons.tpl" location="top"}
{* Summary of Import Results (record counts) *}
{ts}Total Rows{/ts}
{ts}Total Rows{/ts} {$totalRowCount} {ts}Total number of rows in the imported data.{/ts}
{ts}Rows with Errors{/ts}
{ts}Rows with Errors{/ts} {$invalidRowCount} {ts}Rows with invalid data in one or more fields (for example, invalid email address formatting). These rows will be skipped (not imported).{/ts} {if $invalidRowCount} @@ -71,7 +71,7 @@ {/if} {if $conflictRowCount} -
{ts}Conflicting Rows{/ts}
{ts}Conflicting Rows{/ts} {$conflictRowCount} {ts}Rows with conflicting email addresses within this file. These rows will be skipped (not imported).{/ts} {if $conflictRowCount} @@ -82,7 +82,7 @@ {/if}
{ts}Valid Rows{/ts}{ts}Valid Rows{/ts} {$validRowCount} {ts}Total rows to be imported.{/ts}
- + {if $invalidRowCount } - + + + + {/if} - + {if $groupAdditions} - + +
{ts}Total Rows{/ts}
{ts}Total Rows{/ts} {$totalRowCount} {ts}Total number of rows in the imported data.{/ts}
{ts}Invalid Rows (skipped){/ts}
{ts}Invalid Rows (skipped){/ts} {$invalidRowCount} {ts}Rows with invalid data in one or more fields (for example, invalid email address formatting). These rows will be skipped (not imported).{/ts} {if $invalidRowCount} @@ -98,7 +98,7 @@ {/if} {if $unMatchCount } -
{ts}Mismatched Rows (skipped){/ts}
{ts}Mismatched Rows (skipped){/ts} {$unMatchCount} {ts}Rows with mismatched contact IDs... (NOT updated).{/ts} {if $unMatchCount} @@ -109,7 +109,7 @@ {/if} {if $conflictRowCount} -
{ts}Conflicting Rows (skipped){/ts}
{ts}Conflicting Rows (skipped){/ts} {$conflictRowCount} {ts}Rows with conflicting email addresses (NOT imported).{/ts} {if $conflictRowCount} @@ -120,7 +120,7 @@ {/if} {if $duplicateRowCount && $dupeError} -
{ts}Duplicate Rows{/ts}
{ts}Duplicate Rows{/ts} {$duplicateRowCount} {ts}Rows which are duplicates of existing CiviCRM contact records.{/ts} {$dupeActionString} {if $duplicateRowCount} @@ -130,13 +130,13 @@
{ts}Total Contacts{/ts}
{ts}Total Contacts{/ts} {$validRowCount} {ts}Total number of contact records created or modified during the import.{/ts}
{ts}Import to Groups{/ts}
{ts}Import to Groups{/ts} {foreach from="$groupAdditions" item="group"} : @@ -152,7 +152,7 @@ {/if} {if $tagAdditions} -
{ts}Tagged Imported Contacts{/ts}
{ts}Tagged Imported Contacts{/ts} {foreach from="$tagAdditions" item="tag"} : diff --git a/templates/CRM/Contribute/Import/Form/Preview.tpl b/templates/CRM/Contribute/Import/Form/Preview.tpl index a7b12ca87ffc..ba4f6f597c75 100644 --- a/templates/CRM/Contribute/Import/Form/Preview.tpl +++ b/templates/CRM/Contribute/Import/Form/Preview.tpl @@ -53,13 +53,13 @@ {include file="CRM/common/importProgress.tpl"} {* Summary Preview (record counts) *} - + {if $invalidRowCount} - + + {/if} - + diff --git a/templates/CRM/Contribute/Import/Form/Summary.tpl b/templates/CRM/Contribute/Import/Form/Summary.tpl index 869f42b6cff2..53f71b29f42c 100644 --- a/templates/CRM/Contribute/Import/Form/Summary.tpl +++ b/templates/CRM/Contribute/Import/Form/Summary.tpl @@ -73,13 +73,13 @@
{include file="CRM/common/formButtons.tpl" location="top"}
{* Summary of Import Results (record counts) *}
{ts}Total Rows{/ts}
{ts}Total Rows{/ts} {$totalRowCount} {ts}Total rows (contribution records) in uploaded file.{/ts}
{ts}Rows with Errors{/ts}
{ts}Rows with Errors{/ts} {$invalidRowCount} {ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts} {if $invalidRowCount} @@ -70,7 +70,7 @@ {/if} {if $conflictRowCount} -
{ts}Conflicting Rows{/ts}
{ts}Conflicting Rows{/ts} {$conflictRowCount} {ts}Rows with conflicting transaction ids within this file. These rows will be skipped (not imported).{/ts} {if $conflictRowCount} @@ -80,7 +80,7 @@
{ts}Valid Rows{/ts}
{ts}Valid Rows{/ts} {$validRowCount} {ts}Total rows to be imported.{/ts}
- + {if $invalidRowCount } - + + {/if} {if $invalidSoftCreditRowCount } - + + {/if} {if $invalidPledgePaymentRowCount } - + {/if} {if $unMatchCount } - + + + {/if} - + diff --git a/templates/CRM/Event/Import/Form/Preview.tpl b/templates/CRM/Event/Import/Form/Preview.tpl index 2eee02b10dca..703a9cce6242 100644 --- a/templates/CRM/Event/Import/Form/Preview.tpl +++ b/templates/CRM/Event/Import/Form/Preview.tpl @@ -56,13 +56,13 @@ {* Summary Preview (record counts) *}
{ts}Total Rows{/ts}
{ts}Total Rows{/ts} {$totalRowCount} {ts}Total rows (contribution records) in uploaded file.{/ts}
{ts}Invalid Rows (skipped){/ts}
{ts}Invalid Rows (skipped){/ts} {$invalidRowCount} {ts}Rows with invalid data in one or more fields. These rows have been skipped (not imported).{/ts} {if $invalidRowCount} @@ -90,14 +90,14 @@ {/if} {if $validSoftCreditRowCount } -
{ts}Soft Credits{/ts}
{ts}Soft Credits{/ts} {$validSoftCreditRowCount} {ts}Rows where a soft credit was successfully assigned to a contact.{/ts}
{ts}Unmatched Soft Credit Rows (skipped){/ts}
{ts}Unmatched Soft Credit Rows (skipped){/ts} {$invalidSoftCreditRowCount} {ts}Rows with a requested soft credit assignment where no matching contact was found (based on the supplied soft credit contact data). These contribution rows have been skipped (not imported).{/ts} {if $invalidSoftCreditRowCount} @@ -108,14 +108,14 @@ {/if} {if $validPledgePaymentRowCount } -
{ts}Pledge Payments Applied{/ts}
{ts}Pledge Payments Applied{/ts} {$validPledgePaymentRowCount} {ts}Rows with a pledge payment successfully applied.{/ts}
{ts}Invalid Pledge Payment Rows (skipped){/ts}
{ts}Invalid Pledge Payment Rows (skipped){/ts} {$invalidPledgePaymentRowCount} {ts}Rows marked as pledge payments where the contributor and / or contribution amount could not be matched to a pending pledge payment. These contribution rows have been skipped (not imported).{/ts} {if $invalidPledgePaymentRowCount} @@ -125,7 +125,7 @@
{ts}Mismatched Rows (skipped){/ts}
{ts}Mismatched Rows (skipped){/ts} {$unMatchCount} {ts}Rows with mismatched contribution IDs... (NOT updated).{/ts} {if $unMatchCount} @@ -136,7 +136,7 @@ {/if} {if $conflictRowCount} -
{ts}Conflicting Rows (skipped){/ts}
{ts}Conflicting Rows (skipped){/ts} {$conflictRowCount} {ts}Rows with conflicting transaction IDs (NOT imported).{/ts} {if $conflictRowCount} @@ -147,7 +147,7 @@ {/if} {if $duplicateRowCount} -
{ts}Duplicate Rows{/ts}
{ts}Duplicate Rows{/ts} {$duplicateRowCount} {ts}Rows which are duplicates of existing CiviCRM contribution records.{/ts} {$dupeActionString} {if $duplicateRowCount} @@ -157,7 +157,7 @@
{ts}Records Imported{/ts}
{ts}Records Imported{/ts} {$validRowCount} {ts}Total number of rows imported successfully.{/ts}
- + {if $invalidRowCount} - + + {/if} - + diff --git a/templates/CRM/Event/Import/Form/Summary.tpl b/templates/CRM/Event/Import/Form/Summary.tpl index c8e13e3829f3..95b53db619b8 100644 --- a/templates/CRM/Event/Import/Form/Summary.tpl +++ b/templates/CRM/Event/Import/Form/Summary.tpl @@ -78,13 +78,13 @@ {* Summary of Import Results (record counts) *}
{ts}Total Rows{/ts}
{ts}Total Rows{/ts} {$totalRowCount} {ts}Total rows (participant records) in uploaded file.{/ts}
{ts}Rows with Errors{/ts}
{ts}Rows with Errors{/ts} {$invalidRowCount} {ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts} {if $invalidRowCount} @@ -73,7 +73,7 @@ {/if} {if $conflictRowCount} -
{ts}Conflicting Rows{/ts}
{ts}Conflicting Rows{/ts} {$conflictRowCount} {ts}Rows with conflicting participant IDs within this file. These rows will be skipped (not imported).{/ts} {if $conflictRowCount} @@ -83,7 +83,7 @@
{ts}Valid Rows{/ts}
{ts}Valid Rows{/ts} {$validRowCount} {ts}Total rows to be imported.{/ts}
- + {if $invalidRowCount } - + + + + {/if} - + diff --git a/templates/CRM/Member/Import/Form/Preview.tpl b/templates/CRM/Member/Import/Form/Preview.tpl index 9e357cc78bee..b6cc26c9da8d 100644 --- a/templates/CRM/Member/Import/Form/Preview.tpl +++ b/templates/CRM/Member/Import/Form/Preview.tpl @@ -54,13 +54,13 @@ {include file="CRM/common/importProgress.tpl"} {* Summary Preview (record counts) *}
{ts}Total Rows{/ts}
{ts}Total Rows{/ts} {$totalRowCount} {ts}Total rows (participant records) in uploaded file.{/ts}
{ts}Invalid Rows (skipped){/ts}
{ts}Invalid Rows (skipped){/ts} {$invalidRowCount} {ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts} {if $invalidRowCount} @@ -95,7 +95,7 @@ {/if} {if $unMatchCount } -
{ts}Mismatched Rows (skipped){/ts}
{ts}Mismatched Rows (skipped){/ts} {$unMatchCount} {ts}Rows with mismatched participant IDs... (NOT updated).{/ts} {if $unMatchCount} @@ -106,7 +106,7 @@ {/if} {if $conflictRowCount} -
{ts}Conflicting Rows (skipped){/ts}
{ts}Conflicting Rows (skipped){/ts} {$conflictRowCount} {ts}Rows with conflicting participant IDs (NOT imported).{/ts} {if $conflictRowCount} @@ -117,7 +117,7 @@ {/if} {if $duplicateRowCount} -
{ts}Duplicate Rows{/ts}
{ts}Duplicate Rows{/ts} {$duplicateRowCount} {ts}Rows which are duplicates of existing CiviCRM participant records.{/ts} {$dupeActionString} {if $duplicateRowCount} @@ -127,7 +127,7 @@
{ts}Records Imported{/ts}
{ts}Records Imported{/ts} {$validRowCount} {ts}Rows imported successfully.{/ts}
- + {if $invalidRowCount} - + + {/if} - + diff --git a/templates/CRM/Member/Import/Form/Summary.tpl b/templates/CRM/Member/Import/Form/Summary.tpl index 559587edefb1..32aa8e7a262c 100644 --- a/templates/CRM/Member/Import/Form/Summary.tpl +++ b/templates/CRM/Member/Import/Form/Summary.tpl @@ -74,13 +74,13 @@
{include file="CRM/common/formButtons.tpl" location="top"}
{* Summary of Import Results (record counts) *}
{ts}Total Rows{/ts}
{ts}Total Rows{/ts} {$totalRowCount} {ts}Total rows (membership records) in uploaded file.{/ts}
{ts}Rows with Errors{/ts}
{ts}Rows with Errors{/ts} {$invalidRowCount} {ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts} {if $invalidRowCount} @@ -71,7 +71,7 @@ {/if} {if $conflictRowCount} -
{ts}Conflicting Rows{/ts}
{ts}Conflicting Rows{/ts} {$conflictRowCount} {ts}Rows with conflicting transaction ids within this file. These rows will be skipped (not imported).{/ts} {if $conflictRowCount} @@ -81,7 +81,7 @@
{ts}Valid Rows{/ts}
{ts}Valid Rows{/ts} {$validRowCount} {ts}Total rows to be imported.{/ts}
- + {if $invalidRowCount } - + + + + {/if} - + diff --git a/templates/CRM/Member/Page/DashBoard.tpl b/templates/CRM/Member/Page/DashBoard.tpl index 093efdb77206..3b56964fe309 100644 --- a/templates/CRM/Member/Page/DashBoard.tpl +++ b/templates/CRM/Member/Page/DashBoard.tpl @@ -61,15 +61,15 @@ {if $preMonth} - - - {/if} - - - - - - - {if $preMonth} - - - {/if} - - - - - - -
{ts}Total Rows{/ts}
{ts}Total Rows{/ts} {$totalRowCount} {ts}Total rows (membership records) in uploaded file.{/ts}
{ts}Invalid Rows (skipped){/ts}
{ts}Invalid Rows (skipped){/ts} {$invalidRowCount} {ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts} {if $invalidRowCount} @@ -91,7 +91,7 @@ {/if} {if $unMatchCount } -
{ts}Mismatched Rows (skipped){/ts}
{ts}Mismatched Rows (skipped){/ts} {$unMatchCount} {ts}Rows with mismatched membership IDs... (NOT updated).{/ts} {if $unMatchCount} @@ -102,7 +102,7 @@ {/if} {if $conflictRowCount} -
{ts}Conflicting Rows (skipped){/ts}
{ts}Conflicting Rows (skipped){/ts} {$conflictRowCount} {ts}Rows with conflicting transaction IDs (NOT imported).{/ts} {if $conflictRowCount} @@ -113,7 +113,7 @@ {/if} {if $duplicateRowCount} -
{ts}Duplicate Rows{/ts}
{ts}Duplicate Rows{/ts} {$duplicateRowCount} {ts}Rows which are duplicates of existing CiviCRM membership records.{/ts} {$dupeActionString} {if $duplicateRowCount} @@ -123,7 +123,7 @@
{ts}Records Imported{/ts}
{ts}Records Imported{/ts} {$validRowCount} {ts}Rows imported successfully.{/ts}
{$row.month.total.name} + {if $row.premonth.new.url}{$row.premonth.new.count} {else}{$row.premonth.new.count}{/if} + {if $row.premonth.renew.url}{$row.premonth.renew.count} {else}{$row.premonth.renew.count}{/if} + {if $row.premonth.total.url} {$row.premonth.total.count} {else} @@ -83,15 +83,15 @@ + {if $row.month.new.url}{$row.month.new.count} {else}{$row.month.new.count}{/if} + {if $row.month.renew.url}{$row.month.renew.count} {else}{$row.month.renew.count}{/if} + {if $row.month.total.url} {$row.month.total.count} {else} @@ -104,15 +104,15 @@ {/if}] + {if $row.year.new.url}{$row.year.new.count} {else}{$row.year.new.count}{/if} + {if $row.year.renew.url}{$row.year.renew.count} {else}{$row.year.renew.count}{/if} + {if $row.year.total.url} {$row.year.total.count} {else} @@ -125,7 +125,7 @@ {/if}] + {if $isCurrent} {if $row.current.total.url} {$row.current.total.count} @@ -156,15 +156,15 @@
{ts}Totals (all types){/ts} + {if $totalCount.premonth.new.url}{$totalCount.premonth.new.count} {else}{$totalCount.premonth.new.count}{/if} + {if $totalCount.premonth.renew.url}{$totalCount.premonth.renew.count} {else}{$totalCount.premonth.renew.count}{/if} + {if $totalCount.premonth.total.url} {$totalCount.premonth.total.count} {else} @@ -178,15 +178,15 @@ + {if $totalCount.month.new.url}{$totalCount.month.new.count} {else}{$totalCount.month.new.count}{/if} + {if $totalCount.month.renew.url}{$totalCount.month.renew.count} {else}{$totalCount.month.renew.count}{/if} + {if $totalCount.month.total.url} {$totalCount.month.total.count} {else} @@ -199,15 +199,15 @@ {/if}] + {if $totalCount.year.new.url}{$totalCount.year.new.count} {else}{$totalCount.year.new.count}{/if} + {if $totalCount.year.renew.url}{$totalCount.year.renew.count} {else}{$totalCount.year.renew.count}{/if} + {if $totalCount.year.total.url} {$totalCount.year.total.count} {else} @@ -220,7 +220,7 @@ {/if}] + {if $isCurrent} {if $row.total.total.url} {$totalCount.current.total.count}