Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: add TOS and Privacy links to sign up

This commit is contained in:
Sam 2016-11-15 13:29:54 +11:00
parent f4c754b389
commit a07148830e
4 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/controllers/create-account.js.es6
View File

@ -78,6 +78,13 @@ export default Ember.Controller.extend(ModalFunctionality, {
return Ember.isEmpty(this.get('authOptions.auth_provider')); return Ember.isEmpty(this.get('authOptions.auth_provider'));
}.property('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() { 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}); 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'), }.property('isDeveloper'),

1
app/assets/javascripts/discourse/templates/modal/create-account.hbs
View File

@ -90,6 +90,7 @@
{{/if}} {{/if}}
</form> </form>
<div class='disclaimer'>{{{disclaimerHtml}}}</div>
</div> </div>
{{/if}} {{/if}}
{{/d-modal-body}} {{/d-modal-body}}

4
app/assets/stylesheets/common/base/login.scss
View File

@ -27,6 +27,10 @@ $input-width: 220px;
} }
} }
.disclaimer {
font-size: 0.9em;
}
.user-field.confirm { .user-field.confirm {
margin-top: 20px; margin-top: 20px;
} }

1
config/locales/client.en.yml
View File

@ -946,6 +946,7 @@ en:
search_hint: 'username, email or IP address' search_hint: 'username, email or IP address'
create_account: create_account:
disclaimer: "By registering, you agree to the <a href='{{privacy_link}}'>privacy policy</a> and <a href='{{tos_link}}'>terms of service</a>."
title: "Create New Account" title: "Create New Account"
failed: "Something went wrong, perhaps this email is already registered, try the forgot password link" failed: "Something went wrong, perhaps this email is already registered, try the forgot password link"