CRM-16145 - crmMailing - Match .js and .html files for dialogs

diff --git a/ang/crmMailing/EditRecipCtrl.js b/ang/crmMailing/EditRecipCtrl.js
index 5e59ddd47d21b8c6b400f5162b5bf74fd6f323fa..e42d9cdcf4fe3be17c541a4ef738bb4229fd2802 100644 (file)
--- 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 08ce2d8bc080aeb72615aaf4fe764fa143cbfb2f..7db0b7ecc6081fc07063cf11b4f258c6d929bb83 100644 (file)
--- 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 ebcd52e82f2e68ea5f5997fab2cf71c03e5e953b..d8873075a4a34b87a7091dd76c94c99a1e3cee4e 100644 (file)
--- 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 4b99532539a1661bdcf4b3e52620371601256397..3fd928a1800f49cdf066de9bd7c3ad02b4b57077 100644 (file)
--- 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 379f3b094441a344d559ab0cf9649bb28b00db7a..fb9d904c245a67ff6199d3d45e976b08e32cfac2 100644 (file)
--- 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