From 691f3c2d49be1bc12bbf2b67fff819f45afd940c Mon Sep 17 00:00:00 2001
From: Sahil Batra <sahil@zulip.com>
Date: Tue, 2 May 2023 22:40:43 +0530
Subject: [PATCH] settings: Reorder settings in "Automated messages and emails"
 section.

This commit reorders the settings in "Automated messages and emails"
subsection such that most useful options are at top and automated
messages and email settings are grouped together as proposed
in #25339.
---
 .../settings/organization_settings_admin.hbs  | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/web/templates/settings/organization_settings_admin.hbs b/web/templates/settings/organization_settings_admin.hbs
index a4b2563859..42a74a58f6 100644
--- a/web/templates/settings/organization_settings_admin.hbs
+++ b/web/templates/settings/organization_settings_admin.hbs
@@ -7,6 +7,29 @@
                 {{> settings_save_discard_widget section_name="notifications" }}
             </div>
             <div class="inline-block organization-settings-parent">
+                <div class="realm_default_language">
+                    {{> language_selection_widget
+                      section_name="realm_default_language"
+                      setting_value=realm_default_language_name
+                      language_code=realm_default_language_code
+                      section_title=admin_settings_label.realm_default_language
+                      help_link_widget_link="/help/configure-organization-language"}}
+                </div>
+
+                {{> dropdown_list_widget
+                  widget_name="realm_notifications_stream_id"
+                  list_placeholder=(t 'Filter streams')
+                  reset_button_text=(t '[Disable]')
+                  label=admin_settings_label.realm_notifications_stream
+                  value_type="number" }}
+
+                {{> dropdown_list_widget
+                  widget_name="realm_signup_notifications_stream_id"
+                  list_placeholder=(t 'Filter streams')
+                  reset_button_text=(t '[Disable]')
+                  label=admin_settings_label.realm_signup_notifications_stream
+                  value_type="number" }}
+
                 {{> settings_checkbox
                   setting_name="realm_send_welcome_emails"
                   prefix="id_"
@@ -34,28 +57,6 @@
                         <option value="6">{{t "Sunday" }}</option>
                     </select>
                 </div>
-
-                {{> dropdown_list_widget
-                  widget_name="realm_notifications_stream_id"
-                  list_placeholder=(t 'Filter streams')
-                  reset_button_text=(t '[Disable]')
-                  label=admin_settings_label.realm_notifications_stream
-                  value_type="number" }}
-
-                {{> dropdown_list_widget
-                  widget_name="realm_signup_notifications_stream_id"
-                  list_placeholder=(t 'Filter streams')
-                  reset_button_text=(t '[Disable]')
-                  label=admin_settings_label.realm_signup_notifications_stream
-                  value_type="number" }}
-                <div class="realm_default_language">
-                    {{> language_selection_widget
-                      section_name="realm_default_language"
-                      setting_value=realm_default_language_name
-                      language_code=realm_default_language_code
-                      section_title=admin_settings_label.realm_default_language
-                      help_link_widget_link="/help/configure-organization-language"}}
-                </div>
             </div>
         </div>