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

NFC reformat whitespace in Email.tpl files #11842

Merged
merged 1 commit into from
Mar 21, 2018
Merged

NFC reformat whitespace in Email.tpl files #11842

Show file tree
Hide file tree
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
61 changes: 32 additions & 29 deletions templates/CRM/Contact/Form/Edit/Email.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,42 +28,45 @@
{* @var $blockId Contains the current email block id in evaluation, and assigned in the CRM/Contact/Form/Location.php file *}

{if !$addBlock}
<tr>
<td>{ts}Email{/ts}
<tr>
<td>{ts}Email{/ts}
&nbsp;&nbsp;<a id='addEmail' href="#" title={ts}Add{/ts} onClick="buildAdditionalBlocks( 'Email', '{$className}');return false;">{ts}add{/ts}</a>
</td>
{if $className eq 'CRM_Contact_Form_Contact'}
</td>
{if $className eq 'CRM_Contact_Form_Contact'}
<td>{ts}On Hold?{/ts} {help id="id-onhold" file="CRM/Contact/Form/Contact.hlp"}</td>
<td>{ts}Bulk Mailings?{/ts} {help id="id-bulkmail" file="CRM/Contact/Form/Contact.hlp"}</td>
<td id="Email-Primary" class="hiddenElement">{ts}Primary?{/ts}</td>
{/if}
</tr>
{/if}
</tr>
{/if}

<tr id="Email_Block_{$blockId}">
<td>{$form.email.$blockId.email.html|crmAddClass:email}&nbsp;{$form.email.$blockId.location_type_id.html}
<td>{$form.email.$blockId.email.html|crmAddClass:email}&nbsp;{$form.email.$blockId.location_type_id.html}
<div class="clear"></div>
{if $className eq 'CRM_Contact_Form_Contact'}
<div class="email-signature crm-collapsible collapsed">
<div class="collapsible-title">
{ts}Signature{/ts}
</div>
<div id="signatureBlock{$blockId}">
{$form.email.$blockId.signature_html.label}<br />{$form.email.$blockId.signature_html.html}<br />
{$form.email.$blockId.signature_text.label}<br />{$form.email.$blockId.signature_text.html}
</div>
</div>

