From: Tim Otten Date: Thu, 30 Oct 2014 22:19:39 +0000 (-0700) Subject: CRM-15578 - crmMailing2 - Add
, top-level CSS, and alternative layouts (/mailin... X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d4182dda77f3fe60f1d0a558be9cfb484d141968;p=civicrm-core.git CRM-15578 - crmMailing2 - Add , top-level CSS, and alternative layouts (/mailing2/new/unified, /mailing2/new/unified2, /mailing2/new/wizard) --- diff --git a/js/angular-crmMailing2.js b/js/angular-crmMailing2.js index d1e806d6cb..11ad303615 100644 --- a/js/angular-crmMailing2.js +++ b/js/angular-crmMailing2.js @@ -20,22 +20,42 @@ }; }; + var getMailing = function ($route, crmApi) { + return ($route.current.params.id == 'new') ? createMailing() : crmApi('Mailing', 'getsingle', {id: $route.current.params.id}); + }; + crmMailing2.config(['$routeProvider', function ($routeProvider) { $routeProvider.when('/mailing2', { template: '
', controller: 'ListMailingsCtrl' }); - $routeProvider.when('/mailing2/:id', { templateUrl: partialUrl('edit.html'), controller: 'EditMailingCtrl', resolve: { - selectedMail: function ($route, crmApi) { - return ($route.current.params.id == 'new') - ? createMailing() - : crmApi('Mailing', 'getsingle', {id: $route.current.params.id}); - } + selectedMail: getMailing + } + }); + $routeProvider.when('/mailing2/:id/unified', { + templateUrl: partialUrl('edit-unified.html'), + controller: 'EditMailingCtrl', + resolve: { + selectedMail: getMailing + } + }); + $routeProvider.when('/mailing2/:id/unified2', { + templateUrl: partialUrl('edit-unified2.html'), + controller: 'EditMailingCtrl', + resolve: { + selectedMail: getMailing + } + }); + $routeProvider.when('/mailing2/:id/wizard', { + templateUrl: partialUrl('edit-wizard.html'), + controller: 'EditMailingCtrl', + resolve: { + selectedMail: getMailing } }); } diff --git a/partials/crmMailing2/edit-unified.html b/partials/crmMailing2/edit-unified.html new file mode 100644 index 0000000000..f723d0a25b --- /dev/null +++ b/partials/crmMailing2/edit-unified.html @@ -0,0 +1,39 @@ + +
+ +
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + + +
+ \ No newline at end of file diff --git a/partials/crmMailing2/edit-unified2.html b/partials/crmMailing2/edit-unified2.html new file mode 100644 index 0000000000..a7eba60c4e --- /dev/null +++ b/partials/crmMailing2/edit-unified2.html @@ -0,0 +1,42 @@ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + +
+ \ No newline at end of file diff --git a/partials/crmMailing2/edit-wizard.html b/partials/crmMailing2/edit-wizard.html new file mode 100644 index 0000000000..297684dd20 --- /dev/null +++ b/partials/crmMailing2/edit-wizard.html @@ -0,0 +1,55 @@ +
+
+ +
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+
+ + + + + +
+
+ \ No newline at end of file diff --git a/partials/crmMailing2/edit.html b/partials/crmMailing2/edit.html index 5db03e2f2d..f07f538bd3 100644 --- a/partials/crmMailing2/edit.html +++ b/partials/crmMailing2/edit.html @@ -1,43 +1,55 @@ -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ 
{{mailing|json}}
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+ +
-
-
-
-
-
-
-
-
-
-
-
- + + + + +
- - - - -
\ No newline at end of file +