From: Tim Otten <totten@civicrm.org>
Date: Fri, 30 Jan 2015 06:37:33 +0000 (-0800)
Subject: CRM-15705 - edit,edit-wizard - Move mailing-name next to subject/recipients/etc
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=48865fa6d3794f42f60b0b1cb7b690b49fb2f464;p=civicrm-core.git

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 50d0f44e97..b7cce60e96 100644
--- 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 4cf76b6abe..84869726c8 100644
--- 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"/>