From e4820c18321562a4cddf4ff75376d25c9218ac5e Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Tue, 7 Apr 2015 17:07:28 -0700 Subject: [PATCH] CRM-16145 - crmMailingAB - Rename partials --- CRM/Mailing/Info.php | 2 +- .../crmMailingAB/BlockMailing.html | 0 .../setup.html => ang/crmMailingAB/BlockSetup.html | 0 .../crmMailingAB => ang/crmMailingAB/EditCtrl}/edit.html | 0 .../crmMailingAB => ang/crmMailingAB/EditCtrl}/main.html | 4 ++-- .../crmMailingAB => ang/crmMailingAB/EditCtrl}/report.html | 0 .../list.html => ang/crmMailingAB/ListCtrl.html | 0 .../slider.html => ang/crmMailingAB/Slider.html | 0 .../crmMailingAB/WinnerDialogCtrl.html | 0 js/angular-crmMailingAB.js | 6 +++--- js/angular-crmMailingAB/directives.js | 6 +++--- 11 files changed, 9 insertions(+), 9 deletions(-) rename partials/crmMailingAB/joint-mailing.html => ang/crmMailingAB/BlockMailing.html (100%) rename partials/crmMailingAB/setup.html => ang/crmMailingAB/BlockSetup.html (100%) rename {partials/crmMailingAB => ang/crmMailingAB/EditCtrl}/edit.html (100%) rename {partials/crmMailingAB => ang/crmMailingAB/EditCtrl}/main.html (50%) rename {partials/crmMailingAB => ang/crmMailingAB/EditCtrl}/report.html (100%) rename partials/crmMailingAB/list.html => ang/crmMailingAB/ListCtrl.html (100%) rename partials/crmMailingAB/slider.html => ang/crmMailingAB/Slider.html (100%) rename partials/crmMailingAB/selectWinner.html => ang/crmMailingAB/WinnerDialogCtrl.html (100%) diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php index bad9cd7a85..816a30ca95 100644 --- 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 2eabc680bc..15822f6e22 100644 --- a/partials/crmMailingAB/main.html +++ b/ang/crmMailingAB/EditCtrl/main.html @@ -5,6 +5,6 @@
-
-
+
+
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 5b5cef6690..cd94cbbde4 100644 --- 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 b557b9b88d..4c3f5fb605 100644 --- a/js/angular-crmMailingAB/directives.js +++ b/js/angular-crmMailingAB/directives.js @@ -4,8 +4,8 @@ // scope.myAbtest = new CrmMailingAB(); // 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); -- 2.25.1