From dcc7d5c9326d5a7f35a814aef4abf71944cfe525 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Wed, 17 Dec 2014 22:33:54 -0800 Subject: [PATCH] CRM-15578 - Rename crmMailing2 to crmMailing --- css/{angular-crmMailing2.css => angular-crmMailing.css} | 0 js/{angular-crmMailing2.js => angular-crmMailing.js} | 2 +- .../directives.js} | 2 +- .../services.js} | 2 +- partials/{crmMailing2 => crmMailing}/body_html.html | 0 partials/{crmMailing2 => crmMailing}/body_text.html | 0 .../{crmMailing2 => crmMailing}/dialog/previewComponent.html | 0 partials/{crmMailing2 => crmMailing}/dialog/previewFull.html | 0 partials/{crmMailing2 => crmMailing}/dialog/previewHtml.html | 0 partials/{crmMailing2 => crmMailing}/dialog/previewText.html | 0 partials/{crmMailing2 => crmMailing}/dialog/recipients.html | 0 partials/{crmMailing2 => crmMailing}/dialog/saveTemplate.html | 0 partials/{crmMailing2 => crmMailing}/directive/recipients.html | 0 partials/{crmMailing2 => crmMailing}/edit-unified.html | 0 partials/{crmMailing2 => crmMailing}/edit-unified2.html | 0 partials/{crmMailing2 => crmMailing}/edit-wizard.html | 0 partials/{crmMailing2 => crmMailing}/edit.html | 0 partials/{crmMailing2 => crmMailing}/field/README.md | 0 partials/{crmMailing2 => crmMailing}/headerFooter.html | 0 partials/{crmMailing2 => crmMailing}/mailing.html | 0 partials/{crmMailing2 => crmMailing}/preview.html | 0 partials/{crmMailing2 => crmMailing}/publication.html | 0 partials/{crmMailing2 => crmMailing}/recipients.html | 0 partials/{crmMailing2 => crmMailing}/responses.html | 0 partials/{crmMailing2 => crmMailing}/review.html | 0 partials/{crmMailing2 => crmMailing}/schedule.html | 0 partials/{crmMailing2 => crmMailing}/summary.html | 0 partials/{crmMailing2 => crmMailing}/tracking.html | 0 28 files changed, 3 insertions(+), 3 deletions(-) rename css/{angular-crmMailing2.css => angular-crmMailing.css} (100%) rename js/{angular-crmMailing2.js => angular-crmMailing.js} (99%) rename js/{angular-crmMailing2-directives.js => angular-crmMailing/directives.js} (99%) rename js/{angular-crmMailing2-services.js => angular-crmMailing/services.js} (99%) rename partials/{crmMailing2 => crmMailing}/body_html.html (100%) rename partials/{crmMailing2 => crmMailing}/body_text.html (100%) rename partials/{crmMailing2 => crmMailing}/dialog/previewComponent.html (100%) rename partials/{crmMailing2 => crmMailing}/dialog/previewFull.html (100%) rename partials/{crmMailing2 => crmMailing}/dialog/previewHtml.html (100%) rename partials/{crmMailing2 => crmMailing}/dialog/previewText.html (100%) rename partials/{crmMailing2 => crmMailing}/dialog/recipients.html (100%) rename partials/{crmMailing2 => crmMailing}/dialog/saveTemplate.html (100%) rename partials/{crmMailing2 => crmMailing}/directive/recipients.html (100%) rename partials/{crmMailing2 => crmMailing}/edit-unified.html (100%) rename partials/{crmMailing2 => crmMailing}/edit-unified2.html (100%) rename partials/{crmMailing2 => crmMailing}/edit-wizard.html (100%) rename partials/{crmMailing2 => crmMailing}/edit.html (100%) rename partials/{crmMailing2 => crmMailing}/field/README.md (100%) rename partials/{crmMailing2 => crmMailing}/headerFooter.html (100%) rename partials/{crmMailing2 => crmMailing}/mailing.html (100%) rename partials/{crmMailing2 => crmMailing}/preview.html (100%) rename partials/{crmMailing2 => crmMailing}/publication.html (100%) rename partials/{crmMailing2 => crmMailing}/recipients.html (100%) rename partials/{crmMailing2 => crmMailing}/responses.html (100%) rename partials/{crmMailing2 => crmMailing}/review.html (100%) rename partials/{crmMailing2 => crmMailing}/schedule.html (100%) rename partials/{crmMailing2 => crmMailing}/summary.html (100%) rename partials/{crmMailing2 => crmMailing}/tracking.html (100%) 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 7ef4f0b85e..d9157fd332 100644 --- 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 5270579c3e..bf1845fe20 100644 --- 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 3d602c2a9c..7ecca99e55 100644 --- 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 -- 2.25.1