Enotice fixes

I grepped for 'editor' being assigned & didn't find it. I think changed the editor to 'TextArea'
and didn't see the text inside the if so I concluded it is broken. Removing rather than
fixing cos no-one noticed it was broken so can't have been important (and probably the
wrong place for it)

diff --git a/templates/CRM/Contact/Form/Task/Email.tpl b/templates/CRM/Contact/Form/Task/Email.tpl
index c9b9b138a028fcc1db5a6c8ee5010a0e820f032f..f207fa500587fa49962e96d2a0ef00f98976372c 100644 (file)
--- a/templates/CRM/Contact/Form/Task/Email.tpl
+++ b/templates/CRM/Contact/Form/Task/Email.tpl
@@ -68,7 +68,7 @@
   {include file="CRM/Campaign/Form/addCampaignToComponent.tpl" campaignTrClass="crm-contactEmail-form-block-campaign_id"}
 </table>
 
-{include file="CRM/Contact/Form/Task/EmailCommon.tpl"}
+{include file="CRM/Contact/Form/Task/EmailCommon.tpl" noAttach=0}
 {include file="CRM/Activity/Form/FollowUp.tpl" type='email-'}
 
 <div class="spacer"> </div>

diff --git a/templates/CRM/Contact/Form/Task/EmailCommon.tpl b/templates/CRM/Contact/Form/Task/EmailCommon.tpl
index 6c0f69516e8944a17b3bff3ffa81c8c474f2a75d..644950ab62a1007546823c13a10f760ac91c15fa 100644 (file)
--- a/templates/CRM/Contact/Form/Task/EmailCommon.tpl
+++ b/templates/CRM/Contact/Form/Task/EmailCommon.tpl
@@ -21,10 +21,7 @@
   </div>
   <div class="clear"></div>
     <div class='html'>
-  {if !empty($editor) and $editor EQ 'textarea'}
-      <div class="help description">{ts}NOTE: If you are composing HTML-formatted messages, you may want to enable a Rich Text (WYSIWYG) editor (Administer &raquo; Customize Data & Screens &raquo; Display Preferences).{/ts}</div>
-  {/if}
-  {$form.html_message.html}<br />
+      {$form.html_message.html}<br />
     </div>
   </div><!-- /.crm-accordion-body -->
 </div><!-- /.crm-accordion-wrapper -->
@@ -59,7 +56,7 @@
    <div class="content">{$form.saveTemplateName.html|crmAddClass:huge}</div>
 </div>
 
-{if empty($noAttach)}
+{if !$noAttach}
     {include file="CRM/Form/attachment.tpl"}
 {/if}