Merge pull request #23138 from eileenmcnaughton/map

Consolidate MapTable.tpl
civicrm · Apr 8, 2022 · 5ffc164 · 5ffc164
2 parents 21d720c + 10c3801
commit 5ffc164
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 219 deletions.
diff --git a/templates/CRM/Activity/Import/Form/MapField.tpl b/templates/CRM/Activity/Import/Form/MapField.tpl
@@ -20,7 +20,7 @@
 </div>
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
  {* Table for mapping data to CRM fields *}
- {include file="CRM/Activity/Import/Form/MapTable.tpl}
+ {include file="CRM/Import/Form/MapTable.tpl"}
  <br />
 
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>

diff --git a/templates/CRM/Activity/Import/Form/Preview.tpl b/templates/CRM/Activity/Import/Form/Preview.tpl
@@ -73,7 +73,7 @@
  <br />
 
  {* Table for mapping preview *}
- {include file="CRM/Activity/Import/Form/MapTable.tpl}
+ {include file="CRM/Import/Form/MapTable.tpl"}
  <br />
 
  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>

diff --git a/templates/CRM/Event/Import/Form/MapField.tpl b/templates/CRM/Event/Import/Form/MapField.tpl
@@ -27,7 +27,7 @@
    </tr>
    <tr>
      <td>{* Table for mapping data to CRM fields *}
-         {include file="CRM/Event/Import/Form/MapTable.tpl}
+         {include file="CRM/Import/Form/MapTable.tpl"}
      </td>
    </tr>
    <tr>

diff --git a/templates/CRM/Event/Import/Form/MapTable.tpl b/templates/CRM/Event/Import/Form/MapTable.tpl
diff --git a/templates/CRM/Event/Import/Form/Preview.tpl b/templates/CRM/Event/Import/Form/Preview.tpl
@@ -75,7 +75,7 @@
 
 
  {* Table for mapping preview *}
- {include file="CRM/Event/Import/Form/MapTable.tpl}
+ {include file="CRM/Import/Form/MapTable.tpl"}
 
 
  <div class="crm-submit-buttons">

diff --git a/...tes/CRM/Activity/Import/Form/MapTable.tpl → templates/CRM/Import/Form/MapTable.tpl b/...tes/CRM/Activity/Import/Form/MapTable.tpl → templates/CRM/Import/Form/MapTable.tpl
@@ -7,8 +7,8 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-{* Activity Import Wizard - Data Mapping table used by MapFields.tpl and Preview.tpl *}
-<div class="crm-block crm-form-block crm-activity_map_table-form-block">
+{* Import Wizard - Data Mapping table used by MapFields.tpl and Preview.tpl *}
+<div class="crm-block crm-form-block crm-map-table-form-block">
 
  <div id="map-field">
     {strip}
@@ -66,16 +66,15 @@
       {/if}
       <span>{$form.saveMapping.html} &nbsp;&nbsp; {$form.saveMapping.label}</span>
       <div id="saveDetails" class="form-item">
-          <table>
-                  <tr class="crm-activity_map_table-form-block-saveMappingName">
-             <td>{$form.saveMappingName.label}</td>
-                     <td>{$form.saveMappingName.html}</td>
-                  </tr>
-                  <tr class="crm-activity_map_table-form-block-saveMappingDesc">
-             <td>{$form.saveMappingDesc.label}</td>
-                     <td>{$form.saveMappingDesc.html}</td>
-                 </tr>
-            </table>
+        <table class="form-layout">
+          <tr class="crm-map-table-form-block-saveMappingName">
+            <td class="label">{$form.saveMappingName.label}</td><td>{$form.saveMappingName.html}</td>
+          </tr>
+          <tr class="crm-map-table-form-block-saveMappingDesc">
+            <td class="label">{$form.saveMappingDesc.label}</td>
+            <td>{$form.saveMappingDesc.html}</td>
+          </tr>
+        </table>
       </div>
       <script type="text/javascript">
              {if $mappingDetailsError }

diff --git a/templates/CRM/Member/Import/Form/MapField.tpl b/templates/CRM/Member/Import/Form/MapField.tpl
@@ -19,7 +19,7 @@
 {* @var $form Contains the array for the form elements and other form associated information assigned to the template by the controller *}
 
  {* Table for mapping data to CRM fields *}
- {include file="CRM/Member/Import/Form/MapTable.tpl}
+ {include file="CRM/Import/Form/MapTable.tpl"}
 
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
 </div>

diff --git a/templates/CRM/Member/Import/Form/MapTable.tpl b/templates/CRM/Member/Import/Form/MapTable.tpl
diff --git a/templates/CRM/Member/Import/Form/Preview.tpl b/templates/CRM/Member/Import/Form/Preview.tpl
@@ -73,7 +73,7 @@
 
 
  {* Table for mapping preview *}
- {include file="CRM/Member/Import/Form/MapTable.tpl}
+ {include file="CRM/Import/Form/MapTable.tpl"}
 
 
  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ @@
        </tr>
        <tr>
          <td>{* Table for mapping data to CRM fields *}
-             {include file="CRM/Event/Import/Form/MapTable.tpl}
+             {include file="CRM/Import/Form/MapTable.tpl"}
          </td>
        </tr>
        <tr>
@@ Expand Down @@