mirror of
https://github.com/zulip/zulip.git
synced 2025-11-13 10:26:28 +00:00
settings: Move presence-enabled setting to 'Account & privacy'.
The presence setting is more suited in 'Account & privacy' section as it is not related to notifications in anyway and resembles privacy of user by allowing user to hide his status of being online.
This commit is contained in:
@@ -681,4 +681,19 @@ export function set_up() {
|
|||||||
$(".timezone-setting-status").expectOne(),
|
$(".timezone-setting-status").expectOne(),
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$("#presence_enabled").val(page_params.presence_enabled);
|
||||||
|
|
||||||
|
$("#presence_enabled").on("change", (e) => {
|
||||||
|
e.preventDefault();
|
||||||
|
e.stopPropagation();
|
||||||
|
|
||||||
|
const data = {presence_enabled: $("#presence_enabled").prop("checked")};
|
||||||
|
settings_ui.do_settings_change(
|
||||||
|
channel.patch,
|
||||||
|
"/json/settings/notifications",
|
||||||
|
data,
|
||||||
|
$(".privacy-setting-status").expectOne(),
|
||||||
|
);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -387,13 +387,10 @@ const email_notification_settings = [
|
|||||||
"enable_marketing_emails",
|
"enable_marketing_emails",
|
||||||
];
|
];
|
||||||
|
|
||||||
const presence_notification_settings = ["presence_enabled"];
|
|
||||||
|
|
||||||
const other_notification_settings = desktop_notification_settings.concat(
|
const other_notification_settings = desktop_notification_settings.concat(
|
||||||
["desktop_icon_count_display"],
|
["desktop_icon_count_display"],
|
||||||
mobile_notification_settings,
|
mobile_notification_settings,
|
||||||
email_notification_settings,
|
email_notification_settings,
|
||||||
presence_notification_settings,
|
|
||||||
["notification_sound"],
|
["notification_sound"],
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -441,7 +438,6 @@ export const all_notifications = () => ({
|
|||||||
desktop_notification_settings,
|
desktop_notification_settings,
|
||||||
mobile_notification_settings,
|
mobile_notification_settings,
|
||||||
email_notification_settings,
|
email_notification_settings,
|
||||||
presence_notification_settings,
|
|
||||||
},
|
},
|
||||||
show_push_notifications_tooltip: {
|
show_push_notifications_tooltip: {
|
||||||
push_notifications: !page_params.realm_push_notifications_enabled,
|
push_notifications: !page_params.realm_push_notifications_enabled,
|
||||||
|
|||||||
@@ -597,7 +597,8 @@ input[type="checkbox"] {
|
|||||||
|
|
||||||
.alert-notification.custom-field-status,
|
.alert-notification.custom-field-status,
|
||||||
.alert-notification.full-name-status,
|
.alert-notification.full-name-status,
|
||||||
.alert-notification.timezone-setting-status {
|
.alert-notification.timezone-setting-status,
|
||||||
|
.alert-notification.presence-setting-status {
|
||||||
padding-top: 0;
|
padding-top: 0;
|
||||||
padding-bottom: 0;
|
padding-bottom: 0;
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
|
|||||||
@@ -95,6 +95,17 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="form-horizontal" id="privacy_settings_box">
|
||||||
|
<h3 class="inline-block">{{t "Privacy" }}</h3>
|
||||||
|
<div class="alert-notification privacy-setting-status"></div>
|
||||||
|
<div class="input-group">
|
||||||
|
{{> settings_checkbox
|
||||||
|
setting_name="presence_enabled"
|
||||||
|
is_checked=page_params.presence_enabled
|
||||||
|
label=settings_label.presence_enabled}}
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<hr class="settings_separator" />
|
<hr class="settings_separator" />
|
||||||
|
|
||||||
<div class="form-horizontal" id="api_key_button_box">
|
<div class="form-horizontal" id="api_key_button_box">
|
||||||
|
|||||||
@@ -106,15 +106,6 @@
|
|||||||
label=(lookup ../settings_label this)}}
|
label=(lookup ../settings_label this)}}
|
||||||
{{/each}}
|
{{/each}}
|
||||||
|
|
||||||
<h5>{{t "Presence" }}</h5>
|
|
||||||
|
|
||||||
{{#each notification_settings.presence_notification_settings}}
|
|
||||||
{{> settings_checkbox
|
|
||||||
setting_name=this
|
|
||||||
is_checked=(lookup ../page_params this)
|
|
||||||
label=(lookup ../settings_label this)}}
|
|
||||||
{{/each}}
|
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -77,10 +77,9 @@ the UI will be frozen as the time you enabled this setting.
|
|||||||
|
|
||||||
{start_tabs}
|
{start_tabs}
|
||||||
|
|
||||||
{settings_tab|notifications}
|
{settings_tab|account-and-privacy}
|
||||||
|
|
||||||
1. Under **Other notification settings**, in the **Presence**
|
1. Under **Privacy**, toggle **Display my availability to other users**.
|
||||||
subsection, toggle **Display my availability to other users**.
|
|
||||||
|
|
||||||
{end_tabs}
|
{end_tabs}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user