From 18da0e87cc18778c18001f0ced7c104fff28f1b4 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Fri, 12 Dec 2014 16:30:15 -0800
Subject: [PATCH] CRM-15578 - crmMailing2 - Extract misc, simple directives

<div crm-mailing-block-header-footer crm-mailing="mailing"/>
<div crm-mailing-block-mailing crm-mailing="mailing"/>
<div crm-mailing-block-preview crm-mailing="mailing"/>
<div crm-mailing-block-publication crm-mailing="mailing"/>
<div crm-mailing-block-responses crm-mailing="mailing"/>
<div crm-mailing-block-review crm-mailing="mailing"/>
<div crm-mailing-block-schedule crm-mailing="mailing"/>
<div crm-mailing-block-summary crm-mailing="mailing"/>
<div crm-mailing-block-tracking crm-mailing="mailing"/>
<div crm-mailing-body-html crm-mailing="mailing" />
<div crm-mailing-body-text crm-mailing="mailing" />
---
 js/angular-crmMailing2-directives.js          | 43 +++++++++++++------
 .../crmMailing2/{field => }/body_html.html    |  1 -
 .../crmMailing2/{field => }/body_text.html    |  3 +-
 partials/crmMailing2/edit-unified.html        | 22 +++++-----
 partials/crmMailing2/edit-unified2.html       | 22 +++++-----
 partials/crmMailing2/edit-wizard.html         | 26 +++++------
 partials/crmMailing2/edit.html                | 24 ++++++-----
 .../crmMailing2/field/msg_template_id.html    | 13 ------
 partials/crmMailing2/field/recipients.html    | 27 ------------
 partials/crmMailing2/mailing.html             | 37 ++++++++++++++--
 10 files changed, 113 insertions(+), 105 deletions(-)
 rename partials/crmMailing2/{field => }/body_html.html (87%)
 rename partials/crmMailing2/{field => }/body_text.html (86%)
 delete mode 100644 partials/crmMailing2/field/msg_template_id.html
 delete mode 100644 partials/crmMailing2/field/recipients.html

diff --git a/js/angular-crmMailing2-directives.js b/js/angular-crmMailing2-directives.js
index 93abce664d..63387786df 100644
--- a/js/angular-crmMailing2-directives.js
+++ b/js/angular-crmMailing2-directives.js
@@ -5,19 +5,36 @@
 
   var crmMailing2 = angular.module('crmMailing2');
 
