From fdebece2f9e8855154926fc50d514052a5408b35 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Fri, 15 Apr 2022 15:16:39 +1200
Subject: [PATCH] Standardise activity datasource text

---
 .../CRM/Activity/Import/Form/DataSource.tpl   | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/templates/CRM/Activity/Import/Form/DataSource.tpl b/templates/CRM/Activity/Import/Form/DataSource.tpl
index 56fb9940de..1287c6d6a5 100644
--- a/templates/CRM/Activity/Import/Form/DataSource.tpl
+++ b/templates/CRM/Activity/Import/Form/DataSource.tpl
@@ -10,26 +10,24 @@
 {* 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"}
+  {* WizardHeader.tpl provides visual display of steps thru the wizard as well as title for current step *}
+  {include file="CRM/common/WizardHeader.tpl"}
+  <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 class="help">
-    <p>
-    {ts}The Activity Import Wizard allows you to easily upload activity from other applications into CiviCRM. Contacts must already exist in your CiviCRM database prior to importing activity.{/ts}
-    {help id="id-upload"}
-    </p>
- </div>
  <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="top"}</div>
  <div id="upload-file">
  <h3>{ts}Upload Data File{/ts}</h3>
       <table class="form-layout-compressed">
-        <tr class="crm-activity-import-uploadfile-form-block-uploadFile">
+        <tr class="crm-import-uploadfile-from-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><br /><span>{ts 1=$uploadSize}Maximum Upload File Size: %1 MB{/ts}</span>
            </td>
         </tr>
-        <tr class="crm-activity-import-uploadfile-form-block-skipColumnHeader">
+        <tr class="crm-import-uploadfile-form-block-skipColumnHeader">
            <td class="label"></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', 'Activity Type', 'Activity Date').{/ts}</span>
@@ -41,7 +39,7 @@
         </tr>
         <tr>{include file="CRM/Core/Date.tpl"}</tr>
         {if $savedMapping}
-        <tr class="crm-activity-import-uploadfile-form-block-savedMapping">
+        <tr class="crm-import-uploadfile-form-block-savedMapping">
         <td>{$form.savedMapping.label}</td>
            <td>{$form.savedMapping.html}<br />
               <span class="description">{ts}Select Saved Mapping or Leave blank to create a new One.{/ts}</span>
-- 
2.25.1