diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js index aacda7f4..483dce79 100644 --- a/app/models/form.server.model.js +++ b/app/models/form.server.model.js @@ -154,6 +154,9 @@ var FormSchema = new Schema({ fromField: { type: Schema.Types.ObjectId, }, + toEmails: { + type: String + }, subject: { type: String }, @@ -163,11 +166,31 @@ var FormSchema = new Schema({ enabled: { type: Boolean, default: false - }, - recipients: { - type: String } }, + + respondentNotifications: { + toField: { + type: Schema.Types.ObjectId, + }, + fromEmail: { + type: String, + match: [/.+\@.+\..+/, 'Please fill a valid email address'] + }, + subject: { + type: String, + default: 'Tellform: Thank you for filling out Tellform name' + }, + htmlTemplate: { + type: String, + default: 'Hello,

We’ve received your submission.

Thank you & have a nice day!', + }, + enabled: { + type: Boolean, + default: false + } + }, + hideFooter: { type: Boolean, default: false diff --git a/app/views/index.server.view.pug b/app/views/index.server.view.pug index 3380c5e9..10c29935 100644 --- a/app/views/index.server.view.pug +++ b/app/views/index.server.view.pug @@ -35,9 +35,6 @@ block content //Socket.io Client Dependency script(src='https://cdn.socket.io/socket.io-1.4.5.js') - //TinyMCE - script(src='https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.1/tinymce.min.js') - //Bower JS dependencies each bowerJSFile in bowerJSFiles script(type='text/javascript', src=bowerJSFile) diff --git a/app/views/layout.server.view.pug b/app/views/layout.server.view.pug index 39ba97d5..65bb2172 100644 --- a/app/views/layout.server.view.pug +++ b/app/views/layout.server.view.pug @@ -31,8 +31,8 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml') // Fav Icon link(href='/static/modules/core/img/brand/favicon.ico', rel='shortcut icon', type='image/x-icon') - link(rel='stylesheet', href='https://maxcdn.bootstrapcdn.com/font-awesome/4.6.1/css/font-awesome.min.css') - link(rel='stylesheet', href='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css', integrity='sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u', crossorigin='anonymous') + link(rel='stylesheet', href='/static/lib/font-awesome/css/font-awesome.min.css') + link(rel='stylesheet', href='/static/lib/bootstrap/dist/css/bootstrap.min.css') link(rel='stylesheet', href='https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,900') //Bower CSS dependencies diff --git a/public/modules/forms/admin/css/edit-form-configure.css b/public/modules/forms/admin/css/edit-form-configure.css index 09814345..37eada0e 100644 --- a/public/modules/forms/admin/css/edit-form-configure.css +++ b/public/modules/forms/admin/css/edit-form-configure.css @@ -11,4 +11,19 @@ white-space: nowrap; vertical-align: middle; cursor: pointer !important; +} + +.email-subject.ta-root .ta-editor.ta-html, .email-subject .ta-scroll-window.form-control { + min-height: 0; + overflow: hidden; + height: auto; + border-radius: 4px; + box-shadow: none; + font-size: 18px; + padding-top: 10px; +} + +.email-subject.ta-root .ta-scroll-window > .ta-bind { + min-height: 0; + outline: 0; } \ No newline at end of file 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 6fba83bd..fe6c1472 100644 --- a/public/modules/forms/admin/directives/configure-form.client.directive.js +++ b/public/modules/forms/admin/directives/configure-form.client.directive.js @@ -32,6 +32,10 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$fil } ]; + $scope.emailFields = $scope.myform.form_fields.filter(function(field){ + return field.fieldType === 'email'; + }); + $scope.go = function(tab){ tab.active = true; $state.go(tab.route); 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 06c2735e..45078ef5 100644 --- a/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html +++ b/public/modules/forms/admin/views/adminTabs/configureTabs/respondent-notifications.html @@ -2,88 +2,77 @@
-
{{ 'FORM_NAME' | translate }}
+
{{ 'SEND_NOTIFICATION_TO' | translate }}
-
+
+ + + + + + + + +
+ +
+ +
+
+
{{ 'REPLY_TO' | translate }}
+
+ +
+ type="text" + ng-model="myform.respondentNotifications.replyEmail" + placeholder="noreply@tellform.com">
-
{{ 'FORM_STATUS' | translate }}
+
{{ 'EMAIL_SUBJECT' | translate }}
+
+
+ +
+
+ +
+
+
{{ 'EMAIL_MESSAGE' | translate }}
-
- - - - - +
+
-
{{ 'ENABLE_EMAIL_NOTIFICATIONS' | translate }}
+
{{ 'ENABLE_RESPONDENT_NOTIFICATIONS' | translate }}
- -
-
-
{{ 'EMAIL_NOTIFICATION_RECIPIENTS' | translate }}
-
- -
- -
-
- - -
-
{{ 'LANGUAGE' | translate }}
-
- - * {{ 'REQUIRED_FIELD' | translate }} -
-
\ No newline at end of file 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 5a3f0163..70143a37 100644 --- a/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html +++ b/public/modules/forms/admin/views/adminTabs/configureTabs/self-notifications.html @@ -8,8 +8,7 @@
@@ -28,9 +27,9 @@ ng-required="true"> - - + + + @@ -42,44 +41,39 @@
- + +
+
+ -
+
+
+
{{ 'EMAIL_MESSAGE' | translate }}
+
+ +
+
-
{{ 'ENABLE_EMAIL_NOTIFICATIONS' | translate }}
+
{{ 'ENABLE_SELF_NOTIFICATIONS' | translate }}
- -
-
{{ 'LANGUAGE' | translate }}
-
- - * {{ 'REQUIRED_FIELD' | translate }} -
-
\ No newline at end of file diff --git a/public/modules/forms/config/forms.client.config.js b/public/modules/forms/config/forms.client.config.js index b9f4eac3..206ac467 100644 --- a/public/modules/forms/config/forms.client.config.js +++ b/public/modules/forms/config/forms.client.config.js @@ -48,7 +48,7 @@ angular.module('forms').run(['Menus', }); }]).config(['$provide', function ($provide){ $provide.decorator('taOptions', ['$delegate', 'taRegisterTool', '$translate', '$window', function(taOptions, taRegisterTool, $translate, $window) { - taRegisterTool('test', { + taRegisterTool('addFieldVariable', { display: '
\
\ {{ "ADD_A_VARIABLE" | translate }}\ @@ -66,7 +66,6 @@ angular.module('forms').run(['Menus', action: function(){ } }); - taOptions.toolbar[1].push('test'); return taOptions; }]);