From: Tim Otten Date: Mon, 3 Nov 2014 01:51:14 +0000 (-0800) Subject: CRM-15578 - crmMailing2 - Add "responses.html" X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1bbf688e1a64e55b185a25b4726ef889c8a59c1c;p=civicrm-core.git CRM-15578 - crmMailing2 - Add "responses.html" --- diff --git a/js/angular-crmMailing2.js b/js/angular-crmMailing2.js index d75cfe308e..4919b09511 100644 --- a/js/angular-crmMailing2.js +++ b/js/angular-crmMailing2.js @@ -10,6 +10,14 @@ * TODO Move to separate file or service */ var createMailing = function () { + var pickDefaultMailComponent = function(type) { + var mcs = _.where(CRM.crmMailing.headerfooterList, { + component_type:type, + is_default: "1" + }); + return (mcs.length >= 1) ? mcs[0].id : null; + }; + return { name: "", campaign_id: null, @@ -25,7 +33,12 @@ dedupe_email: "1", forward_replies: "0", auto_responder: "0", - open_tracking: "1" + open_tracking: "1", + override_verp: "1", + optout_id: pickDefaultMailComponent('OptOut'), + reply_id: pickDefaultMailComponent('Reply'), + resubscribe_id: pickDefaultMailComponent('Resubscribe'), + unsubscribe_id: pickDefaultMailComponent('Unsubscribe') }; }; diff --git a/partials/crmMailing2/responses.html b/partials/crmMailing2/responses.html index 07753eb589..8e28768c3b 100644 --- a/partials/crmMailing2/responses.html +++ b/partials/crmMailing2/responses.html @@ -1 +1,112 @@ -responses.html + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+
+ {{ts('Recipients\' replies are sent to a CiviMail specific address instead of the sender\'s address so they can be stored within CiviCRM.')}} +
+
+ + +
+
+ {{ts('If a recipient replies to this mailing, forward the reply to the FROM Email address specified for the mailing.')}} +
+
+ + +
+
+ {{ts('If a recipient replies to this mailing, send an automated reply using the selected message.')}} +
+
+ +
+ + + + + + + + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +