From fd9c35cecb5dd0befa8b438ea169b86458292c99 Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Tue, 7 Apr 2015 23:46:47 -0700
Subject: [PATCH] CRM-16145 - crmMailing - Match .js and .html files for
 dialogs

---
 ang/crmMailing/EditRecipCtrl.js                             | 4 ++--
 ...ecipientOptions.html => EditRecipOptionsDialogCtrl.html} | 0
 ang/crmMailing/EmailBodyCtrl.js                             | 2 +-
 ang/crmMailing/{dialog => EmailBodyCtrl}/tokenAlert.html    | 0
 ang/crmMailing/MsgTemplateCtrl.js                           | 2 +-
 ang/crmMailing/PreviewComponentCtrl.js                      | 2 +-
 ...reviewComponent.html => PreviewComponentDialogCtrl.html} | 0
 .../{dialog/previewFull.html => PreviewMgr/full.html}       | 0
 .../{dialog/previewHtml.html => PreviewMgr/html.html}       | 0
 .../{dialog/previewText.html => PreviewMgr/text.html}       | 0
 .../{dialog/recipients.html => PreviewRecipCtrl.html}       | 0
 .../saveTemplate.html => SaveMsgTemplateDialogCtrl.html}    | 0
 ang/crmMailing/services.js                                  | 6 +++---
 13 files changed, 8 insertions(+), 8 deletions(-)
 rename ang/crmMailing/{dialog/recipientOptions.html => EditRecipOptionsDialogCtrl.html} (100%)
 rename ang/crmMailing/{dialog => EmailBodyCtrl}/tokenAlert.html (100%)
 rename ang/crmMailing/{dialog/previewComponent.html => PreviewComponentDialogCtrl.html} (100%)
 rename ang/crmMailing/{dialog/previewFull.html => PreviewMgr/full.html} (100%)
 rename ang/crmMailing/{dialog/previewHtml.html => PreviewMgr/html.html} (100%)
 rename ang/crmMailing/{dialog/previewText.html => PreviewMgr/text.html} (100%)
 rename ang/crmMailing/{dialog/recipients.html => PreviewRecipCtrl.html} (100%)
 rename ang/crmMailing/{dialog/saveTemplate.html => SaveMsgTemplateDialogCtrl.html} (100%)

diff --git a/ang/crmMailing/EditRecipCtrl.js b/ang/crmMailing/EditRecipCtrl.js
index 5e59ddd47d..e42d9cdcf4 100644
--- a/ang/crmMailing/EditRecipCtrl.js
+++ b/ang/crmMailing/EditRecipCtrl.js
@@ -64,7 +64,7 @@
           1: $scope.getRecipientsEstimate()
         })
       });
-      dialogService.open('recipDialog', '~/crmMailing/dialog/recipients.html', model, options);
+      dialogService.open('recipDialog', '~/crmMailing/PreviewRecipCtrl.html', model, options);
     };
 
     // Open a dialog for editing the advanced recipient options.
@@ -80,7 +80,7 @@
           fields: fields,
           mailing: mailing
         };
-        dialogService.open('previewComponentDialog', '~/crmMailing/dialog/recipientOptions.html', model, options);
+        dialogService.open('previewComponentDialog', '~/crmMailing/EditRecipOptionsDialogCtrl.html', model, options);
       });
     };
   });
