github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-31 12:19:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: hide confusing instructions when email_always is enabled

Browse Source
This commit is contained in:
Sam 2016-02-25 11:33:13 +11:00
parent 6b46092aa2
commit 802ff3b0d9
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/discourse/templates/user/preferences.hbs
View File

@ -184,7 +184,7 @@
{{preference-checkbox labelKey="user.email_direct" checked=model.user_option.email_direct}} {{preference-checkbox labelKey="user.email_direct" checked=model.user_option.email_direct}}
<span class="pref-mailing-list-mode">{{preference-checkbox labelKey="user.mailing_list_mode" checked=model.user_option.mailing_list_mode}}</span> <span class="pref-mailing-list-mode">{{preference-checkbox labelKey="user.mailing_list_mode" checked=model.user_option.mailing_list_mode}}</span>
{{preference-checkbox labelKey="user.email_always" checked=model.user_option.email_always}} {{preference-checkbox labelKey="user.email_always" checked=model.user_option.email_always}}
{{#unless model.user_option.email_always}}
<div class='instructions'> <div class='instructions'>
{{#if siteSettings.email_time_window_mins}} {{#if siteSettings.email_time_window_mins}}
{{i18n 'user.email.frequency' count=siteSettings.email_time_window_mins}} {{i18n 'user.email.frequency' count=siteSettings.email_time_window_mins}}
@ -192,6 +192,7 @@
{{i18n 'user.email.frequency_immediately'}} {{i18n 'user.email.frequency_immediately'}}
{{/if}} {{/if}}
</div> </div>
{{/unless}}