CRM-15578 - Rename crmMailing2 to crmMailing

diff --git a/CRM/Mailing/Info.php b/CRM/Mailing/Info.php
index 1d47a7fefd2e4d93ed027925c9dc3f2c892aa354..5e117c770b6f92c265d5e5ec5be72b76bd9f3d97 100644 (file)
--- a/CRM/Mailing/Info.php
+++ b/CRM/Mailing/Info.php
@@ -59,8 +59,8 @@ class CRM_Mailing_Info extends CRM_Core_Component_Info {
     $result = 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'),
+      'js' => array('js/angular-crmMailing.js', 'js/angular-crmMailing/services.js', 'js/angular-crmMailing/directives.js'),
+      'css' => array('css/angular-crmMailing.css'),
     );
     $result['crmMailingAB2'] = array(
       'ext' => 'civicrm',

diff --git a/js/angular-crmMailing.js b/js/angular-crmMailing.js
index d9157fd3320c4f41b7dde2d8b4920bb77fc97f59..6fd49879648114fe73469a2ce93cfa35cd4c6b52 100644 (file)
--- a/js/angular-crmMailing.js
+++ b/js/angular-crmMailing.js
@@ -14,11 +14,11 @@
   angular.module('crmMailing').config([
     '$routeProvider',
     function ($routeProvider) {
-      $routeProvider.when('/mailing2', {
+      $routeProvider.when('/mailing', {
         template: '<div></div>',
         controller: 'ListMailingsCtrl'
       });
-      $routeProvider.when('/mailing2/:id', {
+      $routeProvider.when('/mailing/:id', {
         templateUrl: partialUrl('edit.html'),
         controller: 'EditMailingCtrl',
         resolve: {
@@ -27,7 +27,7 @@
           }
         }
       });
-      $routeProvider.when('/mailing2/:id/unified', {
+      $routeProvider.when('/mailing/:id/unified', {
         templateUrl: partialUrl('edit-unified.html'),
         controller: 'EditMailingCtrl',
         resolve: {
@@ -36,7 +36,7 @@
           }
         }
       });
-      $routeProvider.when('/mailing2/:id/unified2', {
+      $routeProvider.when('/mailing/:id/unified2', {
         templateUrl: partialUrl('edit-unified2.html'),
         controller: 'EditMailingCtrl',
         resolve: {
@@ -45,7 +45,7 @@
           }
         }
       });
-      $routeProvider.when('/mailing2/:id/wizard', {
+      $routeProvider.when('/mailing/:id/wizard', {
         templateUrl: partialUrl('edit-wizard.html'),
         controller: 'EditMailingCtrl',
         resolve: {
@@ -113,10 +113,10 @@
       });
     };
 
-    // Transition URL "/mailing2/new" => "/mailing2/123" as soon as ID is known
+    // Transition URL "/mailing/new" => "/mailing/123" as soon as ID is known
     $scope.$watch('mailing.id', function (newValue, oldValue) {
       if (newValue && newValue != oldValue) {
-        var parts = $location.path().split('/'); // e.g. "/mailing2/new" or "/mailing2/123/wizard"
+        var parts = $location.path().split('/'); // e.g. "/mailing/new" or "/mailing/123/wizard"
         parts[2] = newValue;
         $location.path(parts.join('/'));
         $location.replace();