From 8c27ba3d63771f94dcc5ef65d59f8264b2ca2592 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 16 Aug 2022 08:37:10 +1200
Subject: [PATCH] Finish consolidating DataSource.tpl

---
 .../CRM/Custom/Import/Form/DataSource.tpl     | 70 +------------------
 templates/CRM/Import/Form/DataSource.tpl      |  6 ++
 2 files changed, 7 insertions(+), 69 deletions(-)

diff --git a/templates/CRM/Custom/Import/Form/DataSource.tpl b/templates/CRM/Custom/Import/Form/DataSource.tpl
index 6581685d79..5395b37fcf 100644
--- a/templates/CRM/Custom/Import/Form/DataSource.tpl
+++ b/templates/CRM/Custom/Import/Form/DataSource.tpl
@@ -7,72 +7,4 @@
  | and copyright information, see https://civicrm.org/licensing       |
  +--------------------------------------------------------------------+
 *}
-
-{* Import Wizard - Step 1 (choose data source) *}
-{* Import Wizard - Step 1 (choose data source) *}
-<div class="crm-block crm-form-block crm-import-datasource-form-block">
-
-  {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *}
-  {include file="CRM/common/WizardHeader.tpl"}
-  {if $errorMessage}
-    <div class="messages warning no-popup">
-      {$errorMessage}
-    </div>
-  {/if}
-  <div class="help">
-    {ts 1=$importEntity 2= $importEntities}The %1 Import Wizard allows you to easily upload %2 from other applications into CiviCRM.{/ts}
-    {ts}Files to be imported must be in the 'comma-separated-values' format (CSV) and must contain data needed to match an existing contact in your CiviCRM database.{/ts} {help id='upload'}
-  </div>
-  <div id="upload-file" class="form-item">
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
-    <table class="form-layout">
-      <tr class="crm-import-uploadfile-form-block-uploadFile">
-      <td class="label">{$form.uploadFile.label}</td>
-      <td>{$form.uploadFile.html}<br />
-      <span class="description">
-        {ts}File format must be comma-separated-values (CSV).{/ts}
-      </span>
-      </td>
-    </tr>
-      <tr>
-        <td>&nbsp;</td>
-        <td>{ts 1=$uploadSize}Maximum Upload File Size: %1 MB{/ts}</td>
-      </tr>
-      <tr class="crm-import-form-block-skipColumnHeader">
-        <td>&nbsp;</td>
-        <td>{$form.skipColumnHeader.html} {$form.skipColumnHeader.label}<br />
-          <span class="description">
-            {ts}Check this box if the first row of your file consists of field names (Example: "Contact ID", "Participant Role").{/ts}
-          </span>
-        </td>
-      </tr>
-     <tr class="crm-import-uploadfile-form-block-multipleCustomData">
-       <td class="label">{$form.multipleCustomData.label}</td>
-       <td><span>{$form.multipleCustomData.html}</span> </td>
-     </tr>
-     <tr class="crm-import-uploadfile-from-block-contactType">
-       <td class="label">{$form.contactType.label}</td>
-       <td>{$form.contactType.html}</td>
-     </tr>
-
-     <tr class="crm-import-datasource-form-block-fieldSeparator">
-       <td class="label">{$form.fieldSeparator.label} {help id='id-fieldSeparator' file='CRM/Contact/Import/Form/DataSource'}</td>
-       <td>{$form.fieldSeparator.html}</td>
-     </tr>
-     <tr class="crm-import-uploadfile-form-block-date_format">
-       {include file="CRM/Core/Date.tpl"}
-     </tr>
-     {if $savedMapping}
-       <tr class="crm-import-uploadfile-form-block-savedMapping">
-         <td class="label">{$form.savedMapping.label}</td>
-         <td><span>{$form.savedMapping.html}</span> </td>
-       </tr>
-       <tr>
-         <td>&nbsp;</td>
-         <td class="description">{ts}Select Saved Mapping, or leave blank to create a new mapping.{/ts}</td>
-       </tr>
-     {/if}
-  </table>
-  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>
-  </div>
-</div>
+{include file="CRM/Import/Form/DataSource.tpl"}
diff --git a/templates/CRM/Import/Form/DataSource.tpl b/templates/CRM/Import/Form/DataSource.tpl
index 28ce84c23c..c125ab8ec6 100644
--- a/templates/CRM/Import/Form/DataSource.tpl
+++ b/templates/CRM/Import/Form/DataSource.tpl
@@ -55,6 +55,12 @@
           <td class="label">{$form.onDuplicate.label}</td>
           <td>{$form.onDuplicate.html} {help id="id-onDuplicate"}</td>
         </tr>
+      {/if}
+      {if array_key_exists('multipleCustomData', $form)}
+        <tr class="crm-import-uploadfile-form-block-multipleCustomData">
+          <td class="label">{$form.multipleCustomData.label}</td>
+          <td><span>{$form.multipleCustomData.html}</span> </td>
+        </tr>
       {/if}
         <tr class="crm-import-datasource-form-block-fieldSeparator">
           <td class="label">{$form.fieldSeparator.label} {help id='id-fieldSeparator' file='CRM/Contact/Import/Form/DataSource'}</td>
-- 
2.25.1