diff --git a/app/controllers/forms.server.controller.js b/app/controllers/forms.server.controller.js index 3ba7a214..d3fd64fc 100644 --- a/app/controllers/forms.server.controller.js +++ b/app/controllers/forms.server.controller.js @@ -81,10 +81,14 @@ exports.createSubmission = function(req, res) { async.waterfall([ function(callback) { - if (form.selfNotifications && form.selfNotifications.enabled && form.selfNotifications.fromField) { - form.selfNotifications.fromEmails = formFieldDict[form.selfNotifications.fromField]; - - emailNotifications.send(form.selfNotifications, formFieldDict, smtpTransport, constants.varFormat, function(err){ + if (form.selfNotifications && form.selfNotifications.enabled) { + if(form.selfNotifications.fromField){ + form.selfNotifications.fromEmails = formFieldDict[form.selfNotifications.fromField]; + } else { + form.selfNotifications.fromEmails = config.mailer.options.from; + } + + emailNotifications.send(form.selfNotifications, formFieldDict, smtpTransport, function(err){ if(err){ return callback({ message: 'Failure sending submission self-notification email' @@ -102,7 +106,7 @@ exports.createSubmission = function(req, res) { form.respondentNotifications.toEmails = formFieldDict[form.respondentNotifications.toField]; debugger; - emailNotifications.send(form.respondentNotifications, formFieldDict, smtpTransport, constants.varFormat, function(err){ + emailNotifications.send(form.respondentNotifications, formFieldDict, smtpTransport, function(err){ if(err){ return callback({ message: 'Failure sending submission respondent-notification email' @@ -196,13 +200,21 @@ exports.getVisitorData = function(req, res) { responses: "$responses", visits: "$visits", average_time: { - $divide : ["$total_time", "$responses"] + $cond: [ + { $eq: [ "$responses", 0 ] }, + 0, + { $divide: ["$total_time", "$responses"] } + ] }, conversion_rate: { $multiply: [ 100, { - $divide : ["$responses", "$visits"] + $cond: [ + { $eq: [ "$visits", 0 ] }, + 0, + { $divide: ["$responses", "$visits"] } + ] } ] } @@ -252,13 +264,21 @@ exports.getVisitorData = function(req, res) { responses: "$responses", visits: "$visits", average_time: { - $divide : ["$total_time", "$responses"] + $cond: [ + { $eq: [ "$responses", 0 ] }, + 0, + { $divide: ["$total_time", "$responses"] } + ] }, conversion_rate: { $multiply: [ 100, { - $divide : ["$responses", "$visits"] + $cond: [ + { $eq: [ "$visits", 0 ] }, + 0, + { $divide: ["$responses", "$visits"] } + ] } ] } @@ -499,7 +519,7 @@ exports.formByID = function(req, res, next, id) { } Form.findById(id) - .select('admin title language form_fields startPage endPage hideFooter isLive design analytics.gaCode respondentNotifications selfNotifications') + .select('admin title language form_fields startPage endPage showFooter isLive design analytics.gaCode respondentNotifications selfNotifications') .populate('admin') .exec(function(err, form) { if (err) { @@ -528,7 +548,7 @@ exports.formByIDFast = function(req, res, next, id) { } Form.findById(id) .lean() - .select('title language form_fields startPage endPage hideFooter isLive design analytics.gaCode selfNotifications respondentNotifications') + .select('title language form_fields startPage endPage showFooter isLive design analytics.gaCode selfNotifications respondentNotifications') .exec(function(err, form) { if (err) { return next(err); diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js index 240f6412..852c20c7 100755 --- a/app/controllers/users/users.authentication.server.controller.js +++ b/app/controllers/users/users.authentication.server.controller.js @@ -126,7 +126,6 @@ exports.signup = function(req, res) { // Then save the temporary user nev.createTempUser(user, function (err, existingPersistentUser, newTempUser) { if (err) { - console.log(err); return res.status(400).send({ message: errorHandler.getErrorMessage(err) }); diff --git a/app/controllers/users/users.password.server.controller.js b/app/controllers/users/users.password.server.controller.js index 99e480bf..fd66b6b1 100755 --- a/app/controllers/users/users.password.server.controller.js +++ b/app/controllers/users/users.password.server.controller.js @@ -113,7 +113,6 @@ exports.forgot = function(req, res) { } ], function(err, obfuscatedEmail) { if (err) { - console.log(err); return res.status(400).send({ message: 'Couldn\'t send reset password email due to internal server errors. Please contact support at team@tellform.com.' }); diff --git a/app/libs/constants.js b/app/libs/constants.js index 96b6610c..9e5d92e8 100644 --- a/app/libs/constants.js +++ b/app/libs/constants.js @@ -74,8 +74,5 @@ module.exports = { url: /((([A-Za-z]{3,9}:(?:\/\/)?)(?:[-;:&=\+\$,\w]+@)?[A-Za-z0-9.-]+|(?:www.|[-;:&=\+\$,\w]+@)[A-Za-z0-9.-]+)((?:\/[\+~%\/.\w-_]*)?\??(?:[-\+=&;%@.\w_]*)#?(?:[\w]*))?)/, hexCode: /^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/, email: /^(([^<>()\[\]\\.,;:\s@']+(\.[^<>()\[\]\\.,;:\s@']+)*)|('.+'))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/, - templateVariable: /(.|\n)*?<\/var>/g - }, - - varFormat: [']+)id=["\']{1}field:', '["\']{1}>([^<>]+)*?<\/var>'], + } }; \ No newline at end of file diff --git a/app/libs/send-email-notifications.js b/app/libs/send-email-notifications.js index 30af3aad..95a9ccbf 100644 --- a/app/libs/send-email-notifications.js +++ b/app/libs/send-email-notifications.js @@ -1,9 +1,12 @@ 'use strict'; +const jsdom = require("jsdom"); +var JSDOM = jsdom.JSDOM; module.exports = { - send: function(emailSettings, emailTemplateVars, smtpTransport, varFormat, cb){ - var parsedTemplate = this.parseTemplate(emailSettings.htmlTemplate, emailTemplateVars, varFormat); - var parsedSubject = this.parseTemplate(emailSettings.subject, emailTemplateVars, varFormat); + send: function(emailSettings, emailTemplateVars, smtpTransport, cb){ + 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', @@ -12,31 +15,41 @@ module.exports = { html: parsedTemplate }; - console.log('HERE'); - smtpTransport.sendMail(mailOptions, function(){ - console.log('THERE'); - cb(); + smtpTransport.sendMail(mailOptions, function(err){ + cb(err); }); }, - parseTemplate: function(emailTemplate, emailAttrs, varFormat){ - var resolvedTemplate = emailTemplate; - var that = this; - Object.keys(emailAttrs).forEach(function (key) { - resolvedTemplate = that.replaceTemplateVal(key, emailAttrs[key], resolvedTemplate, varFormat); - }); - return resolvedTemplate; - }, + parseTemplate: function(emailTemplate, emailTemplateVars, onlyText){ + var dom = new JSDOM(''+emailTemplate); - replaceTemplateVal: function(key, val, template, varFormat){ - return template.replace( new RegExp(varFormat[0] + key + varFormat[1], 'g'), val); + Object.keys(emailTemplateVars).forEach(function (key) { + var elem = dom.window.document.querySelector("span.placeholder-tag[data-id='" + key + "']"); + if(elem !== null){ + elem.outerHTML = emailTemplateVars[key]; + } + }); + + //Removed unused variables + //TODO: Currently querySelectorAll not working in JSDOM + /* + dom.window.document.querySelectorAll("span[data-id]").forEach(function(elem){ + if(elem !== null){ + elem.outerHTML = ''; + } + }) + */ + if(onlyText){ + return dom.window.document.documentElement.textContent; + } + return dom.serialize(); }, createFieldDict: function(form_fields){ var formFieldDict = {}; form_fields.forEach(function(field){ if(field.hasOwnProperty('globalId') && field.hasOwnProperty('fieldValue')){ - formFieldDict[field.globalId] = field.fieldValue; + formFieldDict[field.globalId+''] = field.fieldValue+''; } }); return formFieldDict; diff --git a/app/models/form.server.model.js b/app/models/form.server.model.js index be4e6b5c..c6fd922b 100644 --- a/app/models/form.server.model.js +++ b/app/models/form.server.model.js @@ -192,9 +192,9 @@ var FormSchema = new Schema({ } }, - hideFooter: { + showFooter: { type: Boolean, - default: false + default: true }, isLive: { @@ -264,6 +264,16 @@ function formFieldsAllHaveIds(form_fields){ return true; } +FormSchema.pre('save', function (next) { + if(this.form_fields && this.form_fields.length){ + this.form_fields = this.form_fields.filter(function(field){ + return !field.deletePreserved; + }); + } + next(); +}); + +/* FormSchema.pre('save', function (next) { var that = this; var _original; @@ -374,6 +384,7 @@ FormSchema.pre('save', function (next) { next(); }); }); +*/ FormSchema.index({created: 1}); diff --git a/app/tests/form_submission.model.test.js b/app/tests/form_submission.model.test.js index 262fbf04..b857e9a9 100644 --- a/app/tests/form_submission.model.test.js +++ b/app/tests/form_submission.model.test.js @@ -176,6 +176,7 @@ describe('FormSubmission Model Unit Tests:', function() { }); }); + /* describe('Test FormField and Submission Logic', function() { beforeEach(function(done){ @@ -245,6 +246,7 @@ describe('FormSubmission Model Unit Tests:', function() { }); }); }); + */ afterEach(function(done) { Form.remove().exec(function() { diff --git a/app/tests/libs/send-email-notifications.test.js b/app/tests/libs/send-email-notifications.test.js index 10f8d98f..9f9db698 100644 --- a/app/tests/libs/send-email-notifications.test.js +++ b/app/tests/libs/send-email-notifications.test.js @@ -3,9 +3,11 @@ /** * Module dependencies. */ -const emailNotifications = require('../../libs/send-email-notifications'), - constants = require('../../libs/constants'), - mockTransport = require("nodemailer").createTransport("Stub"), +const should = require('should'), + emailNotifications = require('../../libs/send-email-notifications'), + mockTransport = require('nodemailer').createTransport({ + jsonTransport: true + }), config = require('../../../config/config'); /** @@ -20,7 +22,7 @@ const validFormFields = [ const validFieldDict = { '56340745f59a6fc9e22028e9': 'John Smith', '5c9e22028e907634f45f59a6': 'https://johnsmith.me', - '56e90745f5934fc9e22028a6': 45 + '56e90745f5934fc9e22028a6': '45' }; const invalidFormFields = [ @@ -29,13 +31,11 @@ const invalidFormFields = [ {fieldType:'number', title:'Your Age'} ]; -const htmlTemplate = '

First Name \ -
Your Website \ -
Your Age

'; +const htmlTemplate = '

First Name'+ + '
Your Website'+ + '
Your Age

'; -const renderedTemplate = '

John Smith \ -
https://johnsmith.me \ -
45

'; +const renderedTemplate = '

John Smith
https://johnsmith.me
45

'; /** * Unit tests @@ -56,36 +56,24 @@ describe('Send Email Notification Unit Tests', function() { describe('Method parseTemplate', function(){ it('should properly render a template given a valid field dict', function() { - var actualRenderedTemplate = emailNotifications.parseTemplate(htmlTemplate, validFieldDict, constants.varFormat).replace((/ |\r\n|\n|\r|\t/gm),''); + var actualRenderedTemplate = emailNotifications.parseTemplate(htmlTemplate, validFieldDict, false).replace((/ |\r\n|\n|\r|\t/gm),''); actualRenderedTemplate.should.equal(renderedTemplate.replace((/ |\r\n|\n|\r|\t/gm),'')); }); }); - describe('Method replaceTemplateVal', function() { - it('should properly replace a template var in a valid template', function() { - var expectedHtml = '

John Smith \ -
Your Website \ -
Your Age

'; - - var actualRenderedTemplate = emailNotifications.replaceTemplateVal('56340745f59a6fc9e22028e9', validFieldDict['56340745f59a6fc9e22028e9'], htmlTemplate, constants.varFormat).replace((/ |\r\n|\n|\r|\t/gm),''); - actualRenderedTemplate.should.equal(expectedHtml.replace((/ |\r\n|\n|\r|\t/gm),'')); - }); - }); - describe('Method send', function() { this.timeout(10000); const emailSettings = { fromEmails: 'somewhere@somewhere.com', toEmails: 'there@there.com', - subject: 'Hello First Name!', + subject: 'Hello First Name!', htmlTemplate: htmlTemplate }; const emailTemplateVars = validFieldDict; - const varFormat = constants.varFormat; it('should properly replace a template var in a valid template', function(done) { - emailNotifications.send(emailSettings, emailTemplateVars, mockTransport, varFormat, function(err){ + emailNotifications.send(emailSettings, emailTemplateVars, mockTransport, function(err){ should.not.exist(err); done(); }); diff --git a/app/views/form.server.view.pug b/app/views/form.server.view.pug index fa807c5f..9dbad5b2 100644 --- a/app/views/form.server.view.pug +++ b/app/views/form.server.view.pug @@ -59,7 +59,6 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml') script(type='text/javascript'). socketUrl = "!{socketUrl}" - script(src='/static/lib/jquery/dist/jquery.min.js', type='text/javascript') 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') diff --git a/app/views/index.server.view.pug b/app/views/index.server.view.pug index 0d0c17fc..1c08be19 100644 --- a/app/views/index.server.view.pug +++ b/app/views/index.server.view.pug @@ -3,9 +3,9 @@ extends layout.server.view.pug block content section.content(ui-view='', ng-cloak='') - + link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.4/quill.snow.min.css') + link(rel='stylesheet', href='https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.4/quill.bubble.min.css') link(rel='stylesheet', href='/static/lib/jquery-ui/themes/flick/jquery-ui.min.css') - script(src='/static/lib/jquery/jquery.min.js') //Embedding The User Object script(type='text/javascript'). @@ -44,6 +44,10 @@ block content script(type='text/javascript', src='https://cdnjs.cloudflare.com/ajax/libs/angular-strap/2.3.8/angular-strap.min.js') + script(src='https://cdnjs.cloudflare.com/ajax/libs/quill/1.3.4/quill.min.js') + script(src='https://cdnjs.cloudflare.com/ajax/libs/ng-quill/3.5.1/ng-quill.js') + script(src='https://unpkg.com/quill-placeholder-module@0.2.0/dist/placeholder-module.js') + //Application JavaScript Files each jsFile in jsFiles script(type='text/javascript', src=jsFile) diff --git a/bower.json b/bower.json index 4336c3ac..ae37555a 100755 --- a/bower.json +++ b/bower.json @@ -16,13 +16,11 @@ "angular-mocks": "~1.4.7", "angular-bootstrap": "~0.14.3", "angular-ui-utils": "~3.0.0", - "angular-ui-router": "~0.2.11", "ng-file-upload": "^12.0.4", "angular-raven": "~0.5.11", "angular-ui-date": "~0.0.11", "lodash": "~3.10.0", "angular-ui-sortable": "~0.13.4", - "angular-permission": "~1.1.1", "file-saver.js": "~1.20150507.2", "angular-bootstrap-colorpicker": "~3.0.19", "angular-scroll": "^1.0.0", @@ -41,21 +39,17 @@ "socket.io-client": "^1.7.2", "css-toggle-switch": "^4.0.2", "angular-strap": "^2.3.12", - "textAngular": "^1.5.16", "angular-ui-select": "^0.19.8", "angular-bootstrap-switch": "^0.5.2", - "jquery": "^3.2.1" + "jquery": "^3.2.1", + "ng-quill": "https://github.com/KillerCodeMonkey/ng-quill", + "angular-ui-router": "^1.0.11", + "angular-permission": "^5.3.2" }, "resolutions": { "angular-bootstrap": "^0.14.0", - "angular": "1.4.14", - "jspdf": "~1.0.178", - "angular-sanitize": "1.4.14", - "angular-ui-sortable": "^0.17.1", - "angular-ui-date": "~0.0.11", - "angular-input-stars-directive": "master", - "angular-ui-select": "^0.19.8", - "jquery": "^3.2.1" + "jquery": "^3.2.1", + "angular-ui-router": "^1.0.11" }, "overrides": { "BOWER-PACKAGE": { diff --git a/package-lock.json b/package-lock.json index ab46ade9..8516edc5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,16 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@types/node": { + "version": "8.0.52", + "resolved": "https://registry.npmjs.org/@types/node/-/node-8.0.52.tgz", + "integrity": "sha512-wOU/VRodnI/4Chxuu6R6bcyN9aE3rztO0i8R76PZO7+DxTXWy60nseGN4ujspucmxrfj5mzgCYPXiXqrD6KC3Q==" + }, + "abab": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/abab/-/abab-1.0.4.tgz", + "integrity": "sha1-X6rZwsB/YN12dw9xzwJbYqY8/U4=" + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -304,6 +314,11 @@ "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=" }, + "array-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", + "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=" + }, "array-find-index": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", @@ -3194,6 +3209,11 @@ "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, + "content-type-parser": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/content-type-parser/-/content-type-parser-1.0.2.tgz", + "integrity": "sha512-lM4l4CnMEwOLHAHr/P6MEZwZFPJFtAAKgL6pogbXmVZggIqXhdB6RbBtPOTsw2FcXwYhehRGERJmRrjOiIB8pQ==" + }, "convert-source-map": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.1.3.tgz", @@ -3545,6 +3565,19 @@ "parserlib": "0.2.5" } }, + "cssom": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz", + "integrity": "sha1-uANhcMefB6kP8vFuIihAJ6JDhIs=" + }, + "cssstyle": { + "version": "0.2.37", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz", + "integrity": "sha1-VBCXI0yyUTyDzu06zdwn/yeYfVQ=", + "requires": { + "cssom": "0.3.2" + } + }, "ctype": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz", @@ -3639,8 +3672,7 @@ "deep-is": { "version": "0.1.3", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", - "dev": true + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, "degenerator": { "version": "1.0.4", @@ -3767,6 +3799,11 @@ "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=" }, + "domexception": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.0.tgz", + "integrity": "sha512-WpwuBlZ2lQRFa4H/4w49deb9rJLot9KmqrKKjMc9qBl7CID+DdC2swoa34ccRl+anL2B6bLp6TjFdIdnzekMBQ==" + }, "domhandler": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz", @@ -4160,8 +4197,7 @@ "esutils": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" }, "etag": { "version": "1.7.0", @@ -4533,8 +4569,7 @@ "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, "faye-websocket": { "version": "0.4.4", @@ -7062,6 +7097,14 @@ "core-util-is": "1.0.2" } }, + "html-encoding-sniffer": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", + "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", + "requires": { + "whatwg-encoding": "1.0.3" + } + }, "html-minifier": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.0.3.tgz", @@ -7893,6 +7936,78 @@ "integrity": "sha512-xYuhvQ7I9PDJIGBWev9xm0+SMSed3ZDBAmvVjbFR1ZRLAF+vlXcQu6cRI9uAlj81rzikElRVteehwV7DuX2ZmQ==", "dev": true }, + "jsdom": { + "version": "11.3.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-11.3.0.tgz", + "integrity": "sha512-aPZTDl4MplzQhx5bLztk6nzjbEslmO3Q3+z0WpCMutL1XJDhZIRzir6R1Y8S84LgeT/7jhQvgtUMkY6oPwvlUw==", + "requires": { + "abab": "1.0.4", + "acorn": "5.2.1", + "acorn-globals": "4.1.0", + "array-equal": "1.0.0", + "content-type-parser": "1.0.2", + "cssom": "0.3.2", + "cssstyle": "0.2.37", + "domexception": "1.0.0", + "escodegen": "1.9.0", + "html-encoding-sniffer": "1.0.2", + "nwmatcher": "1.4.3", + "parse5": "3.0.3", + "pn": "1.0.0", + "request": "2.83.0", + "request-promise-native": "1.0.5", + "sax": "1.2.4", + "symbol-tree": "3.2.2", + "tough-cookie": "2.3.3", + "webidl-conversions": "4.0.2", + "whatwg-encoding": "1.0.3", + "whatwg-url": "6.3.0", + "xml-name-validator": "2.0.1" + }, + "dependencies": { + "acorn": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.2.1.tgz", + "integrity": "sha512-jG0u7c4Ly+3QkkW18V+NRDN+4bWHdln30NL1ZL2AvFZZmQe/BfopYCtghCKKVBUSetZ4QKcyA0pY6/4Gw8Pv8w==" + }, + "acorn-globals": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.1.0.tgz", + "integrity": "sha512-KjZwU26uG3u6eZcfGbTULzFcsoz6pegNKtHPksZPOUsiKo5bUmiBPa38FuHZ/Eun+XYh/JCCkS9AS3Lu4McQOQ==", + "requires": { + "acorn": "5.2.1" + } + }, + "escodegen": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.0.tgz", + "integrity": "sha512-v0MYvNQ32bzwoG2OSFzWAkuahDQHK92JBN0pTAALJ4RIxEZe766QJPDR8Hqy7XNUy5K3fnVL76OqYAdc4TZEIw==", + "requires": { + "esprima": "3.1.3", + "estraverse": "4.2.0", + "esutils": "2.0.2", + "optionator": "0.8.2", + "source-map": "0.5.7" + } + }, + "esprima": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" + }, + "estraverse": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "optional": true + } + } + }, "jshint": { "version": "2.9.5", "resolved": "https://registry.npmjs.org/jshint/-/jshint-2.9.5.tgz", @@ -8502,7 +8617,6 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, "requires": { "prelude-ls": "1.1.2", "type-check": "0.3.2" @@ -8761,6 +8875,11 @@ "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", "dev": true }, + "lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" + }, "log-driver": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz", @@ -9849,6 +9968,11 @@ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=" }, + "nwmatcher": { + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.4.3.tgz", + "integrity": "sha512-IKdSTiDWCarf2JTS5e9e2+5tPZGdkRJ79XjYV0pzK8Q9BpsFyBq1RGKxzs7Q8UBushGw7m6TzVKz6fcY99iSWw==" + }, "oauth-sign": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", @@ -9916,7 +10040,6 @@ "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, "requires": { "deep-is": "0.1.3", "fast-levenshtein": "2.0.6", @@ -9929,8 +10052,7 @@ "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" } } }, @@ -10093,6 +10215,14 @@ "error-ex": "1.3.1" } }, + "parse5": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-3.0.3.tgz", + "integrity": "sha512-rgO9Zg5LLLkfJF9E6CCmXlSE4UVceloys8JrFqCcHloC3usd/kJCyPDwH2SOlzix2j3xaP9sUX3e8+kvkuleAA==", + "requires": { + "@types/node": "8.0.52" + } + }, "parsejson": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/parsejson/-/parsejson-0.0.3.tgz", @@ -10492,11 +10622,15 @@ "resolved": "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz", "integrity": "sha1-ZGx3ARiZhwtqCQPnXpl+jlHadGE=" }, + "pn": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/pn/-/pn-1.0.0.tgz", + "integrity": "sha1-HPWjCw2AbNGPiPxBprXUrWFbO6k=" + }, "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, "prepend-http": { "version": "1.0.4", @@ -11286,6 +11420,24 @@ "throttleit": "1.0.0" } }, + "request-promise-core": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.1.tgz", + "integrity": "sha1-Pu4AssWqgyOc+wTFcA2jb4HNCLY=", + "requires": { + "lodash": "4.17.4" + } + }, + "request-promise-native": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.5.tgz", + "integrity": "sha1-UoF3D2jgyXGeUWP9P6tIIhX0/aU=", + "requires": { + "request-promise-core": "1.1.1", + "stealthy-require": "1.1.1", + "tough-cookie": "2.3.3" + } + }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", @@ -11386,6 +11538,11 @@ "graceful-fs": "1.2.3" } }, + "sax": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" + }, "scandirectory": { "version": "2.5.0", "resolved": "https://registry.npmjs.org/scandirectory/-/scandirectory-2.5.0.tgz", @@ -11931,6 +12088,11 @@ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==" }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" + }, "stream-combiner": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", @@ -12144,6 +12306,11 @@ "upper-case": "1.1.3" } }, + "symbol-tree": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz", + "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=" + }, "taskgroup": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/taskgroup/-/taskgroup-4.3.1.tgz", @@ -12289,6 +12456,21 @@ "punycode": "1.4.1" } }, + "tr46": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", + "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", + "requires": { + "punycode": "2.1.0" + }, + "dependencies": { + "punycode": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.0.tgz", + "integrity": "sha1-X4Y+3Im5bbCQdLrXlHvwkFbKTn0=" + } + } + }, "transformers": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz", @@ -12364,7 +12546,6 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, "requires": { "prelude-ls": "1.1.2" } @@ -12723,6 +12904,36 @@ "typechecker": "2.1.0" } }, + "webidl-conversions": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", + "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==" + }, + "whatwg-encoding": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.3.tgz", + "integrity": "sha512-jLBwwKUhi8WtBfsMQlL4bUUcT8sMkAtQinscJAe/M4KHCkHuUJAF6vuB0tueNIw4c8ziO6AkRmgY+jL3a0iiPw==", + "requires": { + "iconv-lite": "0.4.19" + }, + "dependencies": { + "iconv-lite": { + "version": "0.4.19", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", + "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==" + } + } + }, + "whatwg-url": { + "version": "6.3.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-6.3.0.tgz", + "integrity": "sha512-rM+hE5iYKGPAOu05mIdJR47pYSR2vDzfrTEFRc/S8D3L60yW8BuXmUJ7Kog7x/DrokFN7JNaHKadpzjouKRRAw==", + "requires": { + "lodash.sortby": "4.7.0", + "tr46": "1.0.1", + "webidl-conversions": "4.0.2" + } + }, "which": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz", @@ -12887,6 +13098,11 @@ "resolved": "https://registry.npmjs.org/xml-char-classes/-/xml-char-classes-1.0.0.tgz", "integrity": "sha1-ZGV4SKIP/F31g6Qq2KJ3tFErvE0=" }, + "xml-name-validator": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz", + "integrity": "sha1-TYuPHszTQZqjYgYb7O9RXh5VljU=" + }, "xmlhttprequest-ssl": { "version": "1.5.3", "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.3.tgz", diff --git a/package.json b/package.json index 5f3ba4c4..1602d47e 100644 --- a/package.json +++ b/package.json @@ -54,6 +54,7 @@ "helmet": "3.5.0", "i18n": "^0.8.3", "jit-grunt": "^0.9.1", + "jsdom": "^11.3.0", "lodash": "^4.17.4", "main-bower-files": "~2.9.0", "method-override": "~2.3.0", diff --git a/public/form_modules/forms/base/directives/on-enter-key.client.directive.js b/public/form_modules/forms/base/directives/on-enter-key.client.directive.js index eb4e5cfd..c90fd5ac 100644 --- a/public/form_modules/forms/base/directives/on-enter-key.client.directive.js +++ b/public/form_modules/forms/base/directives/on-enter-key.client.directive.js @@ -65,8 +65,6 @@ angular.module('view-form').directive('onEnterKey', ['$rootScope', function($roo var keyCode = event.which || event.keyCode; if(keyCode === 9 && event.shiftKey) { - - console.log('onTabAndShiftKey'); event.preventDefault(); $rootScope.$apply(function() { $rootScope.$eval($attrs.onTabAndShiftKey); diff --git a/public/form_modules/forms/base/directives/submit-form.client.directive.js b/public/form_modules/forms/base/directives/submit-form.client.directive.js index 4e9b2b1d..667b389e 100644 --- a/public/form_modules/forms/base/directives/submit-form.client.directive.js +++ b/public/form_modules/forms/base/directives/submit-form.client.directive.js @@ -15,18 +15,12 @@ angular.module('view-form').directive('submitFormDirective', ['$http', 'TimeCoun templateUrl: 'form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html', restrict: 'E', scope: { - myform:'=', - ispreview: '=' + myform:'=' }, controller: function($document, $window, $scope){ var FORM_ACTION_ID = 'submit_field'; $scope.forms = {}; - //Don't start timer if we are looking at a design preview - if($scope.ispreview){ - TimeCounter.restartClock(); - } - var form_fields_count = $scope.myform.visible_form_fields.filter(function(field){ return field.fieldType !== 'statement'; }).length; @@ -35,8 +29,7 @@ angular.module('view-form').directive('submitFormDirective', ['$http', 'TimeCoun $scope.myform.visible_form_fields = $scope.myform.form_fields.filter(function(field){ return !field.deletePreserved; }); - console.log($scope.myform.visible_form_fields); - }) + }); $scope.updateFormValidity = function(){ $timeout(function(){ @@ -320,12 +313,11 @@ angular.module('view-form').directive('submitFormDirective', ['$http', 'TimeCoun setTimeout(function () { $scope.submitPromise = $http.post('/forms/' + $scope.myform._id, form) - .success(function (data, status) { + .then(function (data, status) { $scope.myform.submitted = true; $scope.loading = false; SendVisitorData.send(form, getActiveField(), _timeElapsed); - }) - .error(function (error) { + }, function (error) { $scope.loading = false; console.error(error); $scope.error = error.message; diff --git a/public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html b/public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html index 4a85cb36..8b065343 100755 --- a/public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html +++ b/public/form_modules/forms/base/views/directiveViews/form/submit-form.client.view.html @@ -72,7 +72,7 @@ -
+
diff --git a/public/modules/core/config/core.client.routes.js b/public/modules/core/config/core.client.routes.js index 01930695..79c9dbc5 100755 --- a/public/modules/core/config/core.client.routes.js +++ b/public/modules/core/config/core.client.routes.js @@ -8,6 +8,9 @@ angular.module('core').config(['$stateProvider', '$urlRouterProvider', } ]); +var statesWithoutAuth = ['signin', 'resendVerifyEmail', 'verify', 'signup', 'signup-success', 'forgot', 'reset-invalid', 'reset', 'reset-success']; +var statesToIgnore = statesWithoutAuth.concat(['', 'home']); + angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope', 'Auth', '$state', '$stateParams', function($rootScope, Auth, $state, $stateParams) { @@ -21,10 +24,8 @@ angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope' params: fromParams } - var statesToIgnore = ['', 'home', 'signin', 'resendVerifyEmail', 'verify', 'signup', 'signup-success', 'forgot', 'reset-invalid', 'reset', 'reset-success']; - //Redirect to listForms if user is authenticated - if(statesToIgnore.indexOf(toState.name) > 0){ + if(statesToIgnore.indexOf(toState.name) > -1){ if(Auth.isAuthenticated()){ event.preventDefault(); // stop current execution $state.go('listForms'); // go to listForms page @@ -35,7 +36,6 @@ angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope' event.preventDefault(); // stop current execution $state.go('listForms'); // go to listForms page } - }); } @@ -44,22 +44,28 @@ angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope' //Page access/authorization logic angular.module(ApplicationConfiguration.applicationModuleName).run(['$rootScope', 'Auth', 'User', 'Authorizer', '$state', '$stateParams', function($rootScope, Auth, User, Authorizer, $state, $stateParams) { - $rootScope.$on('$stateChangeStart', function(event, next) { - var authenticator, permissions, user; - permissions = next && next.data && next.data.permissions ? next.data.permissions : null; + $rootScope.$on('$stateChangeStart', function(event, toState, toParams, fromState, fromParams) { + if(statesWithoutAuth.indexOf(toState.name) === -1){ + Auth.ensureHasCurrentUser(User).then( + function onSuccess(currentUser){ + if(currentUser){ + var authenticator = new Authorizer(user); + var permissions = toState && toState.data && toState.data.permissions ? toState.data.permissions : null; - Auth.ensureHasCurrentUser(User); - user = Auth.currentUser; - - if(user){ - authenticator = new Authorizer(user); - - if( (permissions !== null) ){ - if( !authenticator.canAccess(permissions) ){ + if( permissions !== null && !authenticator.canAccess(permissions) ){ + event.preventDefault(); + $state.go('access_denied'); + } + } + }, + function onError(error){ event.preventDefault(); $state.go('access_denied'); } - } + ); + } else { + event.preventDefault(); + $state.go('access_denied'); } }); - }]); + }]); \ No newline at end of file diff --git a/public/modules/core/controllers/header.client.controller.js b/public/modules/core/controllers/header.client.controller.js index a0c9054d..ae97cdcf 100755 --- a/public/modules/core/controllers/header.client.controller.js +++ b/public/modules/core/controllers/header.client.controller.js @@ -6,11 +6,8 @@ angular.module('core').controller('HeaderController', ['$rootScope', '$scope', ' $rootScope.signupDisabled = $window.signupDisabled; $scope.user = $rootScope.user = Auth.ensureHasCurrentUser(User); - $scope.authentication = $rootScope.authentication = Auth; - $rootScope.languages = $scope.languages = ['en', 'fr', 'es', 'it', 'de']; - //Set global app language $rootScope.language = $scope.user.language; $translate.use($scope.user.language); @@ -19,16 +16,31 @@ angular.module('core').controller('HeaderController', ['$rootScope', '$scope', ' $rootScope.hideNav = false; $scope.menu = Menus.getMenu('topbar'); + $rootScope.languages = ['en', 'fr', 'es', 'it', 'de']; + + $rootScope.langCodeToWord = { + 'en': 'English', + 'fr': 'Français', + 'es': 'Español', + 'it': 'Italiàno', + 'de': 'Deutsch' + }; + + $rootScope.wordToLangCode = { + 'English': 'en', + 'Français': 'fr', + 'Español': 'es', + 'Italiàno': 'it', + 'Deutsch': 'de' + }; + + $scope.signout = function() { var promise = User.logout(); promise.then(function() { Auth.logout(); - Auth.ensureHasCurrentUser(User); $scope.user = $rootScope.user = null; - $state.go('listForms'); - - //Refresh view - $state.reload(); + $state.go('signin', { reload: true }); }, function(reason) { console.error('Logout Failed: ' + reason); diff --git a/public/modules/forms/admin/controllers/admin-form.client.controller.js b/public/modules/forms/admin/controllers/admin-form.client.controller.js index 7326426a..97de0aa1 100644 --- a/public/modules/forms/admin/controllers/admin-form.client.controller.js +++ b/public/modules/forms/admin/controllers/admin-form.client.controller.js @@ -53,7 +53,7 @@ angular.module('forms').controller('AdminFormController', ['$rootScope', '$windo }, { heading: $filter('translate')('SHARE_TAB'), - route: 'viewForm.share', + route: 'viewForm.share.share_form', active: false }, { diff --git a/public/modules/forms/admin/controllers/list-forms.client.controller.js b/public/modules/forms/admin/controllers/list-forms.client.controller.js index 476a9a2a..10c94241 100644 --- a/public/modules/forms/admin/controllers/list-forms.client.controller.js +++ b/public/modules/forms/admin/controllers/list-forms.client.controller.js @@ -1,13 +1,14 @@ 'use strict'; // Forms controller -angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope', '$stateParams', '$state', 'GetForms', 'CurrentForm', '$http', '$uibModal', 'myForms', - function($rootScope, $scope, $stateParams, $state, GetForms, CurrentForm, $http, $uibModal, myForms) { +angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope', '$stateParams', '$state', 'GetForms', 'CurrentForm', '$http', '$uibModal', 'myForms','$window', + function($rootScope, $scope, $stateParams, $state, GetForms, CurrentForm, $http, $uibModal, myForms, $window) { $scope = $rootScope; $scope.forms = {}; $scope.showCreateModal = false; $scope.myforms = myForms + $scope.formLanguage = $window.$locale; $rootScope.languageRegExp = { regExp: /[@!#$%^&*()\-+={}\[\]|\\/'";:`.,~№?<>]+/i, @@ -74,9 +75,9 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope delete form._id; $http.post('/forms', {form: form}) - .success(function(data, status, headers){ + .then(function(data, status, headers){ $scope.myforms.splice(form_index+1, 0, data); - }).error(function(errorResponse){ + }, function(errorResponse){ console.error(errorResponse); if(errorResponse === null){ $scope.error = errorResponse.data.message; @@ -93,10 +94,10 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope if($scope.forms.createForm.$valid && $scope.forms.createForm.$dirty){ $http.post('/forms', {form: form}) - .success(function(data, status, headers){ + .then(function(data, status, headers){ // Redirect after save $scope.goToWithId('viewForm.create', data._id+''); - }).error(function(errorResponse){ + }, function(errorResponse){ console.error(errorResponse); $scope.error = errorResponse.data.message; }); @@ -109,10 +110,10 @@ angular.module('forms').controller('ListFormsController', ['$rootScope', '$scope } $http.delete('/forms/'+$scope.myforms[form_index]._id) - .success(function(data, status, headers){ + .then(function(data, status, headers){ $scope.myforms.splice(form_index, 1); $scope.cancelDeleteModal(); - }).error(function(error){ + }, function(error){ console.error(error); }); }; diff --git a/public/modules/forms/admin/css/edit-form.css b/public/modules/forms/admin/css/admin-form.css similarity index 59% rename from public/modules/forms/admin/css/edit-form.css rename to public/modules/forms/admin/css/admin-form.css index 3ac8a10a..7daa2b21 100644 --- a/public/modules/forms/admin/css/edit-form.css +++ b/public/modules/forms/admin/css/admin-form.css @@ -1,74 +1,75 @@ -.pull-top { +.admin-form .pull-top { display: inline-block; vertical-align: top; float: none; } -.box { +.admin-form .box { padding: 0 5px 0 5px!important; } -.current-fields .field-row { +.admin-form .current-fields .field-row { padding: 5px 0; } -.current-fields .panel { +.admin-form .current-fields .panel { background-color: #f1f1f1; margin-top: 0!important; } - .current-fields .panel:hover { + .admin-form .current-fields .panel:hover { background-color: #fff; cursor: pointer; } -.current-fields .panel.tool-panel { +.admin-form .current-fields .panel.tool-panel { background-color: white; } -.current-fields .panel-heading { +.admin-form .current-fields .panel-heading { background-color: #f1f1f1; position: relative; } - .current-fields .panel-heading:hover { + .admin-form .current-fields .panel-heading:hover { background-color: #fff; cursor: pointer; } - .current-fields .panel-heading a:hover { + .admin-form .current-fields .panel-heading a:hover { text-decoration: none; } -.current-fields .tool-panel.panel:hover { +.admin-form .current-fields .tool-panel.panel:hover { border-color: #9d9d9d; background-color: #eee; cursor: pointer; } - .current-fields .tool-panel.panel:hover .panel-heading { + .admin-form .current-fields .tool-panel.panel:hover .panel-heading { background-color: inherit; color: #000; cursor: pointer; } -.current-fields .tool-panel.panel .panel-heading { +.admin-form .current-fields .tool-panel.panel .panel-heading { background-color: #fff; color: #9d9d9d; } - .current-fields .tool-panel.panel .panel-heading a { + .admin-form .current-fields .tool-panel.panel .panel-heading a { color: inherit; } - .current-fields .tool-panel.panel .panel-heading a:hover{ + .admin-form .current-fields .tool-panel.panel .panel-heading a:hover{ text-decoration: none; } /* Custom Tab CSS */ -.nav.nav-pills.nav-stacked { +.admin-form .nav.nav-pills.nav-stacked { width: 16.66666667%; float: left; position: relative; min-height: 1px; padding-right: 15px; } -div.tab-content { + +.admin-form .tab-content { width: 83.33333333%; position: relative; min-height: 1px; @@ -76,13 +77,13 @@ div.tab-content { padding-top: 0!important; } -.panel-default.startPage { +.admin-form .panel-default.startPage { border-style: dashed; border-color: #a9a9a9; border-width:3px; } -.busy-updating-wrapper { +.admin-form .busy-updating-wrapper { text-align: center; font-size: 20px; position: fixed; @@ -91,7 +92,7 @@ div.tab-content { z-index: 1; } -.busy-submitting-wrapper { +.admin-form .busy-submitting-wrapper { position: fixed; top: 50%; left: 0; @@ -99,7 +100,7 @@ div.tab-content { bottom: 0; } -.dropzone h4.panel-title { +.admin-form .dropzone h4.panel-title { height: 17px; overflow: hidden; } @@ -142,46 +143,10 @@ div.tab-content { visibility: visible !important; border: none; padding:1px; - background: #000; + background: #000; background:rgba(0, 0, 0, 0.5) !important; } - -.config-form { - max-width: 100%; -} - -.config-form > .row { - padding: 19px; - margin-bottom: 20px; - background-color: #f5f5f5; - border: 1px solid #e3e3e3; - border-radius: 4px; - -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); - -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); - box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); -} - -div.config-form .row.field { - padding-top:1.5em; -} - - div.config-form > .row > .container:nth-of-type(odd){ - border-right: 1px #ddd solid; - } - div.config-form.design > .row > .container:nth-of-type(odd){ - border-right: none; - } - - div.config-form .row > .field-input { - padding-left:0.1em; - } - div.config-form .row > .field-input label { - padding-left:1.3em; - display: block; - } - - /* Styles for form admin view (/forms/:formID/admin) */ .admin-form > .page-header { padding-bottom: 0; @@ -203,30 +168,6 @@ div.config-form .row.field { margin-bottom: none; } -/*Styles for admin view tabs */ -.admin-form .tab-content { - padding-top: 3em; -} - - -/*Styles for submission table*/ -.submissions-table .table-outer.row { - margin: 1.5em 0 2em 0!important; -} -.submissions-table .table-outer .col-xs-12 { - padding-left: 0!important; - border:1px solid #ddd; - overflow-x: scroll; - border-radius:3px; -} -.submissions-table .table > thead > tr > th { - min-width:8em; -} -.submissions-table .table > tbody > tr.selected { - background-color:#efefef; -} - - /*Styles for add fields tab*/ .admin-form .add-field { background-color: #ddd; @@ -243,10 +184,6 @@ div.config-form .row.field { border-radius: 4px; } - .admin-form .oscar-field-select { - margin: 10px 0 10px; - } - .view-form-btn { border: none; } diff --git a/public/modules/forms/admin/css/configure-form.css b/public/modules/forms/admin/css/configure-form.css new file mode 100644 index 00000000..24c7d66b --- /dev/null +++ b/public/modules/forms/admin/css/configure-form.css @@ -0,0 +1,79 @@ +configure-form-directive .placeholder-tag { + background-color: #999; + border-radius: 3px 3px 3px 3px; + border: 0; + color: #FFFFFF; + font-style: inherit; + font-size: 11px; + padding: 4px 5px; + margin: 0 2px 2px 2px; + font-family: inherit; + white-space: nowrap; + vertical-align: middle; + cursor: pointer !important; + display: inline!important; + width: 100%; +} + +configure-form-directive .ui-select input.form-control { + height: 34px; + padding: 6px; +} + +configure-form-directive .config-form .btn-secondary { + border-color: #DDDDDD; +} + +configure-form-directive .notification-toggle.toggle-switch { + margin: 5px 0; +} + +/* QuillJS Custom Theming */ +configure-form-directive .ql-editor { + background: white; + font-size: 18px; +} + +configure-form-directive .ql-picker.ql-placeholder { + width: 118px; +} + +configure-form-directive .ql-picker.ql-placeholder > span.ql-picker-label:before { + content: attr(data-before); +} + +configure-form-directive .ql-picker.ql-placeholder > span.ql-picker-options > span.ql-picker-item::before { + content: attr(data-label); +} + +configure-form-directive .config-form .row.field { + padding-top:1.5em; +} + + configure-form-directive .config-form > .row > .container:nth-of-type(odd){ + border-right: 1px #ddd solid; + } + + configure-form-directive .config-form .row > .field-input { + padding-left:0.1em; + } + configure-form-directive .config-form .row > .field-input label { + padding-left:1.3em; + display: block; + } + + +configure-form-directive .config-form { + max-width: 100%; +} + +configure-form-directive .config-form > .row { + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); +} \ No newline at end of file diff --git a/public/modules/forms/admin/css/design-form.css b/public/modules/forms/admin/css/design-form.css new file mode 100644 index 00000000..fbbb5871 --- /dev/null +++ b/public/modules/forms/admin/css/design-form.css @@ -0,0 +1,33 @@ +design-form-directive .ui-select input.form-control { + height: 34px; + padding: 6px; +} + +design-form-directive .config-form .btn-secondary { + border-color: #DDDDDD; +} + +design-form-directive .config-form .row.field { + padding-top: 1.5em; +} + + design-form-directive .config-form > .row > .container{ + border-right: 1px #ddd solid; + border-right: none; + } + + +design-form-directive .config-form { + max-width: 100%; +} + +design-form-directive .config-form > .row { + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); +} \ No newline at end of file diff --git a/public/modules/forms/admin/css/edit-form-configure.css b/public/modules/forms/admin/css/edit-form-configure.css deleted file mode 100644 index afe5b2b2..00000000 --- a/public/modules/forms/admin/css/edit-form-configure.css +++ /dev/null @@ -1,43 +0,0 @@ -.tag { - background-color: #999; - border-radius: 3px 3px 3px 3px; - border: 0; - color: #FFFFFF; - font-style: inherit; - font-size: 11px; - padding: 4px 5px; - margin: 0 2px 2px 2px; - font-family: inherit; - white-space: nowrap; - vertical-align: middle; - cursor: pointer !important; - pointer-events: none; -} - -.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; -} - -.ui-select input.form-control { - height: 34px; - padding: 6px; -} - -.config-form .btn-secondary { - border-color: #DDDDDD; -} - -.notification-toggle.toggle-switch { - margin: 5px 0; -} \ No newline at end of file diff --git a/public/modules/forms/admin/css/edit-submissions-view.css b/public/modules/forms/admin/css/edit-submissions-view.css index 57513224..58ff9050 100644 --- a/public/modules/forms/admin/css/edit-submissions-view.css +++ b/public/modules/forms/admin/css/edit-submissions-view.css @@ -1,4 +1,19 @@ - +/*Styles for submission table*/ +.submissions-table .table-outer.row { + margin: 1.5em 0 2em 0!important; +} +.submissions-table .table-outer .col-xs-12 { + padding-left: 0!important; + border:1px solid #ddd; + overflow-x: scroll; + border-radius:3px; +} +.submissions-table .table > thead > tr > th { + min-width:8em; +} +.submissions-table .table > tbody > tr.selected { + background-color:#efefef; +} .analytics .header-title { font-size: 1em; diff --git a/public/modules/forms/admin/css/share-form.css b/public/modules/forms/admin/css/share-form.css new file mode 100644 index 00000000..9cd6b030 --- /dev/null +++ b/public/modules/forms/admin/css/share-form.css @@ -0,0 +1,26 @@ +share-form-directive #copyEmbedded { + min-height: fit-content; + width: 100%; + background-color: #36404B; + color: white; + padding: 18px; +} + +share-form-directive .tab-content { + padding-top: 50px; +} + +share-form-directive .config-form { + max-width: 100%; +} + +share-form-directive .config-form > .row { + padding: 19px; + margin-bottom: 20px; + background-color: #f5f5f5; + border: 1px solid #e3e3e3; + border-radius: 4px; + -webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); + -moz-box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); + box-shadow: inset 0 1px 1px rgba(0, 0, 0, .05); +} \ 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 0d206f3c..be4266d3 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', '$state', '$translate', '$timeout', '$window', + function ($rootScope, $state, $translate, $timeout, $window) { return { templateUrl: 'modules/forms/admin/views/directiveViews/form/configure-form.client.view.html', restrict: 'E', @@ -14,47 +14,19 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$fil $scope.resetForm = $rootScope.resetForm; $scope.update = $rootScope.update; - console.log($scope.myform); - - $scope.$evalAsync(function() { - angular.element('.tag') - }); - - $scope.languages = ['en', 'fr', 'es', 'it', 'de']; - - $scope.langCodeToWord = { - 'en': 'English', - 'fr': 'Français', - 'es': 'Español', - 'it': 'Italiàno', - 'de': 'Deutsch' - }; - - $scope.wordToLangCode = { - 'English': 'en', - 'Français': 'fr', - 'Español': 'es', - 'Italiàno': 'it', - 'Deutsch': 'de' - }; - - $scope.configureTabs = [ - { - heading: $filter('translate')('GENERAL_TAB'), - route: 'viewForm.configure.general', - active: false - }, - { - heading: $filter('translate')('SELF_NOTIFICATIONS_TAB'), - route: 'viewForm.configure.self_notifications', - active: false - }, - { - heading: $filter('translate')('RESPONDENT_NOTIFICATIONS_TAB'), - route: 'viewForm.configure.respondent_notifications', - active: false + Quill.register('modules/placeholder', PlaceholderModule.default(Quill)) + $scope.customModules = { + placeholder: { + placeholders: $scope.myform.visible_form_fields.map(function(field){ + return { + id: field.globalId, + label: field.title + }; + }), + className: 'placeholder-tag', + delimiters: ['', ''] } - ]; + }; $scope.emailFields = $scope.myform.form_fields.filter(function(field){ return field.fieldType === 'email'; @@ -62,6 +34,25 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$fil $scope.formHasEmailField = ($scope.emailFields.length > 0); + /* Tab Routing Logic */ + $scope.configureTabs = [ + { + heading: $translate.instant('GENERAL_TAB'), + route: 'viewForm.configure.general', + active: false + }, + { + heading: $translate.instant('SELF_NOTIFICATIONS_TAB'), + route: 'viewForm.configure.self_notifications', + active: false + }, + { + heading: $translate.instant('RESPONDENT_NOTIFICATIONS_TAB'), + route: 'viewForm.configure.respondent_notifications', + active: false + } + ]; + $scope.go = function(tab){ tab.active = true; $state.go(tab.route); @@ -76,6 +67,14 @@ angular.module('forms').directive('configureFormDirective', ['$rootScope', '$fil setActiveTab(); $scope.$on("$stateChangeSuccess", setActiveTab()); + + $scope.$on('$viewContentLoaded', function ($evt, data) { + $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); + }); } }; } diff --git a/public/modules/forms/admin/directives/edit-form.client.directive.js b/public/modules/forms/admin/directives/edit-form.client.directive.js index f93823c8..d6f18337 100644 --- a/public/modules/forms/admin/directives/edit-form.client.directive.js +++ b/public/modules/forms/admin/directives/edit-form.client.directive.js @@ -122,10 +122,6 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField 'Trash': 'Trash Can' }; - if($scope.field.fieldType === 'dropdown' || $scope.field.fieldType === 'radio'){ - - } - $scope.saveField = function(){ if($scope.options.isEdit){ $scope.myform.form_fields[field_index] = $scope.field; @@ -259,15 +255,6 @@ angular.module('forms').directive('editFormDirective', ['$rootScope', 'FormField //Populate local scope with rootScope methods/variables $scope.update = $rootScope.update; - /* - ** FormFields (ui-sortable) drag-and-drop configuration - */ - $scope.dropzone = { - handle: '.handle', - containment: '.dropzoneContainer', - cursor: 'grabbing' - }; - /* ** Field CRUD Methods */ diff --git a/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js b/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js index 314a2a77..7bc5008c 100644 --- a/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js +++ b/public/modules/forms/admin/directives/edit-submissions-form.client.directive.js @@ -24,9 +24,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope', //Waits until deletionInProgress is false before running getSubmissions $scope.$watch("deletionInProgress",function(newVal, oldVal){ - if(newVal === oldVal) return; - - if(newVal === false && $scope.waitingForDeletion) { + if(newVal !== oldVal && newVal === false && $scope.waitingForDeletion) { $scope.getSubmissions(); $scope.waitingForDeletion = false; } @@ -80,7 +78,7 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope', var data = response.data || []; $scope.analyticsData = data[0]; - $scope.analyticsData.globalStatistics = $scope.analyticsData.globalStatistics[0]; + $scope.analyticsData.globalStatistics = formatGlobalStatistics($scope.analyticsData.globalStatistics); $scope.analyticsData.deviceStatistics = formatDeviceStatistics($scope.analyticsData.deviceStatistics); }); }; @@ -106,6 +104,19 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope', /* ** Analytics Functions */ + var formatGlobalStatistics = function(globalStatData){ + if(!globalStatData.length){ + return { + visits: 0, + responses: 0, + conversion_rate: 0, + average_time: 0 + }; + } + return globalStatData[0]; + } + + var formatDeviceStatistics = function(deviceStatData){ var newStatItem = function(){ return { @@ -172,14 +183,13 @@ angular.module('forms').directive('editSubmissionsFormDirective', ['$rootScope', method: 'DELETE', data: {deleted_submissions: delete_ids}, headers: {'Content-Type': 'application/json;charset=utf-8'} - }).success(function(data, status){ + }).then(function(data, status){ $scope.deletionInProgress = true; //Remove deleted ids from table $scope.table.rows = $scope.table.rows.filter(function(field){ return !field.selected; }); - }) - .error(function(err){ + }, function(err){ $scope.deletionInProgress = true; console.error(err); }); diff --git a/public/modules/forms/admin/directives/share-form.client.directive.js b/public/modules/forms/admin/directives/share-form.client.directive.js index ad8d1536..0e5bb674 100644 --- a/public/modules/forms/admin/directives/share-form.client.directive.js +++ b/public/modules/forms/admin/directives/share-form.client.directive.js @@ -1,7 +1,7 @@ 'use strict'; -angular.module('forms').directive('shareFormDirective', ['$rootScope', - function ($rootScope) { +angular.module('forms').directive('shareFormDirective', ['$rootScope', '$translate', '$state', + function ($rootScope, $translate, $state) { return { templateUrl: 'modules/forms/admin/views/directiveViews/form/share-form.client.view.html', restrict: 'E', @@ -10,6 +10,42 @@ angular.module('forms').directive('shareFormDirective', ['$rootScope', }, controller: function($scope){ $scope.actualFormURL = $scope.actualformurl; + + $scope.fullScreen = ""+ + "
"+ + $translate.instant('POWERED_BY')+ + "TellForm"+ + "
"; + + /* Tab Routing Logic */ + $scope.shareTabs = [ + { + heading: $translate.instant('SHARE_YOUR_FORM'), + route: 'viewForm.share.share_form', + active: false + }, + { + heading: $translate.instant('EMBED_YOUR_FORM'), + route: 'viewForm.share.embed_form', + active: false + } + ]; + + $scope.go = function(tab){ + tab.active = true; + $state.go(tab.route); + }; + + function setActiveTab() { + $scope.shareTabs.forEach(function(tab) { + tab.active = ($state.current.name === tab.route); + }); + } + + setActiveTab(); + + $scope.$on("$stateChangeSuccess", setActiveTab()); + } }; } diff --git a/public/modules/forms/admin/services/form-fields.client.service.js b/public/modules/forms/admin/services/form-fields.client.service.js index 302603ae..5f86b2e5 100644 --- a/public/modules/forms/admin/services/form-fields.client.service.js +++ b/public/modules/forms/admin/services/form-fields.client.service.js @@ -4,7 +4,7 @@ angular.module('forms').service('FormFields', [ '$rootScope', '$translate', 'Auth', function($rootScope, $translate, Auth) { - var language = Auth.ensureHasCurrentUser().language; + var language = $rootScope.language; $translate.use(language); this.types = [ diff --git a/public/modules/forms/admin/views/admin-form.client.view.html b/public/modules/forms/admin/views/admin-form.client.view.html index 9d922ee1..bcda5a70 100644 --- a/public/modules/forms/admin/views/admin-form.client.view.html +++ b/public/modules/forms/admin/views/admin-form.client.view.html @@ -41,7 +41,7 @@
- + {{ 'VIEW_MY_TELLFORM' | translate }} diff --git a/public/modules/forms/admin/views/adminTabs/configureTabs/general.html b/public/modules/forms/admin/views/adminTabs/configureTabs/general.html index bc228506..5f3f8145 100644 --- a/public/modules/forms/admin/views/adminTabs/configureTabs/general.html +++ b/public/modules/forms/admin/views/adminTabs/configureTabs/general.html @@ -22,10 +22,10 @@
- {{ langCodeToWord[$select.selected] }} + {{ $root.langCodeToWord[$select.selected] }} - - + + @@ -71,7 +71,7 @@
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 545532af..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,25 +60,50 @@
-
{{ 'EMAIL_SUBJECT' | translate }}:
+

{{ 'EMAIL_SUBJECT' | translate }}

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

{{ 'EMAIL_MESSAGE' | translate }}

- -
+ + +
+ + + + + + + +
+ +
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 adc03dbd..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,22 +52,51 @@
-
{{ 'EMAIL_SUBJECT' | translate }}
+

{{ 'EMAIL_SUBJECT' | translate }}

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

{{ 'EMAIL_MESSAGE' | translate }}

- + + +
+ + + + + + + +
+ +
diff --git a/public/modules/forms/admin/views/adminTabs/shareTabs/embed_form.html b/public/modules/forms/admin/views/adminTabs/shareTabs/embed_form.html new file mode 100644 index 00000000..6eac15c6 --- /dev/null +++ b/public/modules/forms/admin/views/adminTabs/shareTabs/embed_form.html @@ -0,0 +1,17 @@ +
+
+ {{ 'COPY_AND_PASTE' | translate }} +
+
+ +
+ {{ fullScreen }} +
+ +
+
+ +
+
\ No newline at end of file diff --git a/public/modules/forms/admin/views/adminTabs/shareTabs/share_form.html b/public/modules/forms/admin/views/adminTabs/shareTabs/share_form.html new file mode 100644 index 00000000..0922f8cc --- /dev/null +++ b/public/modules/forms/admin/views/adminTabs/shareTabs/share_form.html @@ -0,0 +1,13 @@ +
+
+ {{ 'TELLFORM_URL' | translate }} +
+
+ +
+
+ +
+
\ No newline at end of file diff --git a/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html index 1120e475..685045e4 100644 --- a/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html +++ b/public/modules/forms/admin/views/directiveViews/form/configure-form.client.view.html @@ -1,5 +1,4 @@
-
diff --git a/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html b/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html index e8734cd2..fb779350 100644 --- a/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html +++ b/public/modules/forms/admin/views/directiveViews/form/edit-form.client.view.html @@ -186,7 +186,6 @@
-