Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Tim Abbott 2022-03-15 16:08:41 -07:00
parent d150236217
commit a4d42392a6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/admin.js
View File

@ -20,8 +20,8 @@ const admin_settings_label = {
// Organization settings // Organization settings
realm_allow_edit_history: $t({defaultMessage: "Enable message edit history"}), realm_allow_edit_history: $t({defaultMessage: "Enable message edit history"}),
realm_mandatory_topics: $t({defaultMessage: "Require topics in stream messages"}), realm_mandatory_topics: $t({defaultMessage: "Require topics in stream messages"}),
realm_notifications_stream: $t({defaultMessage: "New stream notifications:"}), realm_notifications_stream: $t({defaultMessage: "New stream notifications"}),
realm_signup_notifications_stream: $t({defaultMessage: "New user 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_image_preview: $t({defaultMessage: "Show previews of uploaded and linked images"}),
realm_inline_url_embed_preview: $t({defaultMessage: "Show previews of linked websites"}), 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"}), 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({ realm_digest_emails_enabled: $t({
defaultMessage: "Send weekly digest emails to inactive users", 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 // Organization permissions
realm_name_changes_disabled: $t({defaultMessage: "Prevent users from changing their name"}), realm_name_changes_disabled: $t({defaultMessage: "Prevent users from changing their name"}),

2
static/templates/settings/dropdown_list_widget.hbs
View File

@ -1,7 +1,7 @@
<div class="input-group dropdown-list-widget" id="{{widget_name}}_widget"> <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"> <span class="{{widget_name}}_setting dropup actual-dropdown-menu prop-element" id="id_{{widget_name}}" aria-labelledby="{{widget_name}}_label">
{{#if label}} {{#if label}}
<label id="{{widget_name}}_label" class="inline-block"> <label id="{{widget_name}}_label" class="dropdown-title">
{{ label }} {{ label }}
</label> </label>
{{/if}} {{/if}}