From ed49a377e1119bfe540de0b579511cd4a9cb7e8b Mon Sep 17 00:00:00 2001 From: MathWhiz Date: Mon, 18 Apr 2016 19:15:21 -0500 Subject: [PATCH] add community guidelines info to profile editing (#7086) * add community guidelines info to profile editing * Update profile.jade --- common/locales/en/character.json | 1 + website/views/options/profile.jade | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/common/locales/en/character.json b/common/locales/en/character.json index 95e3221a86..71b29df747 100644 --- a/common/locales/en/character.json +++ b/common/locales/en/character.json @@ -1,4 +1,5 @@ { + "communityGuidelinesWarning": "Please keep in mind that your Display Name, profile photo, and blurb must comply with the Community Guidelines (e.g. no profanity, no adult topics, no insults, etc). If you have any questions about whether or not something is appropriate, feel free to email leslie@habitica.com!", "statsAch": "Stats & Achievements", "profile": "Profile", "avatar": "Customize Avatar", diff --git a/website/views/options/profile.jade b/website/views/options/profile.jade index 4777cd033c..7b5aba8546 100644 --- a/website/views/options/profile.jade +++ b/website/views/options/profile.jade @@ -256,8 +256,9 @@ script(id='partials/options.profile.profile.html', type='text/ng-template') //{{profile.profile.blurb | linky:'_blank'}} form.col-md-4(ng-show='_editing.profile', ng-submit='save()') + .alert.alert-info.alert-sm + !=env.t("communityGuidelinesWarning") input.btn.btn-primary(type='submit', value=env.t('save')) - // TODO use photo-upload instead: https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/xMmADvxBOak .form-group label=env.t('displayName')