Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display tables correctly on import wizard/membership dashboard when using drupal bootstrap based theme #12799

Merged
merged 2 commits into from
Sep 13, 2018
Merged

Display tables correctly on import wizard/membership dashboard when using drupal bootstrap based theme #12799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
712f3e3
Display first column (labels) correctly on import preview/summary tab…
mattwire Sep 8, 2018
d8eb760
Fix display of membership import and dashboard tables when using drup…
mattwire Sep 9, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions templates/CRM/Activity/Import/Form/Preview.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
{include file="CRM/common/importProgress.tpl"}
{* Summary Preview (record counts) *}
<table id="preview-counts" class="report">
<tr><td class="label">{ts}Total Rows{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Total Rows{/ts}</td>
<td class="data">{$totalRowCount}</td>
<td class="explanation">{ts}Total rows (activity records) in uploaded file.{/ts}</td>
</tr>

{if $invalidRowCount}
<tr class="error"><td class="label">{ts}Rows with Errors{/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Rows with Errors{/ts}</td>
<td class="data">{$invalidRowCount}</td>
<td class="explanation">{ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts}
{if $invalidRowCount}
Expand All @@ -71,7 +71,7 @@
{/if}

{if $conflictRowCount}
<tr class="error"><td class="label">{ts}Conflicting Rows{/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows{/ts}</td>
<td class="data">{$conflictRowCount}</td>
<td class="explanation">{ts}Rows with conflicting transaction ids within this file. These rows will be skipped (not imported).{/ts}
{if $conflictRowCount}
Expand All @@ -81,7 +81,7 @@
</tr>
{/if}

<tr><td class="label">{ts}Valid Rows{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Valid Rows{/ts}</td>
<td class="data">{$validRowCount}</td>
<td class="explanation">{ts}Total rows to be imported.{/ts}</td>
</tr>
Expand Down
12 changes: 6 additions & 6 deletions templates/CRM/Activity/Import/Form/Summary.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,13 @@
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
{* Summary of Import Results (record counts) *}
<table id="summary-counts" class="report">
<tr><td class="label">{ts}Total Rows{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Total Rows{/ts}</td>
<td class="data">{$totalRowCount}</td>
<td class="explanation">{ts}Total rows (activity records) in uploaded file.{/ts}</td>
</tr>

{if $invalidRowCount }
<tr class="error"><td class="label">{ts}Invalid Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Invalid Rows (skipped){/ts}</td>
<td class="data">{$invalidRowCount}</td>
<td class="explanation">{ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts}
{if $invalidRowCount}
Expand All @@ -91,7 +91,7 @@
{/if}

{if $unMatchCount }
<tr class="error"><td class="label">{ts}Mismatched Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Mismatched Rows (skipped){/ts}</td>
<td class="data">{$unMatchCount}</td>
<td class="explanation">{ts}Rows with mismatched activity IDs (NOT updated).{/ts}
{if $unMatchCount}
Expand All @@ -102,7 +102,7 @@
{/if}

{if $conflictRowCount}
<tr class="error"><td class="label">{ts}Conflicting Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows (skipped){/ts}</td>
<td class="data">{$conflictRowCount}</td>
<td class="explanation">{ts}Rows with conflicting transaction IDs (NOT imported).{/ts}
{if $conflictRowCount}
Expand All @@ -113,7 +113,7 @@
{/if}

{if $duplicateRowCount}
<tr class="error"><td class="label">{ts}Duplicate Rows{/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Duplicate Rows{/ts}</td>
<td class="data">{$duplicateRowCount}</td>
<td class="explanation">{ts}Rows which are duplicates of existing CiviCRM activity records.{/ts} {$dupeActionString}
{if $duplicateRowCount}
Expand All @@ -123,7 +123,7 @@
</tr>
{/if}

<tr><td class="label">{ts}Records Imported{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Records Imported{/ts}</td>
<td class="data">{$validRowCount}</td>
<td class="explanation">{ts}Rows imported successfully.{/ts}</td>
</tr>
Expand Down
8 changes: 4 additions & 4 deletions templates/CRM/Contact/Import/Form/Preview.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,13 @@
<div id="preview-info">
{* Summary Preview (record counts) *}
<table id="preview-counts" class="report">
<tr><td class="label">{ts}Total Rows{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Total Rows{/ts}</td>
<td class="data">{$totalRowCount}</td>
<td class="explanation">{ts}Total number of rows in the imported data.{/ts}</td>
</tr>

{if $invalidRowCount}
<tr class="error"><td class="label">{ts}Rows with Errors{/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Rows with Errors{/ts}</td>
<td class="data">{$invalidRowCount}</td>
<td class="explanation">{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}
Expand All @@ -71,7 +71,7 @@
{/if}

{if $conflictRowCount}
<tr class="error"><td class="label">{ts}Conflicting Rows{/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows{/ts}</td>
<td class="data">{$conflictRowCount}</td>
<td class="explanation">{ts}Rows with conflicting email addresses within this file. These rows will be skipped (not imported).{/ts}
{if $conflictRowCount}
Expand All @@ -82,7 +82,7 @@
{/if}

<tr>
<td class="label">{ts}Valid Rows{/ts}</td>
<td class="label crm-grid-cell">{ts}Valid Rows{/ts}</td>
<td class="data">{$validRowCount}</td>
<td class="explanation">{ts}Total rows to be imported.{/ts}</td>
</tr>
Expand Down
16 changes: 8 additions & 8 deletions templates/CRM/Contact/Import/Form/Summary.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,13 +81,13 @@
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
{* Summary of Import Results (record counts) *}
<table id="summary-counts" class="report">
<tr><td class="label">{ts}Total Rows{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Total Rows{/ts}</td>
<td class="data">{$totalRowCount}</td>
<td class="explanation">{ts}Total number of rows in the imported data.{/ts}</td>
</tr>

{if $invalidRowCount }
<tr class="error"><td class="label">{ts}Invalid Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Invalid Rows (skipped){/ts}</td>
<td class="data">{$invalidRowCount}</td>
<td class="explanation">{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}
Expand All @@ -98,7 +98,7 @@
{/if}

{if $unMatchCount }
<tr class="error"><td class="label">{ts}Mismatched Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Mismatched Rows (skipped){/ts}</td>
<td class="data">{$unMatchCount}</td>
<td class="explanation">{ts}Rows with mismatched contact IDs... (NOT updated).{/ts}
{if $unMatchCount}
Expand All @@ -109,7 +109,7 @@
{/if}

{if $conflictRowCount}
<tr class="error"><td class="label">{ts}Conflicting Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows (skipped){/ts}</td>
<td class="data">{$conflictRowCount}</td>
<td class="explanation">{ts}Rows with conflicting email addresses (NOT imported).{/ts}
{if $conflictRowCount}
Expand All @@ -120,7 +120,7 @@
{/if}

{if $duplicateRowCount && $dupeError}
<tr class="error"><td class="label">{ts}Duplicate Rows{/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Duplicate Rows{/ts}</td>
<td class="data">{$duplicateRowCount}</td>
<td class="explanation">{ts}Rows which are duplicates of existing CiviCRM contact records.{/ts} {$dupeActionString}
{if $duplicateRowCount}
Expand All @@ -130,13 +130,13 @@
</tr>
{/if}

<tr><td class="label">{ts}Total Contacts{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Total Contacts{/ts}</td>
<td class="data">{$validRowCount}</td>
<td class="explanation">{ts}Total number of contact records created or modified during the import.{/ts}</td>
</tr>

{if $groupAdditions}
<tr><td class="label">{ts}Import to Groups{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Import to Groups{/ts}</td>
<td colspan="2" class="explanation">
{foreach from="$groupAdditions" item="group"}
<label><a href="{$group.url}">{$group.name}</a></label>:
Expand All @@ -152,7 +152,7 @@
{/if}

{if $tagAdditions}
<tr><td class="label">{ts}Tagged Imported Contacts{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Tagged Imported Contacts{/ts}</td>
<td colspan="2" class="explanation">
{foreach from="$tagAdditions" item="tag"}
<label>{$tag.name}</label>:
Expand Down
8 changes: 4 additions & 4 deletions templates/CRM/Contribute/Import/Form/Preview.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,13 +53,13 @@
{include file="CRM/common/importProgress.tpl"}
{* Summary Preview (record counts) *}
<table id="preview-counts" class="report">
<tr><td class="label">{ts}Total Rows{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Total Rows{/ts}</td>
<td class="data">{$totalRowCount}</td>
<td class="explanation">{ts}Total rows (contribution records) in uploaded file.{/ts}</td>
</tr>

{if $invalidRowCount}
<tr class="error"><td class="label">{ts}Rows with Errors{/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Rows with Errors{/ts}</td>
<td class="data">{$invalidRowCount}</td>
<td class="explanation">{ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts}
{if $invalidRowCount}
Expand All @@ -70,7 +70,7 @@
{/if}

{if $conflictRowCount}
<tr class="error"><td class="label">{ts}Conflicting Rows{/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows{/ts}</td>
<td class="data">{$conflictRowCount}</td>
<td class="explanation">{ts}Rows with conflicting transaction ids within this file. These rows will be skipped (not imported).{/ts}
{if $conflictRowCount}
Expand All @@ -80,7 +80,7 @@
</tr>
{/if}

<tr><td class="label">{ts}Valid Rows{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Valid Rows{/ts}</td>
<td class="data">{$validRowCount}</td>
<td class="explanation">{ts}Total rows to be imported.{/ts}</td>
</tr>
Expand Down
20 changes: 10 additions & 10 deletions templates/CRM/Contribute/Import/Form/Summary.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,13 +73,13 @@
<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
{* Summary of Import Results (record counts) *}
<table id="summary-counts" class="report">
<tr><td class="label">{ts}Total Rows{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Total Rows{/ts}</td>
<td class="data">{$totalRowCount}</td>
<td class="explanation">{ts}Total rows (contribution records) in uploaded file.{/ts}</td>
</tr>

{if $invalidRowCount }
<tr class="error"><td class="label">{ts}Invalid Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Invalid Rows (skipped){/ts}</td>
<td class="data">{$invalidRowCount}</td>
<td class="explanation">{ts}Rows with invalid data in one or more fields. These rows have been skipped (not imported).{/ts}
{if $invalidRowCount}
Expand All @@ -90,14 +90,14 @@
{/if}

{if $validSoftCreditRowCount }
<tr><td class="label">{ts}Soft Credits{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Soft Credits{/ts}</td>
<td class="data">{$validSoftCreditRowCount}</td>
<td class="explanation">{ts}Rows where a soft credit was successfully assigned to a contact.{/ts}</td>
</tr>
{/if}

{if $invalidSoftCreditRowCount }
<tr class="error"><td class="label">{ts}Unmatched Soft Credit Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Unmatched Soft Credit Rows (skipped){/ts}</td>
<td class="data">{$invalidSoftCreditRowCount}</td>
<td class="explanation">{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}
Expand All @@ -108,14 +108,14 @@
{/if}

{if $validPledgePaymentRowCount }
<tr><td class="label">{ts}Pledge Payments Applied{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Pledge Payments Applied{/ts}</td>
<td class="data">{$validPledgePaymentRowCount}</td>
<td class="explanation">{ts}Rows with a pledge payment successfully applied.{/ts}</td>
</tr>
{/if}

{if $invalidPledgePaymentRowCount }
<tr class="error"><td class="label">{ts}Invalid Pledge Payment Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Invalid Pledge Payment Rows (skipped){/ts}</td>
<td class="data">{$invalidPledgePaymentRowCount}</td>
<td class="explanation">{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}
Expand All @@ -125,7 +125,7 @@
</tr>
{/if}
{if $unMatchCount }
<tr class="error"><td class="label">{ts}Mismatched Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Mismatched Rows (skipped){/ts}</td>
<td class="data">{$unMatchCount}</td>
<td class="explanation">{ts}Rows with mismatched contribution IDs... (NOT updated).{/ts}
{if $unMatchCount}
Expand All @@ -136,7 +136,7 @@
{/if}

{if $conflictRowCount}
<tr class="error"><td class="label">{ts}Conflicting Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows (skipped){/ts}</td>
<td class="data">{$conflictRowCount}</td>
<td class="explanation">{ts}Rows with conflicting transaction IDs (NOT imported).{/ts}
{if $conflictRowCount}
Expand All @@ -147,7 +147,7 @@
{/if}

{if $duplicateRowCount}
<tr class="error"><td class="label">{ts}Duplicate Rows{/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Duplicate Rows{/ts}</td>
<td class="data">{$duplicateRowCount}</td>
<td class="explanation">{ts}Rows which are duplicates of existing CiviCRM contribution records.{/ts} {$dupeActionString}
{if $duplicateRowCount}
Expand All @@ -157,7 +157,7 @@
</tr>
{/if}

<tr><td class="label">{ts}Records Imported{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Records Imported{/ts}</td>
<td class="data">{$validRowCount}</td>
<td class="explanation">{ts}Total number of rows imported successfully.{/ts}</td>
</tr>
Expand Down
8 changes: 4 additions & 4 deletions templates/CRM/Event/Import/Form/Preview.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,13 @@
</div>
{* Summary Preview (record counts) *}
<table id="preview-counts" class="report">
<tr><td class="label">{ts}Total Rows{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Total Rows{/ts}</td>
<td class="data">{$totalRowCount}</td>
<td class="explanation">{ts}Total rows (participant records) in uploaded file.{/ts}</td>
</tr>

{if $invalidRowCount}
<tr class="error"><td class="label">{ts}Rows with Errors{/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Rows with Errors{/ts}</td>
<td class="data">{$invalidRowCount}</td>
<td class="explanation">{ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts}
{if $invalidRowCount}
Expand All @@ -73,7 +73,7 @@
{/if}

{if $conflictRowCount}
<tr class="error"><td class="label">{ts}Conflicting Rows{/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows{/ts}</td>
<td class="data">{$conflictRowCount}</td>
<td class="explanation">{ts}Rows with conflicting participant IDs within this file. These rows will be skipped (not imported).{/ts}
{if $conflictRowCount}
Expand All @@ -83,7 +83,7 @@
</tr>
{/if}

<tr><td class="label">{ts}Valid Rows{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Valid Rows{/ts}</td>
<td class="data">{$validRowCount}</td>
<td class="explanation">{ts}Total rows to be imported.{/ts}</td>
</tr>
Expand Down
12 changes: 6 additions & 6 deletions templates/CRM/Event/Import/Form/Summary.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,13 @@
</div>
{* Summary of Import Results (record counts) *}
<table id="summary-counts" class="report">
<tr><td class="label">{ts}Total Rows{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Total Rows{/ts}</td>
<td class="data">{$totalRowCount}</td>
<td class="explanation">{ts}Total rows (participant records) in uploaded file.{/ts}</td>
</tr>

{if $invalidRowCount }
<tr class="error"><td class="label">{ts}Invalid Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Invalid Rows (skipped){/ts}</td>
<td class="data">{$invalidRowCount}</td>
<td class="explanation">{ts}Rows with invalid data in one or more fields. These rows will be skipped (not imported).{/ts}
{if $invalidRowCount}
Expand All @@ -95,7 +95,7 @@
{/if}

{if $unMatchCount }
<tr class="error"><td class="label">{ts}Mismatched Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Mismatched Rows (skipped){/ts}</td>
<td class="data">{$unMatchCount}</td>
<td class="explanation">{ts}Rows with mismatched participant IDs... (NOT updated).{/ts}
{if $unMatchCount}
Expand All @@ -106,7 +106,7 @@
{/if}

{if $conflictRowCount}
<tr class="error"><td class="label">{ts}Conflicting Rows (skipped){/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows (skipped){/ts}</td>
<td class="data">{$conflictRowCount}</td>
<td class="explanation">{ts}Rows with conflicting participant IDs (NOT imported).{/ts}
{if $conflictRowCount}
Expand All @@ -117,7 +117,7 @@
{/if}

{if $duplicateRowCount}
<tr class="error"><td class="label">{ts}Duplicate Rows{/ts}</td>
<tr class="error"><td class="label crm-grid-cell">{ts}Duplicate Rows{/ts}</td>
<td class="data">{$duplicateRowCount}</td>
<td class="explanation">{ts}Rows which are duplicates of existing CiviCRM participant records.{/ts} {$dupeActionString}
{if $duplicateRowCount}
Expand All @@ -127,7 +127,7 @@
</tr>
{/if}

<tr><td class="label">{ts}Records Imported{/ts}</td>
<tr><td class="label crm-grid-cell">{ts}Records Imported{/ts}</td>
<td class="data">{$validRowCount}</td>
<td class="explanation">{ts}Rows imported successfully.{/ts}</td>
</tr>
Expand Down
Loading