Enotice fixes, consolidation on Import datasource forms

[eileenmcnaughton]

Overview

Enotice fixes, consolidation on Import datasource forms

Before

E-notices on dataSource form in some cases, inconsistent across the 2 templates

After

Standardised

Technical Details

The goal is to consolidate the 2 forms of DataSource.tpl such that the
logic to select csv or sql is in shared code used by Contact import (as is currently the case) and all the other imports (including csvimporter)

This PR simply wraps all fields that might not be in one or both tpls with {if array_key_exists('contactType', $form)} so we can more easily merge them into one.

Note that in addition to the tpl layer stuff the php layer requires these lines that are only in the Contact import at the moment to be accessed by all imports

    $this->buildDataSourceFields();
    $this->assign('urlPath', 'civicrm/import/datasource');
    $this->assign('urlPathVar', 'snippet=4&user_job_id=' . $this->get('user_job_id'));

    $this->add('select', 'dataSource', ts('Data Source'), $this->getDataSources(), TRUE,
      ['onchange' => 'buildDataSourceFormBlock(this.value);']
    );

Comments

@mattwire once this is done we won't need to add to csvimporter per your PR. However, I hit a couple of gotchas consolidating the tpl - the first 2 I expect just take more fiddling around

1. I couldn't quite seem to get the help text working for the onDuplicate field
2. For some reason I didn't get the buildDataSourceFormBlock(); to work & hence I backed out for now, scaling this down to consolidation so the tpls can be more easily merged
3. the text around contactType doesn't quite work for contacts if we use what is in the shared tpl

         <span class="description">
              {ts 1=$importEntities}Select 'Individual' if you are importing %1 made by individual persons.{/ts}
              {ts 1=$importEntities}Select 'Organization' or 'Household' if you are importing %1 to contacts of that type.{/ts}
            </span>

Perhaps

         <span class="description">
              {ts 1=$importEntities}Select 'Individual' if you are importing to individual persons.{/ts}
              {ts 1=$importEntities}Select 'Organization' or 'Household' to contacts of that type.{/ts}
            </span>

would get us past it?

Maybe we could even drop it?

[civibot]

(Standard links)

• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).