From ef4a9bcda35379f44021a9df5170cd9224ef7421 Mon Sep 17 00:00:00 2001
From: willie <willie@x201>
Date: Fri, 2 Jan 2015 21:34:54 -0800
Subject: [PATCH] Made message template form layout consistent with email
 composition layout

---
 CRM/Admin/Form/MessageTemplates.php           |  8 ++---
 templates/CRM/Admin/Form/MessageTemplates.tpl | 36 +++++++++----------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/CRM/Admin/Form/MessageTemplates.php b/CRM/Admin/Form/MessageTemplates.php
index 017a179224..aea941c058 100644
--- a/CRM/Admin/Form/MessageTemplates.php
+++ b/CRM/Admin/Form/MessageTemplates.php
@@ -158,10 +158,6 @@ class CRM_Admin_Form_MessageTemplates extends CRM_Admin_Form {
 
     $this->assign('tokens', CRM_Utils_Token::formatTokensForDisplay($tokens));
 
-    $this->add('textarea', 'msg_text', ts('Text Message'),
-      "cols=50 rows=6"
-    );
-
     // if not a system message use a wysiwyg editor, CRM-5971
     if ($this->_id &&
       CRM_Core_DAO::getFieldValue('CRM_Core_DAO_MessageTemplate',
@@ -182,6 +178,10 @@ class CRM_Admin_Form_MessageTemplates extends CRM_Admin_Form {
       );
     }
 
+    $this->add('textarea', 'msg_text', ts('Text Message'),
+      "cols=50 rows=6"
+    );
+
     $this->add('select', 'pdf_format_id', ts('PDF Page Format'),
       array(
         'null' => ts('- default -')) + CRM_Core_BAO_PdfFormat::getList(TRUE), FALSE
diff --git a/templates/CRM/Admin/Form/MessageTemplates.tpl b/templates/CRM/Admin/Form/MessageTemplates.tpl
index 63bbede47f..6c1c7afaf6 100644
--- a/templates/CRM/Admin/Form/MessageTemplates.tpl
+++ b/templates/CRM/Admin/Form/MessageTemplates.tpl
@@ -61,23 +61,6 @@
         <tr>
   </table>
 
-      <div class="crm-accordion-wrapper crm-plaint_text_email-accordion ">
-        <div class="crm-accordion-header">
-                {ts}Plain-Text Format{/ts}
-        </div><!-- /.crm-accordion-header -->
-            <div class="crm-accordion-body">
-              <div class="helpIcon" id="helptext">
-                <input class="crm-token-selector big" data-field="msg_text" />
-                {help id="id-token-text" tplFile=$tplFile file="CRM/Contact/Form/Task/Email.hlp"}
-              </div>
-              <div class="clear"></div>
-                <div class='text'>
-                    {$form.msg_text.html|crmAddClass:huge}
-                    <div class="description">{ts}Text formatted message.{/ts} {ts 1=$tokenDocsRepeated}Tokens may be included (%1).{/ts}</div>
-                </div>
-            </div><!-- /.crm-accordion-body -->
-      </div><!-- /.crm-accordion-wrapper -->
-
       <div class="crm-accordion-wrapper crm-html_email-accordion ">
         <div class="crm-accordion-header">
             {ts}HTML Format{/ts}
@@ -91,11 +74,28 @@
                 <div class="clear"></div>
                 <div class='html resizable-textarea'>
                     {$form.msg_html.html}
-                    <div class="description">{ts}You may optionally create an HTML formatted version of this message. It will be sent to contacts whose Email Format preference is 'HTML' or 'Both'.{/ts} {ts 1=$tokenDocsRepeated}Tokens may be included (%1).{/ts}</div>
+                    <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} {ts 1=$tokenDocsRepeated}Tokens may be included (%1).{/ts}</div>
                 </div>
         </div><!-- /.crm-accordion-body -->
       </div><!-- /.crm-accordion-wrapper -->
 
+      <div class="crm-accordion-wrapper crm-plaint_text_email-accordion ">
+        <div class="crm-accordion-header">
+                {ts}Plain-Text Format{/ts}
+        </div><!-- /.crm-accordion-header -->
+            <div class="crm-accordion-body">
+              <div class="helpIcon" id="helptext">
+                <input class="crm-token-selector big" data-field="msg_text" />
+                {help id="id-token-text" tplFile=$tplFile file="CRM/Contact/Form/Task/Email.hlp"}
+              </div>
+              <div class="clear"></div>
+                <div class='text'>
+                    {$form.msg_text.html|crmAddClass:huge}
+                    <div class="description">{ts}Text formatted message.{/ts} {ts 1=$tokenDocsRepeated}Tokens may be included (%1).{/ts}</div>
+                </div>
+            </div><!-- /.crm-accordion-body -->
+      </div><!-- /.crm-accordion-wrapper -->
+
       <div class="crm-accordion-wrapper crm-html_email-accordion ">
         <div class="crm-accordion-header">
             {$form.pdf_format_id.label}
-- 
2.25.1