From 88e9e8831ac7ebe2d9649c551033e6d602e65770 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Wed, 17 Dec 2014 22:31:34 -0800
Subject: [PATCH] CRM-15578 - Rename crmMailing2 to crmMailing

---
 CRM/Mailing/Info.php                    |  2 +-
 css/angular-crmMailing2.css             | 34 ++++++++++++-------------
 js/angular-crmMailing2-directives.js    | 20 +++++++--------
 js/angular-crmMailing2-services.js      |  8 +++---
 js/angular-crmMailing2.js               | 26 +++++++++----------
 js/angular-crmMailingAB2.js             |  2 +-
 partials/crmMailing2/edit-unified.html  |  4 +--
 partials/crmMailing2/edit-unified2.html |  4 +--
 partials/crmMailing2/edit-wizard.html   |  6 ++---
 partials/crmMailing2/edit.html          |  6 ++---
 partials/crmMailing2/preview.html       | 12 ++++-----
 partials/crmMailing2/recipients.html    |  2 +-
 partials/crmMailing2/schedule.html      |  4 +--
 partials/crmMailingAB2/edit.html        |  4 +--
 14 files changed, 65 insertions(+), 69 deletions(-)

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index c9720d1937..1d47a7fefd 100644
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -57,7 +57,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
 
   public function getAngularModules() {
     $result = array();
-    $result['crmMailing2'] = array(
+    $result['crmMailing'] = array(
       'ext' => 'civicrm',
       'js' => array('js/angular-crmMailing2.js', 'js/angular-crmMailing2-services.js', 'js/angular-crmMailing2-directives.js'),
       'css' => array('css/angular-crmMailing2.css'),
diff --git a/css/angular-crmMailing2.css b/css/angular-crmMailing2.css
index fa2822b750..56235253df 100644
--- a/css/angular-crmMailing2.css
+++ b/css/angular-crmMailing2.css
@@ -1,16 +1,16 @@
-.crmMailing2 input[name=subject] {
+.crmMailing input[name=subject] {
   width: 30em;
 }
-.crmMailing2 select, .crmMailing2 input[type=text] {
+.crmMailing select, .crmMailing input[type=text] {
   width: 40em;
 }
-.crmMailing2 textarea {
+.crmMailing textarea {
   margin: 0.5em;
   width: 95%;
   height: 20em;
 }
 
-.crmMailing2-recip-est {
+.crmMailing-recip-est {
   background: #ee8;
   font-size: small;
   padding: 0.33em;
@@ -19,19 +19,19 @@
   text-align: center;
 }
 
-span.crmMailing2-include {
+span.crmMailing-include {
   color: #060;
 }
-span.crmMailing2-exclude {
+span.crmMailing-exclude {
   color: #600;
   text-decoration: line-through;
 }
 
-.crmMailing2 input[name=preview_test_email], .crmMailing2-preview select[name=preview_test_group] {
+.crmMailing input[name=preview_test_email], .crmMailing-preview select[name=preview_test_group] {
   width: 80%;
 }
 
-.crmMailing2 .preview-popup, .crmMailing2 .preview-contact, .crmMailing2 .preview-group {
+.crmMailing .preview-popup, .crmMailing .preview-contact, .crmMailing .preview-group {
   width: 30%;
   height: 4.5em;
   margin: 0.5em;
@@ -39,16 +39,16 @@ span.crmMailing2-exclude {
   vertical-align: middle;
   float: left;
 }
-.crmMailing2 .preview-popup, .crmMailing2 .preview-contact {
+.crmMailing .preview-popup, .crmMailing .preview-contact {
   border-right: 1px solid black;
 }
-.crmMailing2 .preview-group, .crmMailing2 .preview-contact {
+.crmMailing .preview-group, .crmMailing .preview-contact {
 }
 
-.crmMailing2 .crmMailing2-schedule-outer {
+.crmMailing .crmMailing-schedule-outer {
   width: 98%
 }
-.crmMailing2 .crmMailing2-schedule-inner {
+.crmMailing .crmMailing-schedule-inner {
   width: 40em;
   text-align: left;
   margin: auto;
@@ -67,12 +67,12 @@ input[name=preview_test_email]::-webkit-input-placeholder  {
 input[name=preview_test_email]:-ms-input-placeholder {
   text-align: center;
 }
-.crmMailing2-active {
+.crmMailing-active {
 }
-.crmMailing2-inactive {
+.crmMailing-inactive {
   text-decoration: line-through;
 }
-a.crmMailing2-submit-button div {
+a.crmMailing-submit-button div {
   color: black;
   background: #bfb;
   border: 1px solid #8a8;
@@ -80,10 +80,10 @@ a.crmMailing2-submit-button div {
   margin: 1em;
   width: 15em;
 }
-a.crmMailing2-submit-button div:hover {
+a.crmMailing-submit-button div:hover {
   background: #afa;
   border: 1px solid #7a7;
 }
-a.crmMailing2-submit-button:hover {
+a.crmMailing-submit-button:hover {
   text-decoration: none;
 }
diff --git a/js/angular-crmMailing2-directives.js b/js/angular-crmMailing2-directives.js
index 3f47dda6dd..5270579c3e 100644
--- a/js/angular-crmMailing2-directives.js
+++ b/js/angular-crmMailing2-directives.js
@@ -3,8 +3,6 @@
     return CRM.resourceUrls['civicrm'] + '/partials/crmMailing2/' + relPath;
   };
 
-  var crmMailing2 = angular.module('crmMailing2');
-
   // The following directives have the same simple implementation -- load
   // a template and export a "mailing" object into scope.
   var simpleBlocks = {
@@ -22,7 +20,7 @@
     crmMailingBodyText: partialUrl('body_text.html')
   };
   _.each(simpleBlocks, function(templateUrl, directiveName){
-    crmMailing2.directive(directiveName, function ($parse) {
+    angular.module('crmMailing').directive(directiveName, function ($parse) {
       return {
         scope: {
           crmMailing: '@'
@@ -43,7 +41,7 @@
   // example: <span crm-mailing-from-address="myPlaceholder" crm-mailing="myMailing"><select ng-model="myPlaceholder.label"></select></span>
   // NOTE: This really doesn't belong in a directive. I've tried (and failed) to make this work with a getterSetter binding, eg
   // <select ng-model="mailing.convertFromAddress" ng-model-options="{getterSetter: true}">
-  crmMailing2.directive('crmMailingFromAddress', function ($parse, crmFromAddresses) {
+  angular.module('crmMailing').directive('crmMailingFromAddress', function ($parse, crmFromAddresses) {
     return {
       link: function (scope, element, attrs) {
         var placeholder = attrs.crmMailingFromAddress;
@@ -65,7 +63,7 @@
   // Represent a datetime field as if it were a radio ('schedule.mode') and a datetime ('schedule.datetime').
   // example: <div crm-mailing-radio-date="mySchedule" crm-model="mailing.scheduled_date">...</div>
   // FIXME: use ngModel instead of adhoc crmModel
-  crmMailing2.directive('crmMailingRadioDate', function ($parse) {
+  angular.module('crmMailing').directive('crmMailingRadioDate', function ($parse) {
     return {
       link: function ($scope, element, attrs) {
         var schedModel = $parse(attrs.crmModel);
@@ -115,7 +113,7 @@
     };
   });
 
-  crmMailing2.directive('crmMailingReviewBool', function () {
+  angular.module('crmMailing').directive('crmMailingReviewBool', function () {
     return {
       scope: {
         crmOn: '@',
@@ -125,11 +123,11 @@
       link: function (scope, element, attrs) {
         function refresh() {
           if (scope.$parent.$eval(attrs.crmOn)) {
-            scope.spanClasses = {'crmMailing2-active': true};
+            scope.spanClasses = {'crmMailing-active': true};
             scope.iconClasses = {'ui-icon-check': true};
           }
           else {
-            scope.spanClasses = {'crmMailing2-inactive': true};
+            scope.spanClasses = {'crmMailing-inactive': true};
             scope.iconClasses = {'ui-icon-close': true};
           }
           scope.crmTitle = scope.$parent.$eval(attrs.crmTitle);
@@ -144,7 +142,7 @@
 
   // example: <input name="subject" /> <input crm-mailing-token crm-for="subject"/>
   // WISHLIST: Instead of global CRM.crmMailing.mailTokens, accept token list as an input
-  crmMailing2.directive('crmMailingToken', function () {
+  angular.module('crmMailing').directive('crmMailingToken', function () {
     return {
       require: '^crmUiIdScope',
       scope: {
@@ -188,7 +186,7 @@
 
   // example: <select multiple crm-mailing-recipients crm-mailing="mymailing" crm-avail-groups="myGroups" crm-avail-mailings="myMailings"></select>
   // FIXME: participate in ngModel's validation cycle
-  crmMailing2.directive('crmMailingRecipients', function () {
+  angular.module('crmMailing').directive('crmMailingRecipients', function () {
     return {
       restrict: 'AE',
       scope: {
@@ -260,7 +258,7 @@
           }
           var option = convertValueToObj(item.id);
           var icon = (option.entity_type === 'civicrm_mailing') ? 'EnvelopeIn.gif' : 'group.png';
-          var spanClass = (option.mode == 'exclude') ? 'crmMailing2-exclude' : 'crmMailing2-include';
+          var spanClass = (option.mode == 'exclude') ? 'crmMailing-exclude' : 'crmMailing-include';
           return "<img src='../../sites/all/modules/civicrm/i/" + icon + "' height=12 width=12 /> <span class='" + spanClass + "'>" + item.text + "</span>";
         }
 
diff --git a/js/angular-crmMailing2-services.js b/js/angular-crmMailing2-services.js
index b4e75979a6..3d602c2a9c 100644
--- a/js/angular-crmMailing2-services.js
+++ b/js/angular-crmMailing2-services.js
@@ -21,13 +21,11 @@
     return yyyy + "-" + mm + "-" + dd + " " + hh + ":" + min + ":" + sec;
   };
 
-  var crmMailing2 = angular.module('crmMailing2');
-
   // The representation of from/reply-to addresses is inconsistent in the mailing data-model,
   // so the UI must do some adaptation. The crmFromAddresses provides a richer way to slice/dice
   // the available "From:" addrs. Records are like the underlying OptionValues -- but add "email"
   // and "author".
-  crmMailing2.factory('crmFromAddresses', function ($q, crmApi) {
+  angular.module('crmMailing').factory('crmFromAddresses', function ($q, crmApi) {
     var emailRegex = /^"(.*)" \<([^@\>]*@[^@\>]*)\>$/;
     var addrs = _.map(CRM.crmMailing.fromAddress, function (addr) {
       var match = emailRegex.exec(addr.label);
@@ -74,7 +72,7 @@
     };
   });
 
-  crmMailing2.factory('crmMsgTemplates', function ($q, crmApi) {
+  angular.module('crmMailing').factory('crmMsgTemplates', function ($q, crmApi) {
     var tpls = _.map(CRM.crmMailing.mesTemplate, function (tpl) {
       return _.extend({}, tpl, {
         //id: tpl parseInt(tpl.id)
@@ -120,7 +118,7 @@
   });
 
   // The crmMailingMgr service provides business logic for loading, saving, previewing, etc
-  crmMailing2.factory('crmMailingMgr', function ($q, crmApi, crmFromAddresses) {
+  angular.module('crmMailing').factory('crmMailingMgr', function ($q, crmApi, crmFromAddresses) {
     var pickDefaultMailComponent = function pickDefaultMailComponent(type) {
       var mcs = _.where(CRM.crmMailing.headerfooterList, {
         component_type: type,
diff --git a/js/angular-crmMailing2.js b/js/angular-crmMailing2.js
index 70d4419cc8..7ef4f0b85e 100644
--- a/js/angular-crmMailing2.js
+++ b/js/angular-crmMailing2.js
@@ -3,7 +3,7 @@
     return CRM.resourceUrls['civicrm'] + '/partials/crmMailing2/' + relPath;
   };
 
-  var crmMailing2 = angular.module('crmMailing2', [
+  angular.module('crmMailing', [
     'crmUtil', 'crmAttachment', 'ngRoute', 'ui.utils', 'crmUi', 'dialogService'
   ]); // TODO ngSanitize, unsavedChanges
 
@@ -11,7 +11,7 @@
   var RECIPIENTS_DEBOUNCE_MS = 100;
   var RECIPIENTS_PREVIEW_LIMIT = 10000;
 
-  crmMailing2.config([
+  angular.module('crmMailing').config([
     '$routeProvider',
     function ($routeProvider) {
       $routeProvider.when('/mailing2', {
@@ -57,7 +57,7 @@
     }
   ]);
 
-  crmMailing2.controller('ListMailingsCtrl', function ListMailingsCtrl() {
+  angular.module('crmMailing').controller('ListMailingsCtrl', function ListMailingsCtrl() {
     // We haven't implemented this in Angular, but some users may get clever
     // about typing URLs, so we'll provide a redirect.
     window.location = CRM.url('civicrm/mailing/browse/unscheduled', {
@@ -66,7 +66,7 @@
     });
   });
 
-  crmMailing2.controller('EditMailingCtrl', function EditMailingCtrl($scope, selectedMail, $location, crmMailingMgr, crmStatus, CrmAttachments) {
+  angular.module('crmMailing').controller('EditMailingCtrl', function EditMailingCtrl($scope, selectedMail, $location, crmMailingMgr, crmStatus, CrmAttachments) {
     $scope.mailing = selectedMail;
     $scope.attachments = new CrmAttachments(function () {
       return {entity_table: 'civicrm_mailing', entity_id: $scope.mailing.id};
@@ -130,7 +130,7 @@
   // Scope members:
   //  - [input] mailing: object
   //  - [output] recipients: array of recipient records
-  crmMailing2.controller('EditRecipCtrl', function EditRecipCtrl($scope, dialogService, crmApi, crmMailingMgr) {
+  angular.module('crmMailing').controller('EditRecipCtrl', function EditRecipCtrl($scope, dialogService, crmApi, crmMailingMgr) {
     var ts = $scope.ts = CRM.ts('CiviMail');
     $scope.recipients = null;
     $scope.getRecipientsEstimate = function () {
@@ -225,7 +225,7 @@
   // Controller for the "Preview Recipients" dialog
   // Note: Expects $scope.model to be an object with properties:
   //   - recipients: array of contacts
-  crmMailing2.controller('PreviewRecipCtrl', function ($scope) {
+  angular.module('crmMailing').controller('PreviewRecipCtrl', function ($scope) {
     $scope.ts = CRM.ts('CiviMail');
   });
 
@@ -233,7 +233,7 @@
   // Note: Expects $scope.model to be an object with properties:
   //   - mailing: object
   //   - attachments: object
-  crmMailing2.controller('PreviewMailingCtrl', function ($scope, dialogService, crmMailingMgr, crmStatus) {
+  angular.module('crmMailing').controller('PreviewMailingCtrl', function ($scope, dialogService, crmMailingMgr, crmStatus) {
     var ts = $scope.ts = CRM.ts('CiviMail');
 
     $scope.testContact = {email: CRM.crmMailing.defaultTestEmail};
@@ -295,13 +295,13 @@
   //   - "subject"
   //   - "body_html"
   //   - "body_text"
-  crmMailing2.controller('PreviewMailingDialogCtrl', function PreviewMailingDialogCtrl($scope, crmMailingMgr) {
+  angular.module('crmMailing').controller('PreviewMailingDialogCtrl', function PreviewMailingDialogCtrl($scope, crmMailingMgr) {
     $scope.ts = CRM.ts('CiviMail');
   });
 
   // Controller for the "Preview Mailing Component" segment
   // which displays header/footer/auto-responder
-  crmMailing2.controller('PreviewComponentCtrl', function PreviewMailingDialogCtrl($scope, dialogService) {
+  angular.module('crmMailing').controller('PreviewComponentCtrl', function PreviewMailingDialogCtrl($scope, dialogService) {
     var ts = $scope.ts = CRM.ts('CiviMail');
 
     $scope.previewComponent = function previewComponent(title, componentId) {
@@ -327,12 +327,12 @@
   //   - "subject"
   //   - "body_html"
   //   - "body_text"
-  crmMailing2.controller('PreviewComponentDialogCtrl', function PreviewMailingDialogCtrl($scope) {
+  angular.module('crmMailing').controller('PreviewComponentDialogCtrl', function PreviewMailingDialogCtrl($scope) {
     $scope.ts = CRM.ts('CiviMail');
   });
 
   // Controller for the in-place msg-template management
-  crmMailing2.controller('MsgTemplateCtrl', function MsgTemplateCtrl($scope, crmMsgTemplates, dialogService, $parse) {
+  angular.module('crmMailing').controller('MsgTemplateCtrl', function MsgTemplateCtrl($scope, crmMsgTemplates, dialogService, $parse) {
     var ts = $scope.ts = CRM.ts('CiviMail');
     $scope.crmMsgTemplates = crmMsgTemplates;
 
@@ -378,7 +378,7 @@
   //       - "msg_subject": string
   //       - "msg_text": string
   //       - "msg_html": string
-  crmMailing2.controller('SaveMsgTemplateDialogCtrl', function SaveMsgTemplateDialogCtrl($scope, crmMsgTemplates, dialogService) {
+  angular.module('crmMailing').controller('SaveMsgTemplateDialogCtrl', function SaveMsgTemplateDialogCtrl($scope, crmMsgTemplates, dialogService) {
     var ts = $scope.ts = CRM.ts('CiviMail');
     $scope.saveOpt = {mode: '', newTitle: ''};
     $scope.selected = null;
@@ -441,7 +441,7 @@
     setTimeout(scopeApply(init), 0);
   });
 
-  crmMailing2.controller('EmailAddrCtrl', function EmailAddrCtrl($scope, crmFromAddresses){
+  angular.module('crmMailing').controller('EmailAddrCtrl', function EmailAddrCtrl($scope, crmFromAddresses){
     $scope.crmFromAddresses = crmFromAddresses;
   });
 })(angular, CRM.$, CRM._);
diff --git a/js/angular-crmMailingAB2.js b/js/angular-crmMailingAB2.js
index 687bd240c7..b391c222f8 100644
--- a/js/angular-crmMailingAB2.js
+++ b/js/angular-crmMailingAB2.js
@@ -7,7 +7,7 @@
     return CRM.resourceUrls['civicrm'] + '/partials/' + module + '/' + relPath;
   };
 
-  angular.module('crmMailingAB2', ['ngRoute', 'ui.utils', 'ngSanitize', 'crmUi', 'crmAttachment', 'crmMailing2']);
+  angular.module('crmMailingAB2', ['ngRoute', 'ui.utils', 'ngSanitize', 'crmUi', 'crmAttachment', 'crmMailing']);
   angular.module('crmMailingAB2').config([
     '$routeProvider',
     function ($routeProvider) {
diff --git a/partials/crmMailing2/edit-unified.html b/partials/crmMailing2/edit-unified.html
index 3018792931..548e6c46cf 100644
--- a/partials/crmMailing2/edit-unified.html
+++ b/partials/crmMailing2/edit-unified.html
@@ -2,8 +2,8 @@
   <pre>{{mailing|json}}</pre>
 </div>
 
-<form name="crmMailing2">
-  <div class="crm-block crm-form-block crmMailing2">
+<form name="crmMailing">
+  <div class="crm-block crm-form-block crmMailing">
 
     <div crm-mailing-block-summary crm-mailing="mailing"/>
     <div crm-mailing-block-mailing crm-mailing="mailing"/>
diff --git a/partials/crmMailing2/edit-unified2.html b/partials/crmMailing2/edit-unified2.html
index 43c574f71f..4f2905254c 100644
--- a/partials/crmMailing2/edit-unified2.html
+++ b/partials/crmMailing2/edit-unified2.html
@@ -2,8 +2,8 @@
   <pre>{{mailing|json}}</pre>
 </div>
 
-<form name="crmMailing2">
-  <div class="crm-block crm-form-block crmMailing2">
+<form name="crmMailing">
+  <div class="crm-block crm-form-block crmMailing">
 
     <div crm-mailing-block-summary crm-mailing="mailing"/>
     <div crm-mailing-block-mailing crm-mailing="mailing"/>
diff --git a/partials/crmMailing2/edit-wizard.html b/partials/crmMailing2/edit-wizard.html
index 17d5bc6c3e..472577ce72 100644
--- a/partials/crmMailing2/edit-wizard.html
+++ b/partials/crmMailing2/edit-wizard.html
@@ -2,8 +2,8 @@
   <pre>{{mailing|json}}</pre>
 </div>
 
-<form name="crmMailing2">
-  <div class="crm-block crm-form-block crmMailing2">
+<form name="crmMailing">
+  <div class="crm-block crm-form-block crmMailing">
 
     <div crm-ui-wizard>
 
@@ -51,7 +51,7 @@
           <div crm-mailing-block-review crm-mailing="mailing"/>
         </div>
         <center>
-          <a class="crmMailing2-submit-button" ng-click="submit().then(leave)">
+          <a class="crmMailing-submit-button" ng-click="submit().then(leave)">
             <div>{{ts('Submit Mailing')}}</div>
           </a>
         </center>
diff --git a/partials/crmMailing2/edit.html b/partials/crmMailing2/edit.html
index 3ca2458869..39db68f606 100644
--- a/partials/crmMailing2/edit.html
+++ b/partials/crmMailing2/edit.html
@@ -2,8 +2,8 @@
   <pre>{{mailing|json}}</pre>
 </div>
 
-<form name="crmMailing2" novalidate>
-  <div class="crm-block crm-form-block crmMailing2">
+<form name="crmMailing" novalidate>
+  <div class="crm-block crm-form-block crmMailing">
     <div crm-ui-wizard>
       <div crm-ui-wizard-step crm-title="ts('Define Mailing')">
         <div crm-ui-accordion crm-title="ts('Summary')">
@@ -47,7 +47,7 @@
           <div crm-mailing-block-schedule crm-mailing="mailing"/>
         </div>
         <center>
-          <a class="crmMailing2-submit-button" ng-click="submit().then(leave)">
+          <a class="crmMailing-submit-button" ng-click="submit().then(leave)">
             <div>{{ts('Submit Mailing')}}</div>
           </a>
         </center>
diff --git a/partials/crmMailing2/preview.html b/partials/crmMailing2/preview.html
index 61e2b59e96..65111542f7 100644
--- a/partials/crmMailing2/preview.html
+++ b/partials/crmMailing2/preview.html
@@ -1,4 +1,4 @@
-<div ng-controller="PreviewMailingCtrl" class="crmMailing2-preview">
+<div ng-controller="PreviewMailingCtrl" class="crmMailing-preview">
   <!-- Note:
   In Firefox (at least), clicking the preview buttons causes the browser to display validation warnings
   for unrelated fields *and* display preview. To avoid this weird UX, we disable preview buttons when the form is incomplete/invalid.
@@ -8,14 +8,14 @@
       <em>({{ts('No content to preview')}})</em>
     </div>
     <div ng-hide="!mailing.body_html">
-      <button ng-disabled="crmMailing2.$invalid" ng-click="previewHtml()">{{ts('Preview as HTML')}}</button>
+      <button ng-disabled="crmMailing.$invalid" ng-click="previewHtml()">{{ts('Preview as HTML')}}</button>
     </div>
     <div ng-hide="!mailing.body_text">
-      <button ng-disabled="crmMailing2.$invalid" ng-click="previewText()">{{ts('Preview as Plain Text')}}</button>
+      <button ng-disabled="crmMailing.$invalid" ng-click="previewText()">{{ts('Preview as Plain Text')}}</button>
     </div>
     <!--
     <div ng-hide="!mailing.body_html && !mailing.body_text">
-      <button ng-disabled="crmMailing2.$invalid" ng-click="previewFull()">{{ts('Preview')}}</button>
+      <button ng-disabled="crmMailing.$invalid" ng-click="previewFull()">{{ts('Preview')}}</button>
     </div>
     -->
   </div>
@@ -32,7 +32,7 @@
         placeholder="example@example.org"
         />
     </div>
-    <button ng-disabled="crmMailing2.$invalid || !testContact.email" ng-click="sendTestToContact()">{{ts('Send test')}}</button>
+    <button ng-disabled="crmMailing.$invalid || !testContact.email" ng-click="sendTestToContact()">{{ts('Send test')}}</button>
   </div>
   <div class="preview-group" ng-form>
     <div>
@@ -49,7 +49,7 @@
         <option value=""></option>
       </select>
     </div>
-    <button ng-disabled="crmMailing2.$invalid || !testGroup.gid" ng-click="sendTestToGroup()">{{ts('Send test')}}</button>
+    <button ng-disabled="crmMailing.$invalid || !testGroup.gid" ng-click="sendTestToGroup()">{{ts('Send test')}}</button>
   </div>
   <div class="clear"></div>
 </div>
diff --git a/partials/crmMailing2/recipients.html b/partials/crmMailing2/recipients.html
index 370f3d7aa0..f8f3884715 100644
--- a/partials/crmMailing2/recipients.html
+++ b/partials/crmMailing2/recipients.html
@@ -1,6 +1,6 @@
 <div ng-controller="EditRecipCtrl">
   <div style="float: right;">
-    <div class='crmMailing2-recip-est'>
+    <div class='crmMailing-recip-est'>
       <a href="" ng-click="previewRecipients()">{{getRecipientsEstimate()}}</a>
     </div>
     <div>
diff --git a/partials/crmMailing2/schedule.html b/partials/crmMailing2/schedule.html
index 92c9039822..a68afcd6fd 100644
--- a/partials/crmMailing2/schedule.html
+++ b/partials/crmMailing2/schedule.html
@@ -1,5 +1,5 @@
-<div class="crmMailing2-schedule-outer" crm-mailing-radio-date="schedule" crm-model="mailing.scheduled_date">
-  <div class="crmMailing2-schedule-inner">
+<div class="crmMailing-schedule-outer" crm-mailing-radio-date="schedule" crm-model="mailing.scheduled_date">
+  <div class="crmMailing-schedule-inner">
     <div>
       <input ng-model="schedule.mode" type="radio" name="send" value="now" id="schedule-send-now"/>
       <label for="schedule-send-now">{{ts('Send immediately')}}</label>
diff --git a/partials/crmMailingAB2/edit.html b/partials/crmMailingAB2/edit.html
index a9c031a360..560a4c9565 100644
--- a/partials/crmMailingAB2/edit.html
+++ b/partials/crmMailingAB2/edit.html
@@ -11,7 +11,7 @@
 -->
 
 <form name="crmMailingAB2" novalidate>
-  <div class="crm-block crm-form-block crmMailing2">
+  <div class="crm-block crm-form-block crmMailing">
     <div crm-ui-wizard>
       <div crm-ui-wizard-step="10" crm-title="ts('Setup')">
         <div
@@ -164,7 +164,7 @@
           }"
           crm-abtest="abtest"></div>
         <center>
-          <a class="crmMailing2-submit-button" ng-click="submit().then(leave)">
+          <a class="crmMailing-submit-button" ng-click="submit().then(leave)">
             <div>{{ts('Submit Mailing')}}</div>
           </a>
         </center>
-- 
2.25.1