crmMailingAB - Change "partials/abtesting" to "partials/crmMailingAB". Change routes...

The "/mailing/abtesting" route conflicted with the "/mailing/:id" route. The "abtesting" didn't match the module name.

diff --git a/js/angular-crmMailingAB-ReportCtrl.js b/js/angular-crmMailingAB-ReportCtrl.js
index a8da475ef0c848bb5c6db692e7b969a7333139d7..45ee3bb776685f307346625f39046cd92ee8a5d6 100644 (file)
--- a/js/angular-crmMailingAB-ReportCtrl.js
+++ b/js/angular-crmMailingAB-ReportCtrl.js
@@ -1,7 +1,7 @@
 (function (angular, $, _) {
 
   var partialUrl = function (relPath) {
-    return CRM.resourceUrls['civicrm'] + '/partials/abtesting/' + relPath;
+    return CRM.resourceUrls['civicrm'] + '/partials/crmMailingAB/' + relPath;
   };
   var crmMailingAB = angular.module('crmMailingAB');
 
@@ -38,7 +38,7 @@
         mail.id = selectedABTest.mailing_id_c;
         crmApi('Mailing', 'create', mail);
       });
-      $location.path('mailing/abtesting');
+      $location.path('abtest');
     };
 
     $scope.sendc = function () {
@@ -50,7 +50,7 @@
         mail.id = selectedABTest.mailing_id_c;
         crmApi('Mailing', 'create', mail);
       });
-      $location.path('mailing/abtesting');
+      $location.path('abtest');
     };
     var result = crmApi('Mailing', 'stats', {mailing_id: selectedABTest.mailing_id_a});
     $scope.r = [];

