X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=partials%2FcrmMailing2%2Fedit-unified2.html;h=1c45e1a9450bd7329b07b089632ab0bcbc2f6aa5;hb=18da0e87cc18778c18001f0ced7c104fff28f1b4;hp=a7eba60c4ef64ef4d1936d0984abbf719b13881e;hpb=64c2aeba7eea943c799caafed1c82e4f383a1e2d;p=civicrm-core.git

diff --git a/partials/crmMailing2/edit-unified2.html b/partials/crmMailing2/edit-unified2.html
index a7eba60c4e..1c45e1a945 100644
--- a/partials/crmMailing2/edit-unified2.html
+++ b/partials/crmMailing2/edit-unified2.html
@@ -1,42 +1,43 @@
 <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 ng-include="partialUrl('attachments.html')" />
+      <div
+        ng-controller="CrmAttachmentsCtrl"
+        ng-init="init(attachments)"
+        ng-include="partialUrl('../crmAttachment/attachments.html')">
+      </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="send();
-      leave();">{{ts('Submit Mailing')}}</button>
-    <button ng-click="save();
-      leave();">{{ts('Save Draft')}}</button>
-    <button ng-click="cancel();
-      leave();">{{ts('Delete Draft')}}</button>
+    <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>