From af07db7971eced1f82a4c38a45748aa3104687b0 Mon Sep 17 00:00:00 2001
From: palashb01 <palash.baderia@outlook.com>
Date: Sat, 4 Mar 2023 17:58:12 +0530
Subject: [PATCH] display_settings: Rename 'Theme' section to 'Emoji'.

Rename the 'Theme' section to 'Emoji'. Since there is no 'Theme' section
anymore, replace the 'theme-settings' classname with
'emoji-display-settings' in the 'settings_display.js' file.

The existing "Theme" selector dropdown is moved from the now the
'Emoji' section to the 'General' section.
---
 help/emoji-and-emoticons.md                 |  2 +-
 help/emoji-reactions.md                     |  2 +-
 help/enable-emoticon-translations.md        |  2 +-
 web/src/settings_display.js                 |  6 +++---
 web/templates/settings/display_settings.hbs | 17 +++++++----------
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/help/emoji-and-emoticons.md b/help/emoji-and-emoticons.md
index a1ef90dd99..240f21fb44 100644
--- a/help/emoji-and-emoticons.md
+++ b/help/emoji-and-emoticons.md
@@ -64,7 +64,7 @@ you send. Zulip emoji are compatible with screen readers and other accessibility
 
 {settings_tab|display-settings}
 
-1. Under **Theme**, select **Google**,
+1. Under **Emoji**, select **Google**,
    **Twitter**, **Plain text**, or **Google blobs** for the emoji theme.
 
 {end_tabs}
diff --git a/help/emoji-reactions.md b/help/emoji-reactions.md
index 4ae2d785a1..97027568dc 100644
--- a/help/emoji-reactions.md
+++ b/help/emoji-reactions.md
@@ -87,7 +87,7 @@ so](#toggle-whether-names-of-reacting-users-are-displayed) is enabled.
 
 {settings_tab|display-settings}
 
-1. Under **Theme**, toggle **Display names of reacting users when few users have
+1. Under **Emoji**, toggle **Display names of reacting users when few users have
    reacted to a message**.
 
 {end_tabs}
diff --git a/help/enable-emoticon-translations.md b/help/enable-emoticon-translations.md
index afe20d0e50..153ab3c5cb 100644
--- a/help/enable-emoticon-translations.md
+++ b/help/enable-emoticon-translations.md
@@ -21,7 +21,7 @@ automatically by Zulip.
 
 {settings_tab|display-settings}
 
-1. Under **Theme**, select **Convert emoticons before sending**.
+1. Under **Emoji**, select **Convert emoticons before sending**.
 
 {end_tabs}
 
diff --git a/web/src/settings_display.js b/web/src/settings_display.js
index 7db0537963..01694ce974 100644
--- a/web/src/settings_display.js
+++ b/web/src/settings_display.js
@@ -198,7 +198,7 @@ export function set_up(settings_panel) {
         if (current_emojiset === data.emojiset) {
             return;
         }
-        const $spinner = $container.find(".theme-settings-status").expectOne();
+        const $spinner = $container.find(".emoji-display-settings-status").expectOne();
         loading.make_indicator($spinner, {text: settings_ui.strings.saving});
 
         channel.patch({
@@ -209,7 +209,7 @@ export function set_up(settings_panel) {
                 ui_report.error(
                     settings_ui.strings.failure_html,
                     xhr,
-                    $container.find(".theme-settings-status").expectOne(),
+                    $container.find(".emoji-display-settings-status").expectOne(),
                 );
             },
         });
@@ -248,7 +248,7 @@ export async function report_emojiset_change(settings_panel) {
     // update in all active browser windows.
     await emojisets.select(settings_panel.settings_object.emojiset);
 
-    const $spinner = $(settings_panel.container).find(".theme-settings-status");
+    const $spinner = $(settings_panel.container).find(".emoji-display-settings-status");
     if ($spinner.length) {
         loading.destroy_indicator($spinner);
         ui_report.success(
diff --git a/web/templates/settings/display_settings.hbs b/web/templates/settings/display_settings.hbs
index 4a576a21bb..138f1c37f8 100644
--- a/web/templates/settings/display_settings.hbs
+++ b/web/templates/settings/display_settings.hbs
@@ -21,22 +21,19 @@
                 {{/each}}
             </select>
         </div>
-
-    </div>
-
-
-    <div class="theme-settings {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
-        <div class="subsection-header">
-            <h3 class="light">{{t "Theme" }}</h3>
-            {{> settings_save_discard_widget section_name="theme-settings" show_only_indicator=(not for_realm_settings) }}
-        </div>
-
         <div class="input-group">
             <label for="color_scheme" class="dropdown-title">{{t "Color scheme" }}</label>
             <select name="color_scheme" class="setting_color_scheme prop-element settings_select bootstrap-focus-style" id="{{prefix}}color_scheme" data-setting-widget-type="number">
                 {{> dropdown_options_widget option_values=color_scheme_values}}
             </select>
         </div>
+    </div>
+
+    <div class="emoji-display-settings {{#if for_realm_settings}}settings-subsection-parent{{else}}subsection-parent{{/if}}">
+        <div class="subsection-header">
+            <h3 class="light">{{t "Emoji" }}</h3>
+            {{> settings_save_discard_widget section_name="emoji-display-settings" show_only_indicator=(not for_realm_settings) }}
+        </div>
 
         <div class="input-group">
             <label class="emoji-theme title">{{t "Emoji theme" }}</label>