Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Consolidate MapTable.tpl #23138

Merged
merged 1 commit into from
Apr 8, 2022
+17 −219
Merged

Consolidate MapTable.tpl #23138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Consolidate MapTable.tpl
@eileenmcnaughton
eileenmcnaughton committed Apr 8, 2022
commit 10c380100c723eb19ea66dfa6cb145866fd7bf0c
2 changes: 1 addition & 1 deletion templates/CRM/Activity/Import/Form/MapField.tpl
View file
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion templates/CRM/Activity/Import/Form/Preview.tpl
View file
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 1 addition & 1 deletion templates/CRM/Event/Import/Form/MapField.tpl
View file
Original file line number Diff line number Diff line change
@@ -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>
101 changes: 0 additions & 101 deletions templates/CRM/Event/Import/Form/MapTable.tpl
View file

This file was deleted.

2 changes: 1 addition & 1 deletion templates/CRM/Event/Import/Form/Preview.tpl
View file
Original file line number Diff line number Diff line change
@@ -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">
23 changes: 11 additions & 12 deletions ...tes/CRM/Activity/Import/Form/MapTable.tpl → templates/CRM/Import/Form/MapTable.tpl
View file
Original file line number Diff line number Diff line change
@@ -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 }
2 changes: 1 addition & 1 deletion templates/CRM/Member/Import/Form/MapField.tpl
View file
Original file line number Diff line number Diff line change
@@ -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>
100 changes: 0 additions & 100 deletions templates/CRM/Member/Import/Form/MapTable.tpl
View file

This file was deleted.

2 changes: 1 addition & 1 deletion templates/CRM/Member/Import/Form/Preview.tpl
View file
Original file line number Diff line number Diff line change
@@ -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>