Fix display of membership import and dashboard tables when using drupal bootstrap...

diff --git a/templates/CRM/Member/Import/Form/Preview.tpl b/templates/CRM/Member/Import/Form/Preview.tpl
index 9e357cc78beeee24a76e5ec8385dfd6072c94794..b6cc26c9da8d13aebac8b25c65ff5d67c1ba48f1 100644 (file)
--- 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) *}
  <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 (membership 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}
@@ -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}
@@ -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>

diff --git a/templates/CRM/Member/Import/Form/Summary.tpl b/templates/CRM/Member/Import/Form/Summary.tpl
index 559587edefb1eb07cf209c650cbd9174b2265d1a..32aa8e7a262c8e464078537d4add7d9f02e16500 100644 (file)
--- a/templates/CRM/Member/Import/Form/Summary.tpl
+++ b/templates/CRM/Member/Import/Form/Summary.tpl
@@ -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 (membership 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}
@@ -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 membership IDs... (NOT updated).{/ts}
             {if $unMatchCount}
@@ -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}
@@ -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 membership records.{/ts} {$dupeActionString}
             {if $duplicateRowCount}
@@ -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>

diff --git a/templates/CRM/Member/Page/DashBoard.tpl b/templates/CRM/Member/Page/DashBoard.tpl
index 093efdb7720628b054132640d99f72deae65baf0..3b56964fe3091eaf98a021f0405d49fa16cc8d54 100644 (file)
--- a/templates/CRM/Member/Page/DashBoard.tpl
+++ b/templates/CRM/Member/Page/DashBoard.tpl
@@ -61,15 +61,15 @@
         <tr>
             <td><strong>{$row.month.total.name}</strong></td>
           {if $preMonth}
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $row.premonth.new.url}<a href="{$row.premonth.new.url}" title="view details">{$row.premonth.new.count}</a>
               {else}{$row.premonth.new.count}{/if}
             </td>
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $row.premonth.renew.url}<a href="{$row.premonth.renew.url}" title="view details">{$row.premonth.renew.count}</a>
               {else}{$row.premonth.renew.count}{/if}
             </td>
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $row.premonth.total.url}
                 <a href="{$row.premonth.total.url}" title="view details">{$row.premonth.total.count}</a>
               {else}
@@ -83,15 +83,15 @@
             </td>
           {/if}
 
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $row.month.new.url}<a href="{$row.month.new.url}" title="view details">{$row.month.new.count}</a>
               {else}{$row.month.new.count}{/if}
             </td>
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $row.month.renew.url}<a href="{$row.month.renew.url}" title="view details">{$row.month.renew.count}</a>
               {else}{$row.month.renew.count}{/if}
             </td>
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $row.month.total.url}
                 <a href="{$row.month.total.url}" title="view details">{$row.month.total.count}</a>
               {else}
@@ -104,15 +104,15 @@
               {/if}]
             </td>
 
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $row.year.new.url}<a href="{$row.year.new.url}" title="view details">{$row.year.new.count}</a>
               {else}{$row.year.new.count}{/if}
             </td>
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $row.year.renew.url}<a href="{$row.year.renew.url}" title="view details">{$row.year.renew.count}</a>
               {else}{$row.year.renew.count}{/if}
             </td>
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $row.year.total.url}
                 <a href="{$row.year.total.url}" title="view details">{$row.year.total.count}</a>
               {else}
@@ -125,7 +125,7 @@
               {/if}]
             </td>
 
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $isCurrent}
                 {if $row.current.total.url}
                   <a href="{$row.current.total.url}" title="view details">{$row.current.total.count}</a>
@@ -156,15 +156,15 @@
     <tr class="columnfooter">
         <td><strong>{ts}Totals (all types){/ts}</strong></td>
         {if $preMonth}
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $totalCount.premonth.new.url}<a href="{$totalCount.premonth.new.url}" title="view details">{$totalCount.premonth.new.count}</a>
               {else}{$totalCount.premonth.new.count}{/if}
             </td>
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $totalCount.premonth.renew.url}<a href="{$totalCount.premonth.renew.url}" title="view details">{$totalCount.premonth.renew.count}</a>
               {else}{$totalCount.premonth.renew.count}{/if}
             </td>
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $totalCount.premonth.total.url}
                 <a href="{$totalCount.premonth.total.url}" title="view details">{$totalCount.premonth.total.count}</a>
               {else}
@@ -178,15 +178,15 @@
             </td>
         {/if}
 
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $totalCount.month.new.url}<a href="{$totalCount.month.new.url}" title="view details">{$totalCount.month.new.count}</a>
               {else}{$totalCount.month.new.count}{/if}
             </td>
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $totalCount.month.renew.url}<a href="{$totalCount.month.renew.url}" title="view details">{$totalCount.month.renew.count}</a>
               {else}{$totalCount.month.renew.count}{/if}
             </td>
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $totalCount.month.total.url}
                 <a href="{$totalCount.month.total.url}" title="view details">{$totalCount.month.total.count}</a>
               {else}
@@ -199,15 +199,15 @@
               {/if}]
             </td>
 
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $totalCount.year.new.url}<a href="{$totalCount.year.new.url}" title="view details">{$totalCount.year.new.count}</a>
               {else}{$totalCount.year.new.count}{/if}
             </td>
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $totalCount.year.renew.url}<a href="{$totalCount.year.renew.url}" title="view details">{$totalCount.year.renew.count}</a>
               {else}{$totalCount.year.renew.count}{/if}
             </td>
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $totalCount.year.total.url}
                 <a href="{$totalCount.year.total.url}" title="view details">{$totalCount.year.total.count}</a>
               {else}
@@ -220,7 +220,7 @@
               {/if}]
             </td>
 
-            <td class="label">
+            <td class="label crm-grid-cell">
               {if $isCurrent}
                 {if $row.total.total.url}
                   <a href="{$row.total.total.url}" title="view details">{$totalCount.current.total.count}</a>