From cb1507f47244dc1b6d5c04f308e5eaec09efa3d8 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Thu, 30 Oct 2014 22:50:02 -0700
Subject: [PATCH] CRM-15578 - crmMailing2 - Add "mailing.html"

---
 js/angular-crmMailing2.js         |  3 ++
 partials/crmMailing2/mailing.html | 59 ++++++++++++++++++++++++++++++-
 2 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/js/angular-crmMailing2.js b/js/angular-crmMailing2.js
index 23d3482e9a..6d1dc013f1 100644
--- a/js/angular-crmMailing2.js
+++ b/js/angular-crmMailing2.js
@@ -13,6 +13,9 @@
     return {
       name: "",
       campaign_id: null,
+      from: _.where(CRM.crmMailing.fromAddress, {is_default: "1"})[0].label,
+      replyto_email: "",
+      subject: "",
       visibility: "Public Pages",
       url_tracking: "1",
       dedupe_email: "1",
diff --git a/partials/crmMailing2/mailing.html b/partials/crmMailing2/mailing.html
index 7b52c8fc9a..978fd132c5 100644
--- a/partials/crmMailing2/mailing.html
+++ b/partials/crmMailing2/mailing.html
@@ -1 +1,58 @@
-mailing.html
+<!--
+Controller: EditMailingCtrl
+Required vars: mailing, crmMailingConst
+FIXME: Don't hardcode table-based layout!
+-->
+<table class="form-layout-compressed">
+  <tbody>
+    <tr>
+      <td class="label">
+        <label crm-ui-label crm-for="fromAddress">{{ts('From')}}</label>
+      </td>
+      <td>
+        <select
+          name="fromAddress"
+          ui-jq="select2"
+          ui-options="{dropdownAutoWidth : true, allowClear: false, placeholder: ts('Email address')}"
+          ng-model="mailing.from"
+          ng-options="frm.label as frm.label for frm in crmMailingConst.fromAddress"
+          required>
+          <option value=""></option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <label crm-ui-label crm-for="replyTo">{{ts('Reply-To')}}</label>
+      </td>
+      <td>
+        <select
+          name="replyTo"
+          ui-jq="select2"
+          ui-options="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Email address')}"
+          ng-model="mailing.replyto_email"
+          ng-options="frm.label as frm.label for frm in crmMailingConst.fromAddress"
+          >
+          <option value=""></option>
+        </select>
+      </td>
+    </tr>
+    <tr>
+      <td class="label">
+        <label crm-ui-label crm-for="subject">{{ts('Subject')}}</label>
+      </td>
+      <td>
+        <div style="float: right;">
+          <input crm-mailing-token crm-for="subject" />
+        </div>
+        <input
+          type="text"
+          class="crm-form-text"
+          ng-model="mailing.subject"
+          required
+          placeholder="Subject"
+          name="subject" />
+      </td>
+    </tr>
+  </tbody>
+</table>
-- 
2.25.1