diff --git a/app/libs/send-email-notifications.js b/app/libs/send-email-notifications.js index 9b44b297..95a9ccbf 100644 --- a/app/libs/send-email-notifications.js +++ b/app/libs/send-email-notifications.js @@ -4,8 +4,9 @@ var JSDOM = jsdom.JSDOM; module.exports = { send: function(emailSettings, emailTemplateVars, smtpTransport, cb){ - var parsedTemplate = this.parseTemplate(emailSettings.htmlTemplate, emailTemplateVars); - var parsedSubject = this.parseTemplate(emailSettings.subject, emailTemplateVars); + var parsedTemplate = this.parseTemplate(emailSettings.htmlTemplate, emailTemplateVars, false); + var parsedSubject = this.parseTemplate(emailSettings.subject, emailTemplateVars, true); + var mailOptions = { replyTo: emailSettings.fromEmails, from: 'noreply@tellform.com', @@ -19,9 +20,8 @@ module.exports = { }); }, - parseTemplate: function(emailTemplate, emailTemplateVars){ + parseTemplate: function(emailTemplate, emailTemplateVars, onlyText){ var dom = new JSDOM(''+emailTemplate); - debugger; Object.keys(emailTemplateVars).forEach(function (key) { var elem = dom.window.document.querySelector("span.placeholder-tag[data-id='" + key + "']"); @@ -30,7 +30,6 @@ module.exports = { } }); - debugger; //Removed unused variables //TODO: Currently querySelectorAll not working in JSDOM /* @@ -40,6 +39,9 @@ module.exports = { } }) */ + if(onlyText){ + return dom.window.document.documentElement.textContent; + } return dom.serialize(); }, diff --git a/public/modules/forms/admin/css/edit-form-configure.css b/public/modules/forms/admin/css/edit-form-configure.css index 56e28133..71bc2d0a 100644 --- a/public/modules/forms/admin/css/edit-form-configure.css +++ b/public/modules/forms/admin/css/edit-form-configure.css @@ -15,8 +15,8 @@ width: 118px; } -.ql-picker.ql-placeholder > span.ql-picker-label::before { - content: 'Placeholders'; +.ql-picker.ql-placeholder > span.ql-picker-label:before { + content: attr(data-before); } .ql-picker.ql-placeholder > span.ql-picker-options > span.ql-picker-item::before { diff --git a/public/modules/forms/admin/directives/configure-form.client.directive.js b/public/modules/forms/admin/directives/configure-form.client.directive.js index ebdda385..0cd6f2eb 100644 --- a/public/modules/forms/admin/directives/configure-form.client.directive.js +++ b/public/modules/forms/admin/directives/configure-form.client.directive.js @@ -1,7 +1,7 @@ 'use strict'; -angular.module('forms').directive('configureFormDirective', ['$rootScope', '$filter', '$state', - function ($rootScope, $filter, $state) { +angular.module('forms').directive('configureFormDirective', ['$rootScope', '$filter', '$state', '$translate', '$timeout', '$window', + function ($rootScope, $filter, $state, $translate, $timeout, $window) { return { templateUrl: 'modules/forms/admin/views/directiveViews/form/configure-form.client.view.html', restrict: 'E', @@ -24,7 +24,7 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$fil }; }), className: 'placeholder-tag', - delimiters: ['', ''], + delimiters: ['', ''] } }; @@ -66,6 +66,16 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$fil setActiveTab(); $scope.$on("$stateChangeSuccess", setActiveTab()); + + $scope.$on('$viewContentLoaded', function ($evt, data) { + console.log('hello'); + $timeout(function(){ + if(!$('.ql-picker.ql-placeholder > span.ql-picker-label').attr('data-before')){ + $('.ql-picker.ql-placeholder > span.ql-picker-label').attr('data-before', $translate.instant('ADD_VARIABLE_BUTTON')); + } + }, 500); + console.log($('.ql-picker.ql-placeholder > span.ql-picker-label')); + }); } }; } diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html index 184eaff4..8fc88d4a 100644 --- a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html +++ b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html @@ -13,7 +13,7 @@
-
{{ 'ENABLE_RESPONDENT_NOTIFICATIONS' | translate }}
+

{{ 'ENABLE_RESPONDENT_NOTIFICATIONS' | translate }}

@@ -29,7 +29,7 @@
-
{{ 'SEND_NOTIFICATION_TO' | translate }}:
+

{{ 'SEND_NOTIFICATION_TO' | translate }}

@@ -47,7 +47,7 @@
-
{{ 'REPLY_TO' | translate }}:
+

{{ 'REPLY_TO' | translate }}

@@ -60,17 +60,29 @@
-
{{ 'EMAIL_SUBJECT' | translate }}:
+

{{ 'EMAIL_SUBJECT' | translate }}

- + + +
+ + + +
+ +
-
{{ 'EMAIL_MESSAGE' | translate }}
+

{{ 'EMAIL_MESSAGE' | translate }}

@@ -92,7 +104,6 @@
-
diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html b/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html index ba9fa80d..77b594ae 100644 --- a/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html +++ b/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html @@ -8,7 +8,7 @@
-
{{ 'ENABLE_SELF_NOTIFICATIONS' | translate }}
+

{{ 'ENABLE_SELF_NOTIFICATIONS' | translate }}

@@ -21,7 +21,7 @@
-
{{ 'SEND_NOTIFICATION_TO' | translate }}
+

{{ 'SEND_NOTIFICATION_TO' | translate }}

@@ -34,7 +34,7 @@
-
{{ 'REPLY_TO' | translate }}
+

{{ 'REPLY_TO' | translate }}

@@ -52,21 +52,30 @@
-
{{ 'EMAIL_SUBJECT' | translate }}
+

{{ 'EMAIL_SUBJECT' | translate }}

- + + +
+ + + +
+ +
-
{{ 'EMAIL_MESSAGE' | translate }}
+

{{ 'EMAIL_MESSAGE' | translate }}

@@ -89,8 +98,6 @@
- -
\ No newline at end of file