diff --git a/ang/crmMailing/dialog/recipientOptions.html b/ang/crmMailing/EditRecipOptionsDialogCtrl.html
similarity index 100%
rename from ang/crmMailing/dialog/recipientOptions.html
rename to ang/crmMailing/EditRecipOptionsDialogCtrl.html
diff --git a/ang/crmMailing/EmailBodyCtrl.js b/ang/crmMailing/EmailBodyCtrl.js
index 08ce2d8bc0..7db0b7ecc6 100644
--- a/ang/crmMailing/EmailBodyCtrl.js
+++ b/ang/crmMailing/EmailBodyCtrl.js
@@ -31,7 +31,7 @@
         lastEmailTokenAlert = crmUiAlert({
           type: 'error',
           title: ts('Required tokens'),
-          templateUrl: '~/crmMailing/dialog/tokenAlert.html',
+          templateUrl: '~/crmMailing/EmailBodyCtrl/tokenAlert.html',
           scope: angular.extend($scope.$new(), {
             insertable: insertable,
             insertToken: function(token) {
diff --git a/ang/crmMailing/dialog/tokenAlert.html b/ang/crmMailing/EmailBodyCtrl/tokenAlert.html
similarity index 100%
rename from ang/crmMailing/dialog/tokenAlert.html
rename to ang/crmMailing/EmailBodyCtrl/tokenAlert.html
diff --git a/ang/crmMailing/MsgTemplateCtrl.js b/ang/crmMailing/MsgTemplateCtrl.js
index ebcd52e82f..d8873075a4 100644
--- a/ang/crmMailing/MsgTemplateCtrl.js
+++ b/ang/crmMailing/MsgTemplateCtrl.js
@@ -22,7 +22,7 @@
         width: '40%',
         title: ts('Save Template')
       });
-      return dialogService.open('saveTemplateDialog', '~/crmMailing/dialog/saveTemplate.html', model, options)
+      return dialogService.open('saveTemplateDialog', '~/crmMailing/SaveMsgTemplateDialogCtrl.html', model, options)
         .then(function(item) {
           mailing.msg_template_id = item.id;
           return item;
diff --git a/ang/crmMailing/PreviewComponentCtrl.js b/ang/crmMailing/PreviewComponentCtrl.js
index 4b99532539..3fd928a180 100644
--- a/ang/crmMailing/PreviewComponentCtrl.js
+++ b/ang/crmMailing/PreviewComponentCtrl.js
@@ -17,7 +17,7 @@
         autoOpen: false,
         title: title // component[0].name
       });
-      dialogService.open('previewComponentDialog', '~/crmMailing/dialog/previewComponent.html', component[0], options);
+      dialogService.open('previewComponentDialog', '~/crmMailing/PreviewComponentDialogCtrl.html', component[0], options);
     };
   });
 
diff --git a/ang/crmMailing/dialog/previewComponent.html b/ang/crmMailing/PreviewComponentDialogCtrl.html
similarity index 100%
rename from ang/crmMailing/dialog/previewComponent.html
rename to ang/crmMailing/PreviewComponentDialogCtrl.html
diff --git a/ang/crmMailing/dialog/previewFull.html b/ang/crmMailing/PreviewMgr/full.html
similarity index 100%
rename from ang/crmMailing/dialog/previewFull.html
rename to ang/crmMailing/PreviewMgr/full.html
diff --git a/ang/crmMailing/dialog/previewHtml.html b/ang/crmMailing/PreviewMgr/html.html
similarity index 100%
rename from ang/crmMailing/dialog/previewHtml.html
rename to ang/crmMailing/PreviewMgr/html.html
diff --git a/ang/crmMailing/dialog/previewText.html b/ang/crmMailing/PreviewMgr/text.html
similarity index 100%
rename from ang/crmMailing/dialog/previewText.html
rename to ang/crmMailing/PreviewMgr/text.html
diff --git a/ang/crmMailing/dialog/recipients.html b/ang/crmMailing/PreviewRecipCtrl.html
similarity index 100%
rename from ang/crmMailing/dialog/recipients.html
rename to ang/crmMailing/PreviewRecipCtrl.html
diff --git a/ang/crmMailing/dialog/saveTemplate.html b/ang/crmMailing/SaveMsgTemplateDialogCtrl.html
similarity index 100%
rename from ang/crmMailing/dialog/saveTemplate.html
rename to ang/crmMailing/SaveMsgTemplateDialogCtrl.html
diff --git a/ang/crmMailing/services.js b/ang/crmMailing/services.js
index 379f3b0944..fb9d904c24 100644
--- a/ang/crmMailing/services.js
+++ b/ang/crmMailing/services.js
@@ -399,9 +399,9 @@
       // @return Promise
       preview: function preview(mailing, mode) {
         var templates = {
-          html: '~/crmMailing/dialog/previewHtml.html',
-          text: '~/crmMailing/dialog/previewText.html',
-          full: '~/crmMailing/dialog/previewFull.html'
+          html: '~/crmMailing/PreviewMgr/html.html',
+          text: '~/crmMailing/PreviewMgr/text.html',
+          full: '~/crmMailing/PreviewMgr/full.html'
         };
         var result = null;
         var p = crmMailingMgr
-- 
2.25.1