diff --git a/js/angular-crmMailingAB.js b/js/angular-crmMailingAB.js
index ba073cb29022d54c8db817379dc87ab0705ae63a..d872dbf2280d44c5a80937216712e6e8f0f7e316 100755 (executable)
--- a/js/angular-crmMailingAB.js
+++ b/js/angular-crmMailingAB.js
@@ -4,7 +4,7 @@
 (function (angular, $, _) {
 
   var partialUrl = function (relPath) {
-    return CRM.resourceUrls['civicrm'] + '/partials/abtesting/' + relPath;
+    return CRM.resourceUrls['civicrm'] + '/partials/crmMailingAB/' + relPath;
   };
   var crmMailingAB = angular.module('crmMailingAB', ['ngRoute', 'ui.utils', 'ngSanitize']);
 
@@ -16,7 +16,7 @@
   crmMailingAB.config([
     '$routeProvider',
     function ($routeProvider) {
-      $routeProvider.when('/mailing/abtesting', {
+      $routeProvider.when('/abtest', {
         templateUrl: partialUrl('list.html'),
         controller: 'ABListingCtrl',
         resolve: {
@@ -25,7 +25,7 @@
           }
         }
       });
-      $routeProvider.when('/mailing/abtesting/report/:id', {
+      $routeProvider.when('/abtest/report/:id', {
         templateUrl: partialUrl('report.html'),
         controller: 'ReportCtrl',
         resolve: {
@@ -34,7 +34,7 @@
           }
         }
       });
-      $routeProvider.when('/mailing/abtesting/:id', {
+      $routeProvider.when('/abtest/:id', {
         templateUrl: partialUrl('main.html'),
         controller: 'crmABTestingTabsCtrl',
         resolve: {
@@ -59,7 +59,7 @@
   // Ex: <crmAddName crm-options="['Alpha','Beta','Gamma']" crm-var="newItem" crm-on-add="callMyCreateFunction(newItem)" />
   /**
    * This controler lists the existing ABtests
-   * used on /partials/abtesting/list.html
+   * used on /partials/abtest/list.html
    * @returns mailingABList - object that contains the existing AB mailings
    * @returns testing_criteria - array that has the name of the different test types
    */

diff --git a/partials/abtesting/attachments.html b/partials/crmMailingAB/attachments.html
similarity index 100%
rename from partials/abtesting/attachments.html
rename to partials/crmMailingAB/attachments.html

diff --git a/partials/abtesting/compose.html b/partials/crmMailingAB/compose.html
similarity index 100%
rename from partials/abtesting/compose.html
rename to partials/crmMailingAB/compose.html

diff --git a/partials/abtesting/from_name.html b/partials/crmMailingAB/from_name.html
similarity index 100%
rename from partials/abtesting/from_name.html
rename to partials/crmMailingAB/from_name.html

diff --git a/partials/abtesting/headerfooter.html b/partials/crmMailingAB/headerfooter.html
similarity index 100%
rename from partials/abtesting/headerfooter.html
rename to partials/crmMailingAB/headerfooter.html

diff --git a/partials/abtesting/list.html b/partials/crmMailingAB/list.html
similarity index 68%
rename from partials/abtesting/list.html
rename to partials/crmMailingAB/list.html
index 6afd2ae78e5fdac984a42a80bfb448daf32089e6..99b691fde92a61cb3d34b1759c43a1a12fdf7c1b 100755 (executable)
--- a/partials/abtesting/list.html
+++ b/partials/crmMailingAB/list.html
@@ -23,8 +23,8 @@ Required vars: mailingABList
       <td>{{mailingAB.name}}</td>
       <td>{{mailingAB.id}}</td>
       <td>{{testing_criteria[mailingAB.testing_criteria_id]}}</td>
-      <td><a class="action-item crm-hover-button" ng-href="#/mailing/abtesting/{{mailingAB.id}}">Edit</a>&nbsp
-      <a class="action-item crm-hover-button" ng-href="#/mailing/abtesting/report/{{mailingAB.id}}">Results</a></td>
+      <td><a class="action-item crm-hover-button" ng-href="#/abtest/{{mailingAB.id}}">Edit</a>&nbsp
+      <a class="action-item crm-hover-button" ng-href="#/abtest/report/{{mailingAB.id}}">Results</a></td>
 
     </tr>
     </tbody>
@@ -39,5 +39,5 @@ Required vars: mailingABList
 
 <div class="crm-submit-buttons">
   <br>
-  <a ng-href="#/mailing/abtesting/new" class="button"><span><div class="icon add-icon"></div>New A/B Test</span></a>
+  <a ng-href="#/abtest/new" class="button"><span><div class="icon add-icon"></div>New A/B Test</span></a>
 </div>
\ No newline at end of file

diff --git a/partials/abtesting/main.html b/partials/crmMailingAB/main.html
similarity index 100%
rename from partials/abtesting/main.html
rename to partials/crmMailingAB/main.html

diff --git a/partials/abtesting/modal.html b/partials/crmMailingAB/modal.html
similarity index 100%
rename from partials/abtesting/modal.html
rename to partials/crmMailingAB/modal.html

diff --git a/partials/abtesting/next.html b/partials/crmMailingAB/next.html
similarity index 100%
rename from partials/abtesting/next.html
rename to partials/crmMailingAB/next.html

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

diff --git a/partials/abtesting/subject_lines.html b/partials/crmMailingAB/subject_lines.html
similarity index 100%
rename from partials/abtesting/subject_lines.html
rename to partials/crmMailingAB/subject_lines.html

diff --git a/partials/abtesting/tab1.html b/partials/crmMailingAB/tab1.html
similarity index 97%
rename from partials/abtesting/tab1.html
rename to partials/crmMailingAB/tab1.html
index 3fbc04214db5918dce8a58cf8a99ac65918556fb..ea8b8be83cba4f069268e3b27fd1fed9a75d570e 100755 (executable)
--- a/partials/abtesting/tab1.html
+++ b/partials/crmMailingAB/tab1.html
@@ -27,7 +27,7 @@
       <input type="submit"   ng-click=" tab1Form.$setPristine();  " ng-disabled="tab1Form.$invalid"  value="Next" nexttab="{{tab_val}}"/>
     </span>
     <span class="crm-button">
-      <input type="submit" ng-click="tab1Form.$setPristine(); goto('mailing/abtesting');" value="Cancel"/>
+      <input type="submit" ng-click="tab1Form.$setPristine(); goto('abtest');" value="Cancel"/>
     </span>
     </div>
   </div>

diff --git a/partials/abtesting/tab2.html b/partials/crmMailingAB/tab2.html
similarity index 93%
rename from partials/abtesting/tab2.html
rename to partials/crmMailingAB/tab2.html
index 7ad30af57b3948da2dbfca97bb5561fe8819b895..e1530a4ba463ed9c6907c240f904c61531e030c9 100755 (executable)
--- a/partials/abtesting/tab2.html
+++ b/partials/crmMailingAB/tab2.html
@@ -9,7 +9,7 @@
         <input type="submit" ng-click="tab2Form.$setPristine();" value="Next" ng-disabled="tab2Form.$invalid" submitform nexttab="{{tab_val}}"/>
       </span>
       <span class="crm-button">
-        <input type="submit" ng-click="tab2Form.$setPristine(); goto('mailing/abtesting');" value="Cancel"/>
+        <input type="submit" ng-click="tab2Form.$setPristine(); goto('abtest');" value="Cancel"/>
       </span>
     </div>
   </div>

diff --git a/partials/abtesting/tab3.html b/partials/crmMailingAB/tab3.html
similarity index 98%
rename from partials/abtesting/tab3.html
rename to partials/crmMailingAB/tab3.html
index c69218a030ecff3b32b5d9f6b67a05430fdf522e..cee220669f528d4af31c5f5f1297930ff67a1ab4 100755 (executable)
--- a/partials/abtesting/tab3.html
+++ b/partials/crmMailingAB/tab3.html
@@ -60,7 +60,7 @@
         <input type="submit" ng-click="tab3Form.$setPristine();" ng-disabled="tab3Form.$invalid" value="Next" nexttab="{{tab_val}}"/>
       </span>
       <span class="crm-button">
-        <input type="submit" ng-click="tab3Form.$setPristine(); goto('mailing/abtesting');" value="Cancel"/>
+        <input type="submit" ng-click="tab3Form.$setPristine(); goto('abtest');" value="Cancel"/>
       </span>
     </div>
   </div>

diff --git a/partials/abtesting/tab4.html b/partials/crmMailingAB/tab4.html
similarity index 95%
rename from partials/abtesting/tab4.html
rename to partials/crmMailingAB/tab4.html
index 0ba22dab0b0242c0d4d96208112c8807872a41ac..326a41530283cef00ae92879428ed50bc31f1856 100755 (executable)
--- a/partials/abtesting/tab4.html
+++ b/partials/crmMailingAB/tab4.html
@@ -76,10 +76,10 @@
         <input type="submit" ng-click="tab4Form.$setPristine();" value="Previous" prevtab/>
       </span>
       <span class="crm-button">
-        <input type="submit" ng-click="tab4Form.$setPristine();  startabtest(); goto('mailing/abtesting');" value="Submit & Send"/>
+        <input type="submit" ng-click="tab4Form.$setPristine();  startabtest(); goto('abtest');" value="Submit & Send"/>
       </span>
       <span class="crm-button">
-        <input type="submit" ng-click="tab4Form.$setPristine(); goto('mailing/abtesting');" value="Cancel"/>
+        <input type="submit" ng-click="tab4Form.$setPristine(); goto('abtest');" value="Cancel"/>
       </span>
     </div>
   </div>

diff --git a/partials/abtesting/trackandRespond.html b/partials/crmMailingAB/trackandRespond.html
similarity index 100%
rename from partials/abtesting/trackandRespond.html
rename to partials/crmMailingAB/trackandRespond.html

diff --git a/partials/abtesting/two_emails.html b/partials/crmMailingAB/two_emails.html
similarity index 100%
rename from partials/abtesting/two_emails.html
rename to partials/crmMailingAB/two_emails.html

diff --git a/partials/abtesting/uploadContent.html b/partials/crmMailingAB/uploadContent.html
similarity index 100%
rename from partials/abtesting/uploadContent.html
rename to partials/crmMailingAB/uploadContent.html