CRM-15578 - Rename crmMailing2 to crmMailing

diff --git a/css/angular-crmMailing2.css b/css/angular-crmMailing.css
similarity index 100%
rename from css/angular-crmMailing2.css
rename to css/angular-crmMailing.css

diff --git a/js/angular-crmMailing2.js b/js/angular-crmMailing.js
similarity index 99%
rename from js/angular-crmMailing2.js
rename to js/angular-crmMailing.js
index 7ef4f0b85e945285e7bc4caad77df3ec5d16faef..d9157fd3320c4f41b7dde2d8b4920bb77fc97f59 100644 (file)
--- a/js/angular-crmMailing2.js
+++ b/js/angular-crmMailing.js
@@ -1,6 +1,6 @@
 (function (angular, $, _) {
   var partialUrl = function partialUrl(relPath) {
-    return CRM.resourceUrls['civicrm'] + '/partials/crmMailing2/' + relPath;
+    return CRM.resourceUrls['civicrm'] + '/partials/crmMailing/' + relPath;
   };
 
   angular.module('crmMailing', [

diff --git a/js/angular-crmMailing2-directives.js b/js/angular-crmMailing/directives.js
similarity index 99%
rename from js/angular-crmMailing2-directives.js
rename to js/angular-crmMailing/directives.js
index 5270579c3e3cb7b05978df16429f0cfe4add026e..bf1845fe209b8874bef9acdde402cd28b3214f43 100644 (file)
--- a/js/angular-crmMailing2-directives.js
+++ b/js/angular-crmMailing/directives.js
@@ -1,6 +1,6 @@
 (function (angular, $, _) {
   var partialUrl = function (relPath) {
-    return CRM.resourceUrls['civicrm'] + '/partials/crmMailing2/' + relPath;
+    return CRM.resourceUrls['civicrm'] + '/partials/crmMailing/' + relPath;
   };
 
   // The following directives have the same simple implementation -- load

diff --git a/js/angular-crmMailing2-services.js b/js/angular-crmMailing/services.js
similarity index 99%
rename from js/angular-crmMailing2-services.js
rename to js/angular-crmMailing/services.js
index 3d602c2a9c067ed375ad5f42a6fd42eb0aefe754..7ecca99e559024d7a855bf57e97a14d357a3f3ad 100644 (file)
--- a/js/angular-crmMailing2-services.js
+++ b/js/angular-crmMailing/services.js
@@ -1,6 +1,6 @@
 (function (angular, $, _) {
   var partialUrl = function (relPath) {
-    return CRM.resourceUrls['civicrm'] + '/partials/crmMailing2/' + relPath;
+    return CRM.resourceUrls['civicrm'] + '/partials/crmMailing/' + relPath;
   };
 
   // FIXME: surely there's already some helper which can do this in one line?

diff --git a/partials/crmMailing2/body_html.html b/partials/crmMailing/body_html.html
similarity index 100%
rename from partials/crmMailing2/body_html.html
rename to partials/crmMailing/body_html.html

diff --git a/partials/crmMailing2/body_text.html b/partials/crmMailing/body_text.html
similarity index 100%
rename from partials/crmMailing2/body_text.html
rename to partials/crmMailing/body_text.html

diff --git a/partials/crmMailing2/dialog/previewComponent.html b/partials/crmMailing/dialog/previewComponent.html
similarity index 100%
rename from partials/crmMailing2/dialog/previewComponent.html
rename to partials/crmMailing/dialog/previewComponent.html

diff --git a/partials/crmMailing2/dialog/previewFull.html b/partials/crmMailing/dialog/previewFull.html
similarity index 100%
rename from partials/crmMailing2/dialog/previewFull.html
rename to partials/crmMailing/dialog/previewFull.html

diff --git a/partials/crmMailing2/dialog/previewHtml.html b/partials/crmMailing/dialog/previewHtml.html
similarity index 100%
rename from partials/crmMailing2/dialog/previewHtml.html
rename to partials/crmMailing/dialog/previewHtml.html

diff --git a/partials/crmMailing2/dialog/previewText.html b/partials/crmMailing/dialog/previewText.html
similarity index 100%
rename from partials/crmMailing2/dialog/previewText.html
rename to partials/crmMailing/dialog/previewText.html

diff --git a/partials/crmMailing2/dialog/recipients.html b/partials/crmMailing/dialog/recipients.html
similarity index 100%
rename from partials/crmMailing2/dialog/recipients.html
rename to partials/crmMailing/dialog/recipients.html

diff --git a/partials/crmMailing2/dialog/saveTemplate.html b/partials/crmMailing/dialog/saveTemplate.html
similarity index 100%
rename from partials/crmMailing2/dialog/saveTemplate.html
rename to partials/crmMailing/dialog/saveTemplate.html

diff --git a/partials/crmMailing2/directive/recipients.html b/partials/crmMailing/directive/recipients.html
similarity index 100%
rename from partials/crmMailing2/directive/recipients.html
rename to partials/crmMailing/directive/recipients.html

diff --git a/partials/crmMailing2/edit-unified.html b/partials/crmMailing/edit-unified.html
similarity index 100%
rename from partials/crmMailing2/edit-unified.html
rename to partials/crmMailing/edit-unified.html

diff --git a/partials/crmMailing2/edit-unified2.html b/partials/crmMailing/edit-unified2.html
similarity index 100%
rename from partials/crmMailing2/edit-unified2.html
rename to partials/crmMailing/edit-unified2.html

diff --git a/partials/crmMailing2/edit-wizard.html b/partials/crmMailing/edit-wizard.html
similarity index 100%
rename from partials/crmMailing2/edit-wizard.html
rename to partials/crmMailing/edit-wizard.html

diff --git a/partials/crmMailing2/edit.html b/partials/crmMailing/edit.html
similarity index 100%
rename from partials/crmMailing2/edit.html
rename to partials/crmMailing/edit.html

diff --git a/partials/crmMailing2/field/README.md b/partials/crmMailing/field/README.md
similarity index 100%
rename from partials/crmMailing2/field/README.md
rename to partials/crmMailing/field/README.md

diff --git a/partials/crmMailing2/headerFooter.html b/partials/crmMailing/headerFooter.html
similarity index 100%
rename from partials/crmMailing2/headerFooter.html
rename to partials/crmMailing/headerFooter.html

diff --git a/partials/crmMailing2/mailing.html b/partials/crmMailing/mailing.html
similarity index 100%
rename from partials/crmMailing2/mailing.html
rename to partials/crmMailing/mailing.html

diff --git a/partials/crmMailing2/preview.html b/partials/crmMailing/preview.html
similarity index 100%
rename from partials/crmMailing2/preview.html
rename to partials/crmMailing/preview.html

diff --git a/partials/crmMailing2/publication.html b/partials/crmMailing/publication.html
similarity index 100%
rename from partials/crmMailing2/publication.html
rename to partials/crmMailing/publication.html

diff --git a/partials/crmMailing2/recipients.html b/partials/crmMailing/recipients.html
similarity index 100%
rename from partials/crmMailing2/recipients.html
rename to partials/crmMailing/recipients.html

diff --git a/partials/crmMailing2/responses.html b/partials/crmMailing/responses.html
similarity index 100%
rename from partials/crmMailing2/responses.html
rename to partials/crmMailing/responses.html

diff --git a/partials/crmMailing2/review.html b/partials/crmMailing/review.html
similarity index 100%
rename from partials/crmMailing2/review.html
rename to partials/crmMailing/review.html

diff --git a/partials/crmMailing2/schedule.html b/partials/crmMailing/schedule.html
similarity index 100%
rename from partials/crmMailing2/schedule.html
rename to partials/crmMailing/schedule.html

diff --git a/partials/crmMailing2/summary.html b/partials/crmMailing/summary.html
similarity index 100%
rename from partials/crmMailing2/summary.html
rename to partials/crmMailing/summary.html

diff --git a/partials/crmMailing2/tracking.html b/partials/crmMailing/tracking.html
similarity index 100%
rename from partials/crmMailing2/tracking.html
rename to partials/crmMailing/tracking.html