From 15f2c659866c225265fb9a357ce9d6ea3149640c Mon Sep 17 00:00:00 2001 From: Maneesh Shukla Date: Tue, 5 Aug 2025 14:08:17 +0530 Subject: [PATCH] settings-preferences: Create left sidebar section. This commit removes the following settings from the Settings/Preferences Information section and adds a new section in the Settings/Preferences called as Left Sidebar section: - Show unread counts for - Show unread count total on home view - Show counts for starred messages - Group channels by folder in the left sidebar - Hide inactive channels Fixes #35601. --- help/channel-folders.md | 2 +- help/configure-unread-message-counters.md | 4 +- help/manage-inactive-channels.md | 2 +- help/star-a-message.md | 2 +- web/templates/settings/preferences.hbs | 2 + .../settings/preferences_information.hbs | 38 ---------------- .../settings/preferences_left_sidebar.hbs | 44 +++++++++++++++++++ 7 files changed, 51 insertions(+), 43 deletions(-) create mode 100644 web/templates/settings/preferences_left_sidebar.hbs diff --git a/help/channel-folders.md b/help/channel-folders.md index 164c2ced18..dfec7b78cf 100644 --- a/help/channel-folders.md +++ b/help/channel-folders.md @@ -14,7 +14,7 @@ {settings_tab|preferences} -1. Under **Information**, toggle **Group channels by folder in the left +1. Under **Left sidebar**, toggle **Group channels by folder in the left sidebar**. {end_tabs} diff --git a/help/configure-unread-message-counters.md b/help/configure-unread-message-counters.md index 57ae8586e4..88e84b6a36 100644 --- a/help/configure-unread-message-counters.md +++ b/help/configure-unread-message-counters.md @@ -19,7 +19,7 @@ opening it. {settings_tab|preferences} -1. Under **Information**, select your preferred option from the +1. Under **Left sidebar**, select your preferred option from the **Show unread counts for** dropdown. {end_tabs} @@ -46,7 +46,7 @@ on your home view will also be shown when you're in that view. {settings_tab|preferences} -1. Under **Information**, toggle **Show unread count total on home view**. +1. Under **Left sidebar**, toggle **Show unread count total on home view**. {end_tabs} diff --git a/help/manage-inactive-channels.md b/help/manage-inactive-channels.md index 3f9513a7fa..4a05f037b4 100644 --- a/help/manage-inactive-channels.md +++ b/help/manage-inactive-channels.md @@ -48,7 +48,7 @@ channels if you need to access them. {settings_tab|preferences} -1. Under **Information**, configure **Hide inactive channels**. +1. Under **Left sidebar**, configure **Hide inactive channels**. {end_tabs} diff --git a/help/star-a-message.md b/help/star-a-message.md index 332aec260f..cb784cb220 100644 --- a/help/star-a-message.md +++ b/help/star-a-message.md @@ -94,7 +94,7 @@ can disable that feature. {settings_tab|preferences} -1. Under **Information**, toggle **Show counts for starred messages**. +1. Under **Left sidebar**, toggle **Show counts for starred messages**. {end_tabs} diff --git a/web/templates/settings/preferences.hbs b/web/templates/settings/preferences.hbs index 5c2bf0fb66..935e8badfa 100644 --- a/web/templates/settings/preferences.hbs +++ b/web/templates/settings/preferences.hbs @@ -8,4 +8,6 @@ {{>preferences_navigation .}} {{>preferences_information .}} + + {{>preferences_left_sidebar .}} diff --git a/web/templates/settings/preferences_information.hbs b/web/templates/settings/preferences_information.hbs index 0e55556eb0..b7b655076d 100644 --- a/web/templates/settings/preferences_information.hbs +++ b/web/templates/settings/preferences_information.hbs @@ -56,27 +56,6 @@ -
- - -
- - {{> settings_checkbox - setting_name="web_left_sidebar_unreads_count_summary" - is_checked=settings_object.web_left_sidebar_unreads_count_summary - label=settings_label.web_left_sidebar_unreads_count_summary - render_only=settings_render_only.web_left_sidebar_unreads_count_summary - prefix=prefix}} - - {{> settings_checkbox - setting_name="starred_message_counts" - is_checked=settings_object.starred_message_counts - label=settings_label.starred_message_counts - render_only=settings_render_only.starred_message_counts - prefix=prefix}} - {{> settings_checkbox setting_name="receives_typing_notifications" is_checked=settings_object.receives_typing_notifications @@ -98,23 +77,6 @@ render_only=settings_render_only.fluid_layout_width prefix=prefix}} - {{> settings_checkbox - setting_name="web_left_sidebar_show_channel_folders" - is_checked=settings_object.web_left_sidebar_show_channel_folders - label=settings_label.web_left_sidebar_show_channel_folders - render_only=settings_render_only.web_left_sidebar_show_channel_folders - help_link="/help/channel-folders" - prefix=prefix}} - -
- - -
- {{> settings_checkbox setting_name="high_contrast_mode" is_checked=settings_object.high_contrast_mode diff --git a/web/templates/settings/preferences_left_sidebar.hbs b/web/templates/settings/preferences_left_sidebar.hbs new file mode 100644 index 0000000000..3a17f17ce0 --- /dev/null +++ b/web/templates/settings/preferences_left_sidebar.hbs @@ -0,0 +1,44 @@ +
+
+

{{t "Left sidebar" }}

+ {{> settings_save_discard_widget section_name="left-sidebar-settings" show_only_indicator=(not for_realm_settings) }} +
+ +
+ + +
+ + {{> settings_checkbox + setting_name="web_left_sidebar_unreads_count_summary" + is_checked=settings_object.web_left_sidebar_unreads_count_summary + label=settings_label.web_left_sidebar_unreads_count_summary + render_only=settings_render_only.web_left_sidebar_unreads_count_summary + prefix=prefix}} + + {{> settings_checkbox + setting_name="starred_message_counts" + is_checked=settings_object.starred_message_counts + label=settings_label.starred_message_counts + render_only=settings_render_only.starred_message_counts + prefix=prefix}} + + {{> settings_checkbox + setting_name="web_left_sidebar_show_channel_folders" + is_checked=settings_object.web_left_sidebar_show_channel_folders + label=settings_label.web_left_sidebar_show_channel_folders + render_only=settings_render_only.web_left_sidebar_show_channel_folders + help_link="/help/channel-folders" + prefix=prefix}} + +
+ + +
+