CRM-15705 - edit,edit-wizard - Move mailing-name next to subject/recipients/etc

diff --git a/partials/crmMailing/edit-wizard.html b/partials/crmMailing/edit-wizard.html
index 50d0f44e97f3e335f950f53629e42901b729088e..b7cce60e9676ba0cea05dec6e29a6f3aa9915851 100644 (file)
--- a/partials/crmMailing/edit-wizard.html
+++ b/partials/crmMailing/edit-wizard.html
@@ -11,11 +11,8 @@
 
     <div crm-ui-wizard>
 
-      <div crm-ui-wizard-step crm-title="ts('Setup')" ng-form="setupForm">
-        <div crm-mailing-block-summary crm-mailing="mailing"/>
-      </div>
-
       <div crm-ui-wizard-step crm-title="ts('Content')" ng-form="contentForm">
+        <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 crm-mailing-body-html crm-mailing="mailing"/>

diff --git a/partials/crmMailing/edit.html b/partials/crmMailing/edit.html
index 4cf76b6abe0f3def53a93490d41727a309cfbe09..84869726c89c31c257ba3acc31f7614b174eee3a 100644 (file)
--- a/partials/crmMailing/edit.html
+++ b/partials/crmMailing/edit.html
@@ -11,11 +11,9 @@
   <div class="crm-block crm-form-block crmMailing">
     <div crm-ui-wizard>
       <div crm-ui-wizard-step crm-title="ts('Define Mailing')" ng-form="defineForm">
-        <div crm-ui-accordion crm-title="ts('Summary')">
-          <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 crm-mailing-block-summary crm-mailing="mailing"/>
             <div crm-mailing-block-mailing crm-mailing="mailing"/>
             <div crm-ui-accordion crm-title="ts('HTML')">
               <div crm-mailing-body-html crm-mailing="mailing"/>