From a07148830ea832c6daf3b347c152a30d44df91c1 Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 15 Nov 2016 13:29:54 +1100 Subject: [PATCH] FEATURE: add TOS and Privacy links to sign up --- .../discourse/controllers/create-account.js.es6 | 7 +++++++ .../discourse/templates/modal/create-account.hbs | 1 + app/assets/stylesheets/common/base/login.scss | 4 ++++ config/locales/client.en.yml | 1 + 4 files changed, 13 insertions(+) diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6 index 3135eb0f952..ea7dee44093 100644 --- a/app/assets/javascripts/discourse/controllers/create-account.js.es6 +++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6 @@ -78,6 +78,13 @@ export default Ember.Controller.extend(ModalFunctionality, { return Ember.isEmpty(this.get('authOptions.auth_provider')); }.property('authOptions.auth_provider'), + disclaimerHtml: function() { + return I18n.t('create_account.disclaimer', { + tos_link: this.get('siteSettings.tos_url') || Discourse.getURL('/tos'), + privacy_link: this.get('siteSettings.privacy_policy_url') || Discourse.getURL('/privacy') + }); + }.property(), + passwordInstructions: function() { return this.get('isDeveloper') ? I18n.t('user.password.instructions', {count: Discourse.SiteSettings.min_admin_password_length}) : I18n.t('user.password.instructions', {count: Discourse.SiteSettings.min_password_length}); }.property('isDeveloper'), diff --git a/app/assets/javascripts/discourse/templates/modal/create-account.hbs b/app/assets/javascripts/discourse/templates/modal/create-account.hbs index 4089c7055fe..67ac3aa2932 100644 --- a/app/assets/javascripts/discourse/templates/modal/create-account.hbs +++ b/app/assets/javascripts/discourse/templates/modal/create-account.hbs @@ -90,6 +90,7 @@ {{/if}} +
{{{disclaimerHtml}}}
{{/if}} {{/d-modal-body}} diff --git a/app/assets/stylesheets/common/base/login.scss b/app/assets/stylesheets/common/base/login.scss index c22321d81cb..5061ed5a4a7 100644 --- a/app/assets/stylesheets/common/base/login.scss +++ b/app/assets/stylesheets/common/base/login.scss @@ -27,6 +27,10 @@ $input-width: 220px; } } + .disclaimer { + font-size: 0.9em; + } + .user-field.confirm { margin-top: 20px; } diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 26fbdbaa1a2..99415e82d0b 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -946,6 +946,7 @@ en: search_hint: 'username, email or IP address' create_account: + disclaimer: "By registering, you agree to the privacy policy and terms of service." title: "Create New Account" failed: "Something went wrong, perhaps this email is already registered, try the forgot password link"