From a4d42392a68255ef60fb0c70c60b33698b80a1e7 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@zulip.com>
Date: Tue, 15 Mar 2022 16:08:41 -0700
Subject: [PATCH] settings: Avoid dropdown_list_widget on same line as labels.

The 3 instances of dropdown_list_widget using the `label` property had
different design than the rest of all of our dropdowns, in that the
label was on the same line as the dropdown.

Fix this by adjusting the `label` option to use our standard
`dropdown-title` CSS class.

Also remove the colons in the labels.

I confirmed that these were the only instances of this widget using
the label feature.

Fixes #20415.
---
 static/js/admin.js                                 | 6 +++---
 static/templates/settings/dropdown_list_widget.hbs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/static/js/admin.js b/static/js/admin.js
index a507a65e32..97f49de423 100644
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -20,8 +20,8 @@ const admin_settings_label = {
     // Organization settings
     realm_allow_edit_history: $t({defaultMessage: "Enable message edit history"}),
     realm_mandatory_topics: $t({defaultMessage: "Require topics in stream messages"}),
-    realm_notifications_stream: $t({defaultMessage: "New stream notifications:"}),
-    realm_signup_notifications_stream: $t({defaultMessage: "New user notifications:"}),
+    realm_notifications_stream: $t({defaultMessage: "New stream notifications"}),
+    realm_signup_notifications_stream: $t({defaultMessage: "New user notifications"}),
     realm_inline_image_preview: $t({defaultMessage: "Show previews of uploaded and linked images"}),
     realm_inline_url_embed_preview: $t({defaultMessage: "Show previews of linked websites"}),
     realm_send_welcome_emails: $t({defaultMessage: "Send emails introducing Zulip to new users"}),
@@ -34,7 +34,7 @@ const admin_settings_label = {
     realm_digest_emails_enabled: $t({
         defaultMessage: "Send weekly digest emails to inactive users",
     }),
-    realm_default_code_block_language: $t({defaultMessage: "Default language for code blocks:"}),
+    realm_default_code_block_language: $t({defaultMessage: "Default language for code blocks"}),
 
     // Organization permissions
     realm_name_changes_disabled: $t({defaultMessage: "Prevent users from changing their name"}),
diff --git a/static/templates/settings/dropdown_list_widget.hbs b/static/templates/settings/dropdown_list_widget.hbs
index 57d659cf52..8ee319332c 100644
--- a/static/templates/settings/dropdown_list_widget.hbs
+++ b/static/templates/settings/dropdown_list_widget.hbs
@@ -1,7 +1,7 @@
 <div class="input-group dropdown-list-widget" id="{{widget_name}}_widget">
     <span class="{{widget_name}}_setting dropup actual-dropdown-menu prop-element" id="id_{{widget_name}}" aria-labelledby="{{widget_name}}_label">
         {{#if label}}
-        <label id="{{widget_name}}_label" class="inline-block">
+        <label id="{{widget_name}}_label" class="dropdown-title">
             {{ label }}
         </label>
         {{/if}}