From 50d0f077436d78cca0b708585b461ee8548b1226 Mon Sep 17 00:00:00 2001 From: illya Date: Wed, 1 Mar 2017 13:11:22 +0200 Subject: [PATCH 01/19] Add new fields to the schema --- branding/collection/schema.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/branding/collection/schema.js b/branding/collection/schema.js index 9713bc2ec7..1b6f5c391a 100644 --- a/branding/collection/schema.js +++ b/branding/collection/schema.js @@ -42,6 +42,20 @@ Branding.schema = new SimpleSchema({ type: String, optional: true, }, + privacyPolicy: { + type: String, + optional: true, + autoform: { + rows: 5, + }, + }, + termsOfUse: { + type: String, + optional: true, + autoform: { + rows: 5, + }, + }, socialMedia: { type: [Object], optional: true, From a52c269d4c8ffaad0e56b1a21e536e529c124ca4 Mon Sep 17 00:00:00 2001 From: illya Date: Wed, 1 Mar 2017 13:11:35 +0200 Subject: [PATCH 02/19] Add new fields to the branding page --- branding/client/branding.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/branding/client/branding.html b/branding/client/branding.html index 2977435a37..8c08966523 100644 --- a/branding/client/branding.html +++ b/branding/client/branding.html @@ -25,6 +25,8 @@

{{> afQuickField name='siteSlogan' }} {{> afQuickField name='colors' }} {{> afQuickField name='siteFooter' }} + {{> afQuickField name='privacyPolicy' }} + {{> afQuickField name='termsOfUse' }} {{> afQuickField name='socialMedia' }}
-
+

{{ branding.siteFooter }}

+
+ +
    {{# if currentUser }} From 8e6a3c1e787d16764b2a9aa437f742dcffe1c2ac Mon Sep 17 00:00:00 2001 From: illya Date: Thu, 2 Mar 2017 14:02:17 +0200 Subject: [PATCH 08/19] Links on sign up page --- users/client/lib/accounts_config.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/users/client/lib/accounts_config.js b/users/client/lib/accounts_config.js index 08d4d27e54..bcf81b813b 100644 --- a/users/client/lib/accounts_config.js +++ b/users/client/lib/accounts_config.js @@ -26,6 +26,9 @@ AccountsTemplates.configure({ positiveValidation: false, positiveFeedback: true, showValidating: true, + // Privacy Policy and Terms of Use + privacyUrl: 'privacy-policy', + termsUrl: 'terms-of-use', }); // rearranging the fields on Sign-Up, so that username comes first. From c893761ab1e6c28f3154869b0f4bc0c8334b677a Mon Sep 17 00:00:00 2001 From: illya Date: Thu, 2 Mar 2017 14:09:57 +0200 Subject: [PATCH 09/19] Add quill npm --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 709825832f..2d258907ca 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "lodash": "^4.17.4", "meteor-node-stubs": "^0.2.5", "moment": "^2.17.1", + "quill": "^1.2.2", "simple-statistics": "^2.2.0", "swagger-client": "^2.1.32", "swagger-parser": "^3.4.1", From 4ebf074e3d8c5b4be9764c232dc4295d7b61c7aa Mon Sep 17 00:00:00 2001 From: illya Date: Thu, 2 Mar 2017 15:26:22 +0200 Subject: [PATCH 10/19] Remove npm --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 2d258907ca..709825832f 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,6 @@ "lodash": "^4.17.4", "meteor-node-stubs": "^0.2.5", "moment": "^2.17.1", - "quill": "^1.2.2", "simple-statistics": "^2.2.0", "swagger-client": "^2.1.32", "swagger-parser": "^3.4.1", From 5ed406258f2b2966a1d8662f306d99a61fb5b738 Mon Sep 17 00:00:00 2001 From: illya Date: Thu, 2 Mar 2017 15:27:11 +0200 Subject: [PATCH 11/19] Add aramk:quill --- .meteor/packages | 1 + .meteor/versions | 2 ++ 2 files changed, 3 insertions(+) diff --git a/.meteor/packages b/.meteor/packages index ef5326118a..9a715c698b 100644 --- a/.meteor/packages +++ b/.meteor/packages @@ -84,3 +84,4 @@ useraccounts:core useraccounts:flow-routing vsivsi:file-collection zimme:active-route +aramk:quill diff --git a/.meteor/versions b/.meteor/versions index 26d03910dc..8ec38d7a57 100644 --- a/.meteor/versions +++ b/.meteor/versions @@ -20,6 +20,7 @@ apinf:autoform-bs-datepicker@1.1.2 apinf:create-role-if-undefined@0.1.1 apinf:first-admin@0.1.2 apinf:restivus-swagger@0.2.1 +aramk:quill@0.1.1 arillo:flow-router-helpers@0.5.2 autoupdate@1.3.12 babel-compiler@6.13.0 @@ -152,6 +153,7 @@ templating-tools@1.0.5 tmeasday:publish-counts@0.8.0 todda00:friendly-slugs@0.6.0 tracker@1.1.1 +trever:quill@0.0.5 twbs:bootstrap@3.3.6 u2622:persistent-session@0.4.4 ui@1.0.12 From 975de4104d885b308fc198df96a22cbd16d12834 Mon Sep 17 00:00:00 2001 From: illya Date: Thu, 2 Mar 2017 15:27:48 +0200 Subject: [PATCH 12/19] Add quill to quick form fields --- branding/client/branding.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/branding/client/branding.html b/branding/client/branding.html index 8c08966523..463cb11665 100644 --- a/branding/client/branding.html +++ b/branding/client/branding.html @@ -25,8 +25,8 @@

    {{> afQuickField name='siteSlogan' }} {{> afQuickField name='colors' }} {{> afQuickField name='siteFooter' }} - {{> afQuickField name='privacyPolicy' }} - {{> afQuickField name='termsOfUse' }} + {{> afQuickField name='privacyPolicy' type="quill" }} + {{> afQuickField name='termsOfUse' type="quill" }} {{> afQuickField name='socialMedia' }}
    From d4a98acdaa20b30d8380254d0f5ca649e6fd463e Mon Sep 17 00:00:00 2001 From: illya Date: Fri, 3 Mar 2017 10:59:27 +0200 Subject: [PATCH 15/19] i18n --- branding/client/privacy_policy/privacyPolicy.html | 2 +- branding/client/terms_of_use/termsOfUse.html | 2 +- core/lib/i18n/en.i18n.json | 4 ++++ home/client/footer/homeFooter.html | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/branding/client/privacy_policy/privacyPolicy.html b/branding/client/privacy_policy/privacyPolicy.html index 49fa1ba645..b14cc5971d 100644 --- a/branding/client/privacy_policy/privacyPolicy.html +++ b/branding/client/privacy_policy/privacyPolicy.html @@ -1,7 +1,7 @@