From: Tim Otten <totten@civicrm.org>
Date: Fri, 31 Oct 2014 20:40:01 +0000 (-0700)
Subject: CRM-15578 - crmMailing2 - Add basic body_text / body_html
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f18897d3e0f39a00633d62315534e25e05a3016a;p=civicrm-core.git

CRM-15578 - crmMailing2 - Add basic body_text / body_html
---

diff --git a/js/angular-crmMailing2.js b/js/angular-crmMailing2.js
index 6d1dc013f1..d1a1af8370 100644
--- a/js/angular-crmMailing2.js
+++ b/js/angular-crmMailing2.js
@@ -16,6 +16,8 @@
       from: _.where(CRM.crmMailing.fromAddress, {is_default: "1"})[0].label,
       replyto_email: "",
       subject: "",
+      body_html: "",
+      body_text: "",
       visibility: "Public Pages",
       url_tracking: "1",
       dedupe_email: "1",
diff --git a/partials/crmMailing2/edit-unified.html b/partials/crmMailing2/edit-unified.html
index f723d0a25b..565fbbbe66 100644
--- a/partials/crmMailing2/edit-unified.html
+++ b/partials/crmMailing2/edit-unified.html
@@ -4,6 +4,13 @@
     <div ng-include="partialUrl('summary.html')"/>
     <div ng-include="partialUrl('mailing.html')" />
 
+    <div crm-ui-accordion crm-title="ts('HTML')">
+      <div ng-include="partialUrl('field/body_html.html')" />
+    </div>
+    <div crm-ui-accordion crm-title="ts('Plain Text')" crm-collapsed='true'>
+      <div ng-include="partialUrl('field/body_text.html')" />
+    </div>
+
     <div crm-ui-tab-set>
       <div crm-ui-tab id="tab-schedule" crm-title="ts('Schedule')">
         <div ng-include="partialUrl('schedule.html')" />
diff --git a/partials/crmMailing2/edit-wizard.html b/partials/crmMailing2/edit-wizard.html
index 297684dd20..34e5459549 100644
--- a/partials/crmMailing2/edit-wizard.html
+++ b/partials/crmMailing2/edit-wizard.html
@@ -9,6 +9,12 @@
 
       <div crm-ui-wizard-step crm-title="ts('Content')">
         <div ng-include="partialUrl('mailing.html')" />
+        <div crm-ui-accordion crm-title="ts('HTML')">
+          <div ng-include="partialUrl('field/body_html.html')" />
+        </div>
+        <div crm-ui-accordion crm-title="ts('Plain Text')" crm-collapsed='true'>
+          <div ng-include="partialUrl('field/body_text.html')" />
+        </div>
         <div crm-ui-accordion crm-title="ts('Header and Footer')" crm-collapsed="true">
           <div ng-include="partialUrl('headerFooter.html')" />
         </div>
diff --git a/partials/crmMailing2/edit.html b/partials/crmMailing2/edit.html
index f07f538bd3..0f7bbfc5b9 100644
--- a/partials/crmMailing2/edit.html
+++ b/partials/crmMailing2/edit.html
@@ -12,6 +12,12 @@
         <div crm-ui-tab-set>
           <div crm-ui-tab id="tab-mailing" crm-title="ts('Mailing')">
             <div ng-include="partialUrl('mailing.html')" />
+            <div crm-ui-accordion crm-title="ts('HTML')">
+              <div ng-include="partialUrl('field/body_html.html')" />
+            </div>
+            <div crm-ui-accordion crm-title="ts('Plain Text')" crm-collapsed='true'>
+              <div ng-include="partialUrl('field/body_text.html')" />
+            </div>
           </div>
           <div crm-ui-tab id="tab-attachment" crm-title="ts('Attachments')">
             <div ng-include="partialUrl('attachments.html')" />
diff --git a/partials/crmMailing2/field/README.md b/partials/crmMailing2/field/README.md
new file mode 100644
index 0000000000..4d65f0d609
--- /dev/null
+++ b/partials/crmMailing2/field/README.md
@@ -0,0 +1,3 @@
+This directory contains templates for various fields. This is a work-around
+for the 4.x series -- in the 5.x series, these files should be replaced by
+either (a) metadata-driven autowiring or (b) new directives.
diff --git a/partials/crmMailing2/field/body_html.html b/partials/crmMailing2/field/body_html.html
new file mode 100644
index 0000000000..8ad1f33a70
--- /dev/null
+++ b/partials/crmMailing2/field/body_html.html
@@ -0,0 +1,9 @@
+<!--
+Controller: EditMailingCtrl
+Required vars: mailing, crmMailingConst
+-->
+<div style="float: right;">
+  <input crm-mailing-token crm-for="body_html" />
+</div>
+
+<textarea name="body_html" ng-model="mailing.body_html"></textarea>
\ No newline at end of file
diff --git a/partials/crmMailing2/field/body_text.html b/partials/crmMailing2/field/body_text.html
new file mode 100644
index 0000000000..11f336a467
--- /dev/null
+++ b/partials/crmMailing2/field/body_text.html
@@ -0,0 +1,8 @@
+<!--
+Controller: EditMailingCtrl
+Required vars: mailing, crmMailingConst
+-->
+<div style="float: right;">
+  <input crm-mailing-token crm-for="body_text" />
+</div>
+<textarea name="body_text" ng-model="mailing.body_text"></textarea>
\ No newline at end of file