From 2cdff1d69ea148854708baf1e2e3be4d263d88f2 Mon Sep 17 00:00:00 2001 From: Siddhant Rajagopalan Date: Sun, 22 Jun 2014 18:47:38 +0530 Subject: [PATCH] screens look like theyre supposed to --- js/angular-newMailing.js | 29 ++++++++++++++++---- partials/crmMailingType/composeonScreen.html | 17 ++++++++++++ partials/crmMailingType/content.html | 6 ++-- partials/crmMailingType/headerandFooter.html | 23 ++++++++++++++++ partials/crmMailingType/ht.html | 4 +++ partials/crmMailingType/plainText.html | 4 +++ partials/crmMailingType/previewMailing.html | 1 + partials/crmMailingType/sched.html | 22 +++++++++++++++ partials/crmMailingType/send.html | 6 ++-- partials/crmMailingType/test.html | 24 ++++++++++++++++ partials/crmMailingType/uploadContent.html | 17 ++++++++++++ 11 files changed, 142 insertions(+), 11 deletions(-) create mode 100644 partials/crmMailingType/ht.html create mode 100644 partials/crmMailingType/plainText.html create mode 100644 partials/crmMailingType/uploadContent.html diff --git a/js/angular-newMailing.js b/js/angular-newMailing.js index ad29fb5ecb..be85cf8d0f 100644 --- a/js/angular-newMailing.js +++ b/js/angular-newMailing.js @@ -32,7 +32,7 @@ return crmApi('Mailing', 'getsingle', {id: $route.current.params.id}); } else { - return {name: "New Mail", visibility: "Public Pages", url_tracking:"1", forward_replies:"0", auto_responder:"0", open_tracking:"1", + return {name: "New Mail", visibility: "Public Pages", url_tracking:"1", forward_replies:"0", created_id: "202", auto_responder:"0", open_tracking:"1", }; } } @@ -55,11 +55,13 @@ $scope.groupNamesList = CRM.crmMailing.groupNames; $scope.incGroup = []; $scope.excGroup = []; - $scope.currentMailing = selectedMail; - window.ct = $scope.currentMailing; - $scope.acttab=0; + $scope.testGroup = []; + $scope.currentMailing = selectedMail; + window.ct = $scope.currentMailing; + $scope.acttab=0; $scope.composeS="1"; $scope.trackreplies="0"; + $scope.now="1"; ///changing upload on screen $scope.upldChange= function(composeS){ @@ -259,7 +261,24 @@ function FileUploadCtrl(scope) { } }); - + crmMailing.directive('chsdate',function(){ + return { + scope :{ + dat : '=send_date' + }, + restrict: 'AE', + link: function(scope,element,attrs){ + $(element).datepicker({ + //dateFormat: 'yyyy-MM-dd HH:mm:ss', + onSelect: function(date) { + $(".ui-datepicker a").removeAttr("href"); + scope.dat =date; + console.log(date); + } + }); + } + }; + }); crmMailing.controller('mailingListCtrl', function($scope, crmApi, mailingList) { diff --git a/partials/crmMailingType/composeonScreen.html b/partials/crmMailingType/composeonScreen.html index e69de29bb2..e98b3f52dd 100644 --- a/partials/crmMailingType/composeonScreen.html +++ b/partials/crmMailingType/composeonScreen.html @@ -0,0 +1,17 @@ +
+ + + + + + + +
+   Save Template +
diff --git a/partials/crmMailingType/content.html b/partials/crmMailingType/content.html index 9831f7aba5..b4bc595fbb 100644 --- a/partials/crmMailingType/content.html +++ b/partials/crmMailingType/content.html @@ -39,11 +39,11 @@ The original form used table layout; don't know if we have an alternative, CSS-b