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

Feature: Add warning banner in email settings when mailing list mode enabled

This commit is contained in:
Jeff Wong 2018-05-23 18:51:08 -07:00
parent d366f8d888
commit ebd966fbdb
3 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/templates/preferences/emails.hbs
View File

@ -1,3 +1,10 @@
{{#unless siteSettings.disable_mailing_list_mode}}
<div class="warning-wrap">
{{#if model.user_option.mailing_list_mode}}
<div class="warning">{{i18n 'user.mailing_list_mode.warning'}}</div>
{{/if}}
</div>
{{/unless}}
<div class="control-group pref-email-settings">
<label class="control-label">{{i18n 'user.email_settings'}}</label>
<div class='controls controls-dropdown'>

5
app/assets/stylesheets/common/base/user.scss
View File

@ -541,6 +541,11 @@
width: 520px;
}
.warning-wrap {
height: 30px;
margin-bottom: 10px;
}
.category-notifications .category-controls,
.tag-notifications .tag-controls {
margin-top: 24px;

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

@ -659,6 +659,7 @@ en:
individual_no_echo: "Send an email for every new post except my own"
many_per_day: "Send me an email for every new post (about {{dailyEmailEstimate}} per day)"
few_per_day: "Send me an email for every new post (about 2 per day)"
warning: "Mailing list mode enabled. Email notification settings are overridden."
tag_settings: "Tags"
watched_tags: "Watched"
watched_tags_instructions: "You will automatically watch all topics with these tags. You will be notified of all new posts and topics, and a count of new posts will also appear next to the topic."