CRM-16145 - crmMailingAB - Rename partials

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index bad9cd7a852ffd6406f0e7d2daebbb76645b8ee2..816a30ca9507faa9bd80067a5fb6109428d19acf 100644 (file)
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -82,7 +82,7 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
         'js/angular-crmMailingAB/*.js',
       ),
       'css' => array('css/angular-crmMailingAB.css'),
-      'partials' => array('partials/crmMailingAB'),
+      'partials' => array('partials/crmMailingAB', 'ang/crmMailingAB'),
     );
     $result['crmD3'] = array(
       'ext' => 'civicrm',

diff --git a/partials/crmMailingAB/joint-mailing.html b/ang/crmMailingAB/BlockMailing.html
similarity index 100%
rename from partials/crmMailingAB/joint-mailing.html
rename to ang/crmMailingAB/BlockMailing.html

diff --git a/partials/crmMailingAB/setup.html b/ang/crmMailingAB/BlockSetup.html
similarity index 100%
rename from partials/crmMailingAB/setup.html
rename to ang/crmMailingAB/BlockSetup.html

diff --git a/partials/crmMailingAB/edit.html b/ang/crmMailingAB/EditCtrl/edit.html
similarity index 100%
rename from partials/crmMailingAB/edit.html
rename to ang/crmMailingAB/EditCtrl/edit.html

diff --git a/partials/crmMailingAB/main.html b/ang/crmMailingAB/EditCtrl/main.html
similarity index 50%
rename from partials/crmMailingAB/main.html
rename to ang/crmMailingAB/EditCtrl/main.html
index 2eabc680bc1a942b9518017facfe4a95bde52d95..15822f6e22c4b23759e21e7baaf629af642206f2 100644 (file)
--- a/partials/crmMailingAB/main.html
+++ b/ang/crmMailingAB/EditCtrl/main.html
@@ -5,6 +5,6 @@
 <div crm-ui-debug="abtest.mailings"></div>
 
 <form name="crmMailingAB" novalidate>
-  <div ng-include="'~/crmMailingAB/edit.html'" ng-if="!isSubmitted()"></div>
-  <div ng-include="'~/crmMailingAB/report.html'" ng-if="isSubmitted()"></div>
+  <div ng-include="'~/crmMailingAB/EditCtrl/edit.html'" ng-if="!isSubmitted()"></div>
+  <div ng-include="'~/crmMailingAB/EditCtrl/report.html'" ng-if="isSubmitted()"></div>
 </form>

diff --git a/partials/crmMailingAB/report.html b/ang/crmMailingAB/EditCtrl/report.html
similarity index 100%
rename from partials/crmMailingAB/report.html
rename to ang/crmMailingAB/EditCtrl/report.html

diff --git a/partials/crmMailingAB/list.html b/ang/crmMailingAB/ListCtrl.html
similarity index 100%
rename from partials/crmMailingAB/list.html
rename to ang/crmMailingAB/ListCtrl.html

diff --git a/partials/crmMailingAB/slider.html b/ang/crmMailingAB/Slider.html
similarity index 100%
rename from partials/crmMailingAB/slider.html
rename to ang/crmMailingAB/Slider.html

diff --git a/partials/crmMailingAB/selectWinner.html b/ang/crmMailingAB/WinnerDialogCtrl.html
similarity index 100%
rename from partials/crmMailingAB/selectWinner.html
rename to ang/crmMailingAB/WinnerDialogCtrl.html

diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js
index 5b5cef669050f8c386d527f462c9468baff692a1..cd94cbbde4e2fee374c64994a41755c51c138ead 100644 (file)
--- a/js/angular-crmMailingAB.js
+++ b/js/angular-crmMailingAB.js
@@ -5,7 +5,7 @@
     '$routeProvider',
     function ($routeProvider) {
       $routeProvider.when('/abtest', {
-        templateUrl: '~/crmMailingAB/list.html',
+        templateUrl: '~/crmMailingAB/ListCtrl.html',
         controller: 'CrmMailingABListCtrl',
         resolve: {
           mailingABList: function ($route, crmApi) {
@@ -29,7 +29,7 @@
         }
       });
       $routeProvider.when('/abtest/:id', {
-        templateUrl: '~/crmMailingAB/main.html',
+        templateUrl: '~/crmMailingAB/EditCtrl/main.html',
         controller: 'CrmMailingABEditCtrl',
         resolve: {
           abtest: function ($route, CrmMailingAB) {
@@ -171,7 +171,7 @@
           1: mailingName.toUpperCase()
         })
       });
-      return myAutosave.suspend(dialogService.open('selectWinnerDialog', '~/crmMailingAB/selectWinner.html', model, options));
+      return myAutosave.suspend(dialogService.open('selectWinnerDialog', '~/crmMailingAB/WinnerDialogCtrl.html', model, options));
     };
 
     // initialize

diff --git a/js/angular-crmMailingAB/directives.js b/js/angular-crmMailingAB/directives.js
index b557b9b88d365b2c574c4701b9515c81f93d0d54..4c3f5fb6050c3fa815b5fde6051c4533cdd6c10b 100644 (file)
--- a/js/angular-crmMailingAB/directives.js
+++ b/js/angular-crmMailingAB/directives.js
@@ -4,8 +4,8 @@
   //   scope.myAbtest = new CrmMailingAB();
   //   <crm-mailing-ab-block-mailing="{fromAddressA: 1, fromAddressB: 1}" crm-abtest="myAbtest" />
   var simpleDirectives = {
-    crmMailingAbBlockMailing: '~/crmMailingAB/joint-mailing.html',
-    crmMailingAbBlockSetup: '~/crmMailingAB/setup.html'
+    crmMailingAbBlockMailing: '~/crmMailingAB/BlockMailing.html',
+    crmMailingAbBlockSetup: '~/crmMailingAB/BlockSetup.html'
   };
   _.each(simpleDirectives, function (templateUrl, directiveName) {
     angular.module('crmMailingAB').directive(directiveName, function ($parse, crmMailingABCriteria, crmUiHelp) {
@@ -35,7 +35,7 @@
     return {
       require: '?ngModel',
       scope: {},
-      templateUrl: '~/crmMailingAB/slider.html',
+      templateUrl: '~/crmMailingAB/Slider.html',
       link: function (scope, element, attrs, ngModel) {
         var TEST_MIN = 1, TEST_MAX = 50;
         var sliders = $('.slider-test,.slider-win', element);