github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 01:25:54 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

UX: Move disable PM option under notifications in user preferences.

Browse Source
This commit is contained in:
Guo Xiang Tan 2017-10-26 16:20:58 +08:00
parent 1c7b4381cc
commit c650ef9138
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/controllers/preferences/interface.js.es6
View File

@ -14,7 +14,6 @@ export default Ember.Controller.extend(PreferencesTabController, {
'enable_quoting', 'enable_quoting',
'disable_jump_reply', 'disable_jump_reply',
'automatically_unpin_topics', 'automatically_unpin_topics',
'allow_private_messages',
]; ];
if (makeDefault) { if (makeDefault) {

3
app/assets/javascripts/discourse/controllers/preferences/notifications.js.es6
View File

@ -10,7 +10,8 @@ export default Ember.Controller.extend(PreferencesTabController, {
'new_topic_duration_minutes', 'new_topic_duration_minutes',
'auto_track_topics_after_msecs', 'auto_track_topics_after_msecs',
'notification_level_when_replying', 'notification_level_when_replying',
'like_notification_frequency' 'like_notification_frequency',
'allow_private_messages',
], ],
@computed("model.watchedCategories", "model.trackedCategories", "model.mutedCategories") @computed("model.watchedCategories", "model.trackedCategories", "model.mutedCategories")

10
app/assets/javascripts/discourse/templates/preferences/interface.hbs
View File

@ -10,16 +10,6 @@
</div> </div>
{{/if}} {{/if}}
<div class="control-group private-messages">
<label class="control-label">{{i18n 'user.private_messages'}}</label>
<div class="controls">
{{preference-checkbox
labelKey="user.allow_private_messages"
checked=model.user_option.allow_private_messages}}
</div>
</div>
{{#if siteSettings.allow_user_locale}} {{#if siteSettings.allow_user_locale}}
<div class="control-group pref-locale"> <div class="control-group pref-locale">
<label class="control-label">{{i18n 'user.locale.title'}}</label> <label class="control-label">{{i18n 'user.locale.title'}}</label>

10
app/assets/javascripts/discourse/templates/preferences/notifications.hbs
View File

@ -26,6 +26,16 @@
<div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div> <div class="instructions">{{i18n 'user.desktop_notifications.each_browser_note'}}</div>
</div> </div>
<div class="control-group private-messages">
<label class="control-label">{{i18n 'user.private_messages'}}</label>
<div class="controls">
{{preference-checkbox
labelKey="user.allow_private_messages"
checked=model.user_option.allow_private_messages}}
</div>
</div>
<div class="control-group muting"> <div class="control-group muting">
<label class="control-label">{{i18n 'user.users'}}</label> <label class="control-label">{{i18n 'user.users'}}</label>
<div class="controls category-controls"> <div class="controls category-controls">