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.

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

Remove discussion about format from html box on email form #27734

Merged
merged 1 commit into from
Oct 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 2 additions & 3 deletions templates/CRM/Admin/Form/MessageTemplates.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,14 @@
<div class="clear"></div>
<div class='html'>
{$form.msg_html.html|crmAddClass:huge}
<div class="description">{ts}An HTML formatted version of this message will be sent to contacts whose Email Format preference is 'HTML' or 'Both'.{/ts}</div>
</div>
</div><!-- /.crm-accordion-body -->
</div><!-- /.crm-accordion-wrapper -->

<div id="msg_text_section" class="crm-accordion-wrapper crm-plaint_text_email-accordion ">
<div class="crm-accordion-header">
{ts}Plain-Text Format{/ts}
{ts}Optional Plain-Text Format{/ts}
{help id="id-message-plain" file="CRM/Contact/Form/Task/Email.hlp"}
</div><!-- /.crm-accordion-header -->
<div class="crm-accordion-body">
<div class="helpIcon" id="helptext">
Expand All @@ -95,7 +95,6 @@
<div class="clear"></div>
<div class='text'>
{$form.msg_text.html|crmAddClass:huge}
<div class="description">{ts}Text formatted message.{/ts}</div>
</div>
</div><!-- /.crm-accordion-body -->
</div><!-- /.crm-accordion-wrapper -->
Expand Down
12 changes: 10 additions & 2 deletions templates/CRM/Contact/Form/Task/Email.hlp
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,15 @@ be an equal sign and a number (=12). The number (12 in this example) is the id o
{ts}Message Text{/ts}
{/htxt}
{htxt id="id-message-text"}
<p>{ts}You can send your email as a simple text-only message, as an HTML formatted message, or both. Text-only messages are sufficient for most email communication - and some recipients may prefer not to receive HTML formatted messages.{/ts}</p>
<p>{ts}HTML messages have more visual impact, allow you to include images, and may be more readable if you are including links to website pages. However, different email programs may interpret HTML formats differently - so use this option cautiously unless you have a template format that has been tested with different web and desktop email programs.{/ts}</p>
<p>{ts}You can include tokens in your message{/ts}</p>
<p>{docURL page="user/common-workflows/tokens-and-mail-merge" text=$tokentext}</p>
{/htxt}
{htxt id="id-message-text-title"}
{ts}Message Plain Text{/ts}
{/htxt}
{htxt id="id-message-plain"}
<p>{ts}Configuring a plain text version of a message is optional will be removed from CiviCRM in a future version.{/ts}</p>
<p>{ts}If the text version is blank one will be automatically generated from the HTML content.{/ts}</p>
{capture assign=plainText}{ts}Find out more about including a plain text version{/ts}{/capture}
<p>{docURL page="user/common-workflows/tokens-and-mail-merge" text=$plainText}</p>
{/htxt}