help: Document channel folder management functionality.

Updates the left sidebar and relative settings link in both the
current and new help center documentation.

Co-authored-by: Lauryn Menard <lauryn@zulip.com>

help-beta/astro.config.mjs

@@ -273,6 +273,7 @@ export default defineConfig({
                         "create-a-channel",
                         "pin-a-channel",
                         "change-the-color-of-a-channel",
+                        "channel-folders",
                         "unsubscribe-from-a-channel",
                         "manage-inactive-channels",
                         "move-content-to-another-channel",
@@ -384,7 +385,7 @@ export default defineConfig({
                         },
                         "public-access-option",
                         "general-chat-channels",
-                        "channel-folders",
+                        "manage-channel-folders",
                         "channel-permissions",
                         "channel-posting-policy",
                         "configure-who-can-administer-a-channel",

help-beta/src/components/NavigationSteps.astro

@@ -154,6 +154,11 @@ const setting_link_mapping: Record<
         setting_name: "Custom profile fields",
         setting_link: "/#organization/profile-field-settings",
     },
+    "channel-folder-settings": {
+        setting_type: ORGANIZATION_SETTINGS_TYPE,
+        setting_name: "Channel folders",
+        setting_link: "/#organization/channel-folders",
+    },
     "data-exports-admin": {
         setting_type: ORGANIZATION_SETTINGS_TYPE,
         setting_name: "Data exports",

help/channel-folders.md

@@ -1,58 +1,10 @@
 # Channel folders
 
-Organizations can sort channels into folders. For example, you can put all the
+{!channel-folders-intro.md!}
-channels associated with a team into a dedicated folder. Channels will be
-grouped into folders in the [**Inbox**](/help/inbox) view, and users can
-[decide](#configure-whether-channels-are-grouped-by-folder-in-the-left-sidebar)
-whether to group them by folder in the [left sidebar](/help/left-sidebar).
-
-Everyone can [pin channels](/help/pin-a-channel) they personally want to pay
-close attention to. Pinned channels appear in a dedicated **pinned channels**
-section above channel folders.
 
 ## Move a channel to a folder
 
-{start_tabs}
+{!move-channel-to-folder.md!}
-
-{tab|desktop-web}
-
-{relative|channel|all}
-
-1. Select a channel.
-
-{!select-channel-view-general.md!}
-
-1. *(optional)* [Create a new channel folder](#create-a-new-channel-folder).
-
-1. Under **Folders**, select the desired folder from the **Channel folder**
-   dropdown.
-
-{!save-changes.md!}
-
-{!channel-settings-general-tab-tip.md!}
-
-{end_tabs}
-
-## Create a new channel folder
-
-{!admin-only.md!}
-
-{start_tabs}
-
-{tab|desktop-web}
-
-{relative|channel|all}
-
-1. Select any channel.
-
-{!select-channel-view-general.md!}
-
-1. Under **Folders**, click the **Create new folder** button to the right of the
-   folder selection dropdown.
-
-1. Fill out the requested information, and click **Create**.
-
-{end_tabs}
 
 ## Configure whether channels are grouped by folder in the left sidebar
 
@@ -69,8 +21,8 @@ section above channel folders.
 
 ## Related articles
 
+* [Manage channel folders](/help/manage-channel-folders)
 * [Introduction to channels](/help/introduction-to-channels)
 * [Pin a channel](/help/pin-a-channel)
 * [Mute or unmute a channel](/help/mute-a-channel)
 * [Hide or reveal inactive channels](/help/manage-inactive-channels)
-* [Manage user groups](/help/manage-user-groups)

help/include/channel-folders-intro.md

@@ -0,0 +1,9 @@
+Organizations can sort channels into folders. For example, you can put all the
+channels associated with a team into a dedicated folder. Channels will be
+grouped into folders in the [**Inbox**](/help/inbox) view, and users can
+[decide](/help/channel-folders#configure-whether-channels-are-grouped-by-folder-in-the-left-sidebar)
+whether to group them by folder in the [left sidebar](/help/left-sidebar).
+
+Everyone can [pin channels](/help/pin-a-channel) they personally want to pay
+close attention to. Pinned channels appear in a dedicated **pinned channels**
+section above channel folders.

help/include/move-channel-to-folder.md

@@ -0,0 +1,20 @@
+{start_tabs}
+
+{tab|desktop-web}
+
+{relative|channel|all}
+
+1. Select a channel.
+
+{!select-channel-view-general.md!}
+
+1. *(optional)* [Create a new channel folder](/help/manage-channel-folders#create-a-new-channel-folder).
+
+1. Under **Folders**, select the desired folder from the **Channel folder**
+   dropdown.
+
+{!save-changes.md!}
+
+{!channel-settings-general-tab-tip.md!}
+
+{end_tabs}

help/include/sidebar_index.md

@@ -146,6 +146,7 @@
 * [Create a channel](/help/create-a-channel)
 * [Pin a channel](/help/pin-a-channel)
 * [Change the color of a channel](/help/change-the-color-of-a-channel)
+* [Channel folders](/help/channel-folders)
 * [Unsubscribe from a channel](/help/unsubscribe-from-a-channel)
 * [Hide or reveal inactive channels](/help/manage-inactive-channels)
 * [Move content to another channel](/help/move-content-to-another-channel)
@@ -219,7 +220,7 @@
 * [Public channels](/help/channel-permissions#public-channels)
 * [Public access option](/help/public-access-option)
 * [“General chat” channels](/help/general-chat-channels)
-* [Channel folders](/help/channel-folders)
+* [Manage channel folders](/help/manage-channel-folders)
 * [Channel permissions](/help/channel-permissions)
 * [Channel posting policy](/help/channel-posting-policy)
 * [Configure who can administer a channel](/help/configure-who-can-administer-a-channel)

help/manage-channel-folders.md

@@ -0,0 +1,127 @@
+# Manage channel folders
+
+{!channel-folders-intro.md!}
+
+## Move a channel to a folder
+
+{!move-channel-to-folder.md!}
+
+## Create a new channel folder
+
+{!admin-only.md!}
+
+{start_tabs}
+
+{tab|via-organization-settings}
+
+{settings_tab|channel-folder-settings}
+
+1. Click **Add a new channel folder**.
+
+1. Fill out channel folder information as desired, and click **Create**.
+
+1. In the **Name** column, click and drag the vertical dots to reorder channel
+   folders.
+
+{tab|via-channel-settings}
+
+{relative|channel|all}
+
+1. Select any channel.
+
+{!select-channel-view-general.md!}
+
+1. Under **Folders**, click the **Create new folder** button to the right of the
+   folder selection dropdown.
+
+1. Fill out the requested information, and click **Create**.
+
+{end_tabs}
+
+## Edit a channel folder
+
+{!admin-only.md!}
+
+{start_tabs}
+
+{tab|via-organization-settings}
+
+{settings_tab|channel-folder-settings}
+
+1. In the **Actions** column, click the **edit** (<i class="zulip-icon zulip-icon-edit"></i>)
+   icon for the channel folder you want to edit.
+
+1. Edit channel folder information as desired, and click **Save changes**.
+
+{tab|via-channel-settings}
+
+{relative|channel|all}
+
+1. Select any channel.
+
+{!select-channel-view-general.md!}
+
+1. Under **Folders**, click the **edit** (<i class="zulip-icon
+   zulip-icon-edit"></i>) icon for the channel folder you want to edit in the
+   **Channel folder** dropdown.
+
+1. Edit channel folder information as desired, and click **Save changes**.
+
+{end_tabs}
+
+## Delete a channel folder
+
+{!admin-only.md!}
+
+{start_tabs}
+
+{tab|via-organization-settings}
+
+{settings_tab|channel-folder-settings}
+
+1. In the **Actions** column, click the **delete** (<i class="zulip-icon
+   zulip-icon-trash"></i>) icon for the channel folder you want to delete.
+
+1. Approve by clicking **Confirm**.
+
+{tab|via-channel-settings}
+
+{relative|channel|all}
+
+1. Select any channel.
+
+{!select-channel-view-general.md!}
+
+1. Under **Folders**, click the **delete** (<i class="zulip-icon
+   zulip-icon-trash"></i>) icon for the channel folder you want to delete in the
+   **Channel folder** dropdown.
+
+1. Approve by clicking **Confirm**.
+
+{end_tabs}
+
+## Reorder channel folders
+
+{!admin-only.md!}
+
+Users will see channel folders in the specified order.
+
+{start_tabs}
+
+{tab|desktop-web}
+
+{settings_tab|channel-folder-settings}
+
+1. In the **Name** column, click and drag the vertical dots to reorder channel
+   folders.
+
+{end_tabs}
+
+## Related articles
+
+* [Channel folders](/help/channel-folders)
+* [Introduction to channels](/help/introduction-to-channels)
+* [Pin a channel](/help/pin-a-channel)
+* [Mute or unmute a channel](/help/mute-a-channel)
+* [Hide or reveal inactive channels](/help/manage-inactive-channels)
+* [Manage user groups](/help/manage-user-groups)

zerver/lib/markdown/help_settings_links.py

@@ -104,6 +104,11 @@ link_mapping = {
         "Custom profile fields",
         "/#organization/profile-field-settings",
     ],
+    "channel-folder-settings": [
+        "Organization settings",
+        "Channel folders",
+        "/#organization/channel-folders",
+    ],
     "data-exports-admin": [
         "Organization settings",
         "Data exports",