{/if}
</td>
<td align="center">{$form.email.$blockId.on_hold.html}</td>
{if $multipleBulk}
<td align="center" id="Email-Bulkmail-html">{$form.email.$blockId.is_bulkmail.html}</td>
{else}
<td align="center" id="Email-Bulkmail-html">{$form.email.$blockId.is_bulkmail.1.html}</td>
{/if}
<td align="center" id="Email-Primary-html" {if $blockId eq 1}class="hiddenElement"{/if}>{$form.email.$blockId.is_primary.1.html}</td>
{if $blockId gt 1}
<td><a href="#" title="{ts}Delete Email Block{/ts}" onClick="removeBlock( 'Email', '{$blockId}' ); return false;">{ts}delete{/ts}</a></td>
{if $className eq 'CRM_Contact_Form_Contact'}
<div class="email-signature crm-collapsible collapsed">
<div class="collapsible-title">
{ts}Signature{/ts}
</div>
<div id="signatureBlock{$blockId}">
{$form.email.$blockId.signature_html.label}<br/>{$form.email.$blockId.signature_html.html}<br/>
{$form.email.$blockId.signature_text.label}<br/>{$form.email.$blockId.signature_text.html}
</div>
</div>
{/if}
</td>
<td align="center">{$form.email.$blockId.on_hold.html}</td>
{if $multipleBulk}
<td align="center" id="Email-Bulkmail-html">{$form.email.$blockId.is_bulkmail.html}</td>
{else}
<td align="center" id="Email-Bulkmail-html">{$form.email.$blockId.is_bulkmail.1.html}</td>
{/if}
<td align="center" id="Email-Primary-html" {if $blockId eq 1}class="hiddenElement"{/if}>
{$form.email.$blockId.is_primary.1.html}
</td>
{if $blockId gt 1}
<td>
<a href="#" title="{ts}Delete Email Block{/ts}" onClick="removeBlock( 'Email', '{$blockId}' ); return false;">{ts}delete{/ts}</a>
</td>
{/if}
</tr>
76 changes: 39 additions & 37 deletions templates/CRM/Contact/Form/Inline/Email.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,50 +26,52 @@
{* This file provides the template for inline editing of emails *}
{$form.oplock_ts.html}
<table class="crm-inline-edit-form">
<tr>
<td colspan="5">
<div class="crm-submit-buttons">
{include file="CRM/common/formButtons.tpl"}
</div>
</td>
</tr>
<tr>
<td>{ts}Email{/ts}&nbsp;
<tr>
<td colspan="5">
<div class="crm-submit-buttons">
{include file="CRM/common/formButtons.tpl"}
</div>
</td>
</tr>
<tr>
<td>{ts}Email{/ts}&nbsp;
{if $actualBlockCount lt 5 }
<span id="add-more-email" title="{ts}click to add more{/ts}"><a class="crm-hover-button action-item add-more-inline" href="#">{ts}add{/ts}</a></span>
<span id="add-more-email" title="{ts}click to add more{/ts}">
<a class="crm-hover-button action-item add-more-inline" href="#">{ts}add{/ts}</a>
</span>
{/if}
</td>
<td>{ts}On Hold?{/ts}</td>
<td>{ts}Bulk Mailings?{/ts}</td>
<td>{ts}Primary?{/ts}</td>
<td>&nbsp;</td>
</tr>
{section name='i' start=1 loop=$totalBlocks}
{assign var='blockId' value=$smarty.section.i.index}
<tr id="Email_Block_{$blockId}" {if $blockId gt $actualBlockCount}class="hiddenElement"{/if}>
<td>{$form.email.$blockId.email.html|crmAddClass:email}&nbsp;{$form.email.$blockId.location_type_id.html}</td>
<td align="center">{$form.email.$blockId.on_hold.html}</td>
{if $multipleBulk}
<td align="center">{$form.email.$blockId.is_bulkmail.html}</td>
{else}
<td align="center" class="crm-email-bulkmail">{$form.email.$blockId.is_bulkmail.1.html}</td>
{/if}
<td align="center" class="crm-email-is_primary">{$form.email.$blockId.is_primary.1.html}</td>
<td>
{if $blockId gt 1}
<a title="{ts}Delete Email{/ts}" class="crm-delete-inline crm-hover-button" href="#"><span
class="icon delete-icon"></span></a>
{/if}
</td>
<td>{ts}On Hold?{/ts}</td>
<td>{ts}Bulk Mailings?{/ts}</td>
<td>{ts}Primary?{/ts}</td>
<td>&nbsp;</td>
</tr>
{section name='i' start=1 loop=$totalBlocks}
{assign var='blockId' value=$smarty.section.i.index}
<tr id="Email_Block_{$blockId}" {if $blockId gt $actualBlockCount}class="hiddenElement"{/if}>
<td>{$form.email.$blockId.email.html|crmAddClass:email}&nbsp;{$form.email.$blockId.location_type_id.html}
</td>
<td align="center">{$form.email.$blockId.on_hold.html}</td>
{if $multipleBulk}
<td align="center">{$form.email.$blockId.is_bulkmail.html}</td>
{else}
<td align="center" class="crm-email-bulkmail">{$form.email.$blockId.is_bulkmail.1.html}</td>
{/if}
<td align="center" class="crm-email-is_primary">{$form.email.$blockId.is_primary.1.html}</td>
<td>
{if $blockId gt 1}
<a title="{ts}Delete Email{/ts}" class="crm-delete-inline crm-hover-button" href="#"><span class="icon delete-icon"></span></a>
{/if}
</td>
</tr>
{/section}
{/section}
</table>

{literal}
<script type="text/javascript">
CRM.$(function($) {
<script type="text/javascript">
CRM.$(function ($) {
// check first primary radio
$('#Email_1_IsPrimary').prop('checked', true );
$('#Email_1_IsPrimary').prop('checked', true);
});
</script>
</script>
{/literal}