-  crmMailing2.directive('crmMailingBlockPublication', function ($parse) {
-    return {
-      scope: {
-        crmMailing: '@'
-      },
-      templateUrl: partialUrl('publication.html'),
-      link: function (scope, elm, attr) {
-        var model = $parse(attr.crmMailing);
-        scope.mailing = model(scope.$parent);
-        scope.crmMailingConst = CRM.crmMailing;
-        scope.ts = CRM.ts('CiviMail');
-      }
-    };
+  // The following directives have the same simple implementation -- load
+  // a template and export a "mailing" object into scope.
+  var simpleBlocks = {
+    crmMailingBlockHeaderFooter: partialUrl('headerFooter.html'),
+    crmMailingBlockMailing: partialUrl('mailing.html'),
+    crmMailingBlockPreview: partialUrl('preview.html'),
+    crmMailingBlockPublication: partialUrl('publication.html'),
+    crmMailingBlockResponses: partialUrl('responses.html'),
+    crmMailingBlockReview: partialUrl('review.html'),
+    crmMailingBlockSchedule: partialUrl('schedule.html'),
+    crmMailingBlockSummary: partialUrl('summary.html'),
+    crmMailingBlockTracking: partialUrl('tracking.html'),
+    crmMailingBodyHtml: partialUrl('body_html.html'),
+    crmMailingBodyText: partialUrl('body_text.html')
+  };
+  _.each(simpleBlocks, function(templateUrl, directiveName){
+    crmMailing2.directive(directiveName, function ($parse) {
+      return {
+        scope: {
+          crmMailing: '@'
+        },
+        templateUrl: templateUrl,
+        link: function (scope, elm, attr) {
+          var model = $parse(attr.crmMailing);
+          scope.mailing = model(scope.$parent);
+          scope.crmMailingConst = CRM.crmMailing;
+          scope.ts = CRM.ts('CiviMail');
+        }
+      };
+    });
   });
 
   crmMailing2.directive('crmMailingReviewBool', function () {
diff --git a/partials/crmMailing2/field/body_html.html b/partials/crmMailing2/body_html.html
similarity index 87%
rename from partials/crmMailing2/field/body_html.html
rename to partials/crmMailing2/body_html.html
index 5b30119e9c..4c4813f18b 100644
--- a/partials/crmMailing2/field/body_html.html
+++ b/partials/crmMailing2/body_html.html
@@ -1,5 +1,4 @@
 <!--
-Controller: EditMailingCtrl
 Required vars: mailing
 -->
 <div style="float: right;">
diff --git a/partials/crmMailing2/field/body_text.html b/partials/crmMailing2/body_text.html
similarity index 86%
rename from partials/crmMailing2/field/body_text.html
rename to partials/crmMailing2/body_text.html
index 11f336a467..c4dc4600dc 100644
--- a/partials/crmMailing2/field/body_text.html
+++ b/partials/crmMailing2/body_text.html
@@ -1,8 +1,7 @@
 <!--
-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
+<textarea name="body_text" ng-model="mailing.body_text"></textarea>
diff --git a/partials/crmMailing2/edit-unified.html b/partials/crmMailing2/edit-unified.html
index 48bd90b9fb..2a717e3ace 100644
--- a/partials/crmMailing2/edit-unified.html
+++ b/partials/crmMailing2/edit-unified.html
@@ -1,19 +1,19 @@
 <form name="crmMailing2">
   <div class="crm-block crm-form-block crmMailing2">
 
-    <div ng-include="partialUrl('summary.html')"/>
-    <div ng-include="partialUrl('mailing.html')" />
+    <div crm-mailing-block-summary crm-mailing="mailing"/>
+    <div crm-mailing-block-mailing crm-mailing="mailing"/>
 
     <div crm-ui-accordion crm-title="ts('HTML')">
-      <div ng-include="partialUrl('field/body_html.html')" />
+      <div crm-mailing-body-html crm-mailing="mailing"/>
     </div>
     <div crm-ui-accordion crm-title="ts('Plain Text')" crm-collapsed='true'>
-      <div ng-include="partialUrl('field/body_text.html')" />
+      <div crm-mailing-body-text crm-mailing="mailing"/>
     </div>
 
     <div crm-ui-tab-set>
       <div crm-ui-tab id="tab-schedule" crm-title="ts('Schedule')">
-        <div ng-include="partialUrl('schedule.html')" />
+        <div crm-mailing-block-schedule crm-mailing="mailing"/>
       </div>
       <div crm-ui-tab id="tab-attachment" crm-title="ts('Attachments')">
         <div
@@ -23,25 +23,25 @@
         </div>
       </div>
       <div crm-ui-tab id="tab-header" crm-title="ts('Header and Footer')">
-        <div ng-include="partialUrl('headerFooter.html')" />
+        <div crm-mailing-block-header-footer crm-mailing="mailing"/>
       </div>
       <div crm-ui-tab id="tab-pub" crm-title="ts('Publication')">
-        <div ng-include="partialUrl('publication.html')" />
+        <div crm-mailing-block-publication crm-mailing="mailing"/>
       </div>
       <div crm-ui-tab id="tab-response" crm-title="ts('Responses')">
-        <div ng-include="partialUrl('responses.html')" />
+        <div crm-mailing-block-responses crm-mailing="mailing"/>
       </div>
       <div crm-ui-tab id="tab-tracking" crm-title="ts('Tracking')">
-        <div ng-include="partialUrl('tracking.html')" />
+        <div crm-mailing-block-tracking crm-mailing="mailing"/>
       </div>
     </div>
 
     <div crm-ui-accordion crm-title="ts('Preview')">
-      <div ng-include="partialUrl('preview.html')" />
+      <div crm-mailing-block-preview crm-mailing="mailing"/>
     </div>
 
     <button ng-click="submit().then(leave)">{{ts('Submit Mailing')}}</button>
     <button ng-click="save().then(leave)">{{ts('Save Draft')}}</button>
     <button crm-confirm="{title:ts('Delete Draft?'), message:ts('Are you sure you want to delete the draft mailing?')}" on-yes="delete().then(leave)">{{ts('Delete Draft')}}</button>
   </div>
-</form>
\ No newline at end of file
+</form>
diff --git a/partials/crmMailing2/edit-unified2.html b/partials/crmMailing2/edit-unified2.html
index 983ee5d207..1c45e1a945 100644
--- a/partials/crmMailing2/edit-unified2.html
+++ b/partials/crmMailing2/edit-unified2.html
@@ -1,17 +1,17 @@
 <form name="crmMailing2">
   <div class="crm-block crm-form-block crmMailing2">
 
-    <div ng-include="partialUrl('summary.html')"/>
-    <div ng-include="partialUrl('mailing.html')" />
-    
+    <div crm-mailing-block-summary crm-mailing="mailing"/>
+    <div crm-mailing-block-mailing crm-mailing="mailing"/>
+
     <div crm-ui-accordion crm-title="ts('HTML')">
-      <div ng-include="partialUrl('field/body_html.html')" />
+      <div crm-mailing-body-html crm-mailing="mailing"/>
     </div>
     <div crm-ui-accordion crm-title="ts('Plain Text')" crm-collapsed='true'>
-      <div ng-include="partialUrl('field/body_text.html')" />
+      <div crm-mailing-body-text crm-mailing="mailing"/>
     </div>
     <div crm-ui-accordion id="tab-header" crm-title="ts('Header and Footer')" crm-collapsed='true'>
-      <div ng-include="partialUrl('headerFooter.html')" />
+      <div crm-mailing-block-header-footer crm-mailing="mailing"/>
     </div>
     <div crm-ui-accordion id="tab-attachment" crm-title="ts('Attachments')" crm-collapsed='true'>
       <div
@@ -21,19 +21,19 @@
       </div>
     </div>
     <div crm-ui-accordion id="tab-pub" crm-title="ts('Publication')" crm-collapsed='true'>
-      <div ng-include="partialUrl('publication.html')" />
+      <div crm-mailing-block-publication crm-mailing="mailing"/>
     </div>
     <div crm-ui-accordion id="tab-response" crm-title="ts('Responses')" crm-collapsed='true'>
-      <div ng-include="partialUrl('responses.html')" />
+      <div crm-mailing-block-responses crm-mailing="mailing"/>
     </div>
     <div crm-ui-accordion id="tab-tracking" crm-title="ts('Tracking')" crm-collapsed='true'>
-      <div ng-include="partialUrl('tracking.html')" />
+      <div crm-mailing-block-tracking crm-mailing="mailing"/>
     </div>
     <div crm-ui-accordion crm-title="ts('Preview')">
-      <div ng-include="partialUrl('preview.html')" />
+      <div crm-mailing-block-preview crm-mailing="mailing"/>
     </div>
     <div crm-ui-accordion id="tab-schedule" crm-title="ts('Schedule')">
-      <div ng-include="partialUrl('schedule.html')" />
+      <div crm-mailing-block-schedule crm-mailing="mailing"/>
     </div>
 
     <button ng-click="submit().then(leave)">{{ts('Submit Mailing')}}</button>
diff --git a/partials/crmMailing2/edit-wizard.html b/partials/crmMailing2/edit-wizard.html
index df1cbbff48..316404bc38 100644
--- a/partials/crmMailing2/edit-wizard.html
+++ b/partials/crmMailing2/edit-wizard.html
@@ -4,19 +4,19 @@
     <div crm-ui-wizard>
 
       <div crm-ui-wizard-step crm-title="ts('Setup')">
-        <div ng-include="partialUrl('summary.html')" />
+        <div crm-mailing-block-summary crm-mailing="mailing"/>
       </div>
 
       <div crm-ui-wizard-step crm-title="ts('Content')">
-        <div ng-include="partialUrl('mailing.html')" />
+        <div crm-mailing-block-mailing crm-mailing="mailing"/>
         <div crm-ui-accordion crm-title="ts('HTML')">
-          <div ng-include="partialUrl('field/body_html.html')" />
+          <div crm-mailing-body-html crm-mailing="mailing"/>
         </div>
         <div crm-ui-accordion crm-title="ts('Plain Text')" crm-collapsed='true'>
-          <div ng-include="partialUrl('field/body_text.html')" />
+          <div crm-mailing-body-text crm-mailing="mailing"/>
         </div>
         <div crm-ui-accordion crm-title="ts('Header and Footer')" crm-collapsed="true">
-          <div ng-include="partialUrl('headerFooter.html')" />
+          <div crm-mailing-block-header-footer crm-mailing="mailing"/>
         </div>
         <div crm-ui-accordion crm-title="ts('Attachments')" crm-collapsed="true">
           <div
@@ -26,32 +26,34 @@
           </div>
         </div>
         <div crm-ui-accordion crm-title="ts('Preview')">
-          <div ng-include="partialUrl('preview.html')" />
+          <div crm-mailing-block-preview crm-mailing="mailing"/>
         </div>
       </div>
 
       <div crm-ui-wizard-step crm-title="ts('Options')">
         <div crm-ui-accordion crm-title="ts('Schedule')">
-          <div ng-include="partialUrl('schedule.html')" />
+          <div crm-mailing-block-schedule crm-mailing="mailing"/>
         </div>
 
         <div crm-ui-accordion crm-title="ts('Responses')" crm-collapsed="true">
-          <div ng-include="partialUrl('responses.html')" />
+          <div crm-mailing-block-responses crm-mailing="mailing"/>
         </div>
         <div crm-ui-accordion crm-title="ts('Tracking')" crm-collapsed="true">
-          <div ng-include="partialUrl('tracking.html')" />
+          <div crm-mailing-block-tracking crm-mailing="mailing"/>
         </div>
         <div crm-ui-accordion crm-title="ts('Publication')" crm-collapsed="true">
-          <div ng-include="partialUrl('publication.html')" />
+          <div crm-mailing-block-publication crm-mailing="mailing"/>
         </div>
       </div>
 
       <div crm-ui-wizard-step crm-title="ts('Review')">
         <div crm-ui-accordion crm-title="ts('Review')">
-          <div ng-include="partialUrl('review.html')" />
+          <div crm-mailing-block-review crm-mailing="mailing"/>
         </div>
         <center>
-          <a class="crmMailing2-submit-button" ng-click="submit().then(leave)"><div>{{ts('Submit Mailing')}}</div></a>
+          <a class="crmMailing2-submit-button" ng-click="submit().then(leave)">
+            <div>{{ts('Submit Mailing')}}</div>
+          </a>
         </center>
       </div>
 
diff --git a/partials/crmMailing2/edit.html b/partials/crmMailing2/edit.html
index 654d7b9b4c..8ea23f7b65 100644
--- a/partials/crmMailing2/edit.html
+++ b/partials/crmMailing2/edit.html
@@ -7,16 +7,16 @@
     <div crm-ui-wizard>
       <div crm-ui-wizard-step crm-title="ts('Define Mailing')">
         <div crm-ui-accordion crm-title="ts('Summary')">
-          <div ng-include="partialUrl('summary.html')" />
+          <div crm-mailing-block-summary crm-mailing="mailing"/>
         </div>
         <div crm-ui-tab-set>
           <div crm-ui-tab id="tab-mailing" crm-title="ts('Mailing')">
-            <div ng-include="partialUrl('mailing.html')" />
+            <div crm-mailing-block-mailing crm-mailing="mailing"/>
             <div crm-ui-accordion crm-title="ts('HTML')">
-              <div ng-include="partialUrl('field/body_html.html')" />
+              <div crm-mailing-body-html crm-mailing="mailing"/>
             </div>
             <div crm-ui-accordion crm-title="ts('Plain Text')" crm-collapsed='true'>
-              <div ng-include="partialUrl('field/body_text.html')" />
+              <div crm-mailing-body-text crm-mailing="mailing"/>
             </div>
           </div>
           <div crm-ui-tab id="tab-attachment" crm-title="ts('Attachments')">
@@ -27,31 +27,33 @@
             </div>
           </div>
           <div crm-ui-tab id="tab-header" crm-title="ts('Header and Footer')">
-            <div ng-include="partialUrl('headerFooter.html')" />
+            <div crm-mailing-block-header-footer crm-mailing="mailing"/>
           </div>
           <div crm-ui-tab id="tab-pub" crm-title="ts('Publication')">
             <div crm-mailing-block-publication crm-mailing="mailing"/>
           </div>
           <div crm-ui-tab id="tab-response" crm-title="ts('Responses')">
-            <div ng-include="partialUrl('responses.html')" />
+            <div crm-mailing-block-responses crm-mailing="mailing"/>
           </div>
           <div crm-ui-tab id="tab-tracking" crm-title="ts('Tracking')">
-            <div ng-include="partialUrl('tracking.html')" />
+            <div crm-mailing-block-tracking crm-mailing="mailing"/>
           </div>
         </div>
         <div crm-ui-accordion crm-title="ts('Preview')">
-          <div ng-include="partialUrl('preview.html')" />
+          <div crm-mailing-block-preview crm-mailing="mailing"/>
         </div>
       </div>
       <div crm-ui-wizard-step crm-title="ts('Review and Schedule')">
         <div crm-ui-accordion crm-title="ts('Review')">
-          <div ng-include="partialUrl('review.html')" />
+          <div crm-mailing-block-review crm-mailing="mailing"/>
         </div>
         <div crm-ui-accordion crm-title="ts('Schedule')">
-          <div ng-include="partialUrl('schedule.html')" />
+          <div crm-mailing-block-schedule crm-mailing="mailing"/>
         </div>
         <center>
-          <a class="crmMailing2-submit-button" ng-click="submit().then(leave)"><div>{{ts('Submit Mailing')}}</div></a>
+          <a class="crmMailing2-submit-button" ng-click="submit().then(leave)">
+            <div>{{ts('Submit Mailing')}}</div>
+          </a>
         </center>
       </div>
 
diff --git a/partials/crmMailing2/field/msg_template_id.html b/partials/crmMailing2/field/msg_template_id.html
deleted file mode 100644
index b512c1eef7..0000000000
--- a/partials/crmMailing2/field/msg_template_id.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<span ng-controller="MsgTemplateCtrl">
-  <select
-    crm-ui-id="subform.msg_template_id"
-    name="msg_template_id"
-    crm-ui-select="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Message Template')}"
-    ng-model="mailing.msg_template_id"
-    ng-change="loadTemplate(mailing.msg_template_id)"
-    >
-    <option value=""></option>
-    <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
-  </select>
-  <a ng-click="saveTemplate()" class="crm-hover-button action-item" title="{{ts('Save As')}}"><span class="icon ui-icon-disk"></span></a>
-</span>
diff --git a/partials/crmMailing2/field/recipients.html b/partials/crmMailing2/field/recipients.html
deleted file mode 100644
index 1e86be96da..0000000000
--- a/partials/crmMailing2/field/recipients.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-Controller: EditMailingCtrl
-Required vars: mailing, crmMailingConst
--->
-<div ng-controller="EditRecipCtrl">
-  <div style="float: right;">
-    <div class='crmMailing2-recip-est'>
-      <a href="" ng-click="previewRecipients()">{{getRecipientsEstimate()}}</a>
-    </div>
-    <div>
-      <input name='dedupe_email' type='checkbox' ng-model='mailing.dedupe_email'  ng-true-value="1" ng-false-value="0" id="recipients-dedupe-email" />
-      <label for="recipients-dedupe-email">
-        {{ts('Dedupe')}}
-      </label>
-    </div>
-  </div>
-
-  <select crm-mailing-recipients
-          crm-mailing="mailing"
-          crm-avail-groups="crmMailingConst.groupNames | filter:{visibility:'Public pages'}"
-          crm-avail-mailings="crmMailingConst.civiMails | filter:{is_completed:1}"
-          name="recipients"
-          crm-ui-id="subform.recipients"
-          required
-          multiple>
-  </select>
-</div>
diff --git a/partials/crmMailing2/mailing.html b/partials/crmMailing2/mailing.html
index 1bb1c396ad..e559979fdc 100644
--- a/partials/crmMailing2/mailing.html
+++ b/partials/crmMailing2/mailing.html
@@ -5,8 +5,18 @@ Required vars: mailing, crmMailingConst
 <div class="crm-block" ng-form="subform" crm-ui-id-scope>
   <div class="crm-group">
     <div crm-ui-field="subform.msg_template_id" crm-title="ts('Template')" style="background: #bbf; width:100%; padding: 0.1em;">
-      <div>
-        <div ng-include="partialUrl('field/msg_template_id.html')"></div>
+      <div ng-controller="MsgTemplateCtrl">
+        <select
+          crm-ui-id="subform.msg_template_id"
+          name="msg_template_id"
+          crm-ui-select="{dropdownAutoWidth : true, allowClear: true, placeholder: ts('Message Template')}"
+          ng-model="mailing.msg_template_id"
+          ng-change="loadTemplate(mailing.msg_template_id)"
+          >
+          <option value=""></option>
+          <option ng-repeat="frm in crmMsgTemplates.getAll() | orderBy:'msg_title'" ng-value="frm.id">{{frm.msg_title}}</option>
+        </select>
+        <a ng-click="saveTemplate()" class="crm-hover-button action-item" title="{{ts('Save As')}}"><span class="icon ui-icon-disk"></span></a>
       </div>
     </div>
     <div crm-ui-field="subform.fromAddress" crm-title="ts('From')">
@@ -34,8 +44,27 @@ Required vars: mailing, crmMailingConst
       </select>
     </div>
     <div crm-ui-field="subform.recipients" crm-title="ts('Recipients')">
-      <div>
-        <div ng-include="partialUrl('field/recipients.html')"></div>
+      <div ng-controller="EditRecipCtrl">
+        <div style="float: right;">
+          <div class='crmMailing2-recip-est'>
+            <a href="" ng-click="previewRecipients()">{{getRecipientsEstimate()}}</a>
+          </div>
+          <div>
+            <input name='dedupe_email' type='checkbox' ng-model='mailing.dedupe_email'  ng-true-value="1" ng-false-value="0" id="recipients-dedupe-email" />
+            <label for="recipients-dedupe-email">
+              {{ts('Dedupe')}}
+            </label>
+          </div>
+        </div>
+        <select crm-mailing-recipients
+                crm-mailing="mailing"
+                crm-avail-groups="crmMailingConst.groupNames | filter:{visibility:'Public pages'}"
+                crm-avail-mailings="crmMailingConst.civiMails | filter:{is_completed:1}"
+                name="recipients"
+                crm-ui-id="subform.recipients"
+                required
+                multiple>
+        </select>
       </div>
     </div>
     <div crm-ui-field="subform.subject" crm-title="ts('Subject')">
-- 
2.25.1