paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 16:14:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Refactor the labels in personal settings.

Browse Source 
This commit changes refactors all the labels in personal settings and
corrects the attribute values to fix the interaction between labels and
select/button elements.

Fixes part of #21769.
This commit is contained in:
joseph
2024-08-07 19:54:05 +00:00
committed by Tim Abbott
parent 93e5b7ac55
commit cef901367e
10 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/templates/change_email_modal.hbs
View File

@@ -1,4 +1,4 @@
<form id="change_email_form">
<label for="email" class="modal-field-label">{{t "New email" }}</label>
<input type="text" name="email" class="modal_text_input" value="{{delivery_email}}" autocomplete="off" spellcheck="false" autofocus="autofocus"/>
<label for="change-email-form-input-email" class="modal-field-label">{{t "New email" }}</label>
<input id="change-email-form-input-email" type="text" name="email" class="modal_text_input" value="{{delivery_email}}" autocomplete="off" spellcheck="false" autofocus="autofocus"/>
</form>

6
web/templates/settings/account_settings.hbs
View File

@@ -7,7 +7,7 @@
<form class="grid">
{{#if user_has_email_set}}
<div class="input-group">
<label class="settings-field-label">{{t "Email" }}</label>
<label class="settings-field-label" for="change_email_button">{{t "Email" }}</label>
<div id="change_email_button_container" class="{{#unless user_can_change_email}}disabled_setting_tooltip{{/unless}}">
<button id="change_email_button" type="button" class="button rounded tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Change your email' }}" {{#unless user_can_change_email}}disabled="disabled"{{/unless}}>
{{current_user.delivery_email}}
@@ -42,7 +42,7 @@
<form class="password-change-form grid">
{{#if user_can_change_password}}
<div>
<label class="settings-field-label">{{t "Password" }}</label>
<label class="settings-field-label" for="change_password">{{t "Password" }}</label>
<div class="input-group">
<button id="change_password" type="button" class="button rounded" data-dismiss="modal">{{t "Change your password" }}</button>
</div>
@@ -102,7 +102,7 @@
}}
</div>
<div class="input-group">
<label for="email_address_visibility" class="settings-field-label">{{t "Who can access your email address" }}
<label for="user_email_address_visibility" class="settings-field-label">{{t "Who can access your email address" }}
{{> ../help_link_widget link="/help/configure-email-visibility" }}
</label>
<div id="user_email_address_dropdown_container" class="inline-block {{#unless user_has_email_set}}disabled_setting_tooltip{{/unless}}">

4
web/templates/settings/add_new_bot_form.hbs
View File

@@ -1,7 +1,7 @@
<form id="create_bot_form">
<div class="new-bot-form">
<div class="input-group">
<label for="bot_type" class="modal-field-label">
<label for="create_bot_type" class="modal-field-label">
{{t "Bot type" }}
{{> ../help_link_widget link="/help/bots-overview#bot-type" }}
</label>
@@ -28,7 +28,7 @@
<div><label for="create_bot_name" generated="true" class="text-error"></label></div>
</div>
<div class="input-group">
<label for="bot_short_name" class="modal-field-label">{{t "Bot email (a-z, 0-9, and dashes only)" }}</label>
<label for="create_bot_short_name" class="modal-field-label">{{t "Bot email (a-z, 0-9, and dashes only)" }}</label>
<input type="text" name="bot_short_name" id="create_bot_short_name" class="required bot_local_part modal_text_input"
placeholder="{{t 'cookie' }}" value="" />
-bot@{{ realm_bot_domain }}

12
web/templates/settings/custom_user_profile_field.hbs
View File

@@ -1,15 +1,15 @@
<div class="custom_user_field" name="{{ field.name }}" data-field-id="{{ field.id }}">
<span class="custom-user-field-label-wrapper {{#if field.required}}required-field-wrapper{{/if}}">
<label class="settings-field-label inline-block title" for="{{ field.name }}">{{ field.name }}</label>
<label class="settings-field-label inline-block title" for="id_custom_profile_field_input_{{ field.id }}">{{ field.name }}</label>
<span class="required-symbol {{#unless is_empty_required_field}}hidden{{/unless}}"> *</span>
</span>
<div class="alert-notification custom-field-status"></div>
<div class="settings-profile-user-field-hint">{{ field.hint }}</div>
<div class="settings-profile-user-field {{#if is_empty_required_field}}empty-required-field{{/if}} {{#unless editable_by_user}}not-editable-by-user-input-wrapper{{/unless}}">
{{#if is_long_text_field}}
<textarea maxlength="500" class="custom_user_field_value settings_textarea" name="{{ field.id }}" {{#unless editable_by_user}}disabled{{/unless}}>{{ field_value.value }}</textarea>
<textarea id="id_custom_profile_field_input_{{ field.id }}" maxlength="500" class="custom_user_field_value settings_textarea" name="{{ field.id }}" {{#unless editable_by_user}}disabled{{/unless}}>{{ field_value.value }}</textarea>
{{else if is_select_field}}
<select class="custom_user_field_value {{#if for_manage_user_modal}}modal_select{{else}}settings_select{{/if}} bootstrap-focus-style" name="{{ field.id }}" {{#unless editable_by_user}}disabled{{/unless}}>
<select id="id_custom_profile_field_input_{{ field.id }}" class="custom_user_field_value {{#if for_manage_user_modal}}modal_select{{else}}settings_select{{/if}} bootstrap-focus-style" name="{{ field.id }}" {{#unless editable_by_user}}disabled{{/unless}}>
<option value=""></option>
{{#each field_choices}}
<option value="{{ this.value }}" {{#if this.selected}}selected{{/if}}>{{ this.text }}</option>
@@ -24,11 +24,11 @@
value="{{ field_value.value }}" {{#unless editable_by_user}}disabled{{/unless}}/>
{{#if editable_by_user}}<span class="remove_date"><i class="fa fa-close"></i></span>{{/if}}
{{else if is_url_field }}
<input class="custom_user_field_value {{#if for_manage_user_modal}}modal_url_input{{else}}settings_url_input{{/if}}" name="{{ field.id }}" type="{{ field_type }}" value="{{ field_value.value }}" maxlength="2048" {{#unless editable_by_user}}disabled{{/unless}}/>
<input id="id_custom_profile_field_input_{{ field.id }}" class="custom_user_field_value {{#if for_manage_user_modal}}modal_url_input{{else}}settings_url_input{{/if}}" name="{{ field.id }}" type="{{ field_type }}" value="{{ field_value.value }}" maxlength="2048" {{#unless editable_by_user}}disabled{{/unless}}/>
{{else if is_pronouns_field}}
<input class="custom_user_field_value pronouns_type_field {{#if for_manage_user_modal}}modal_text_input{{else}}settings_text_input{{/if}}" name="{{ field.id }}" type="{{ field_type }}" value="{{ field_value.value }}" maxlength="50" {{#unless editable_by_user}}disabled{{/unless}}/>
<input id="id_custom_profile_field_input_{{ field.id }}" class="custom_user_field_value pronouns_type_field {{#if for_manage_user_modal}}modal_text_input{{else}}settings_text_input{{/if}}" name="{{ field.id }}" type="{{ field_type }}" value="{{ field_value.value }}" maxlength="50" {{#unless editable_by_user}}disabled{{/unless}}/>
{{else}}
<input class="custom_user_field_value {{#if for_manage_user_modal}}modal_text_input{{else}}settings_text_input{{/if}}" name="{{ field.id }}" type="{{ field_type }}" value="{{ field_value.value }}" maxlength="50" {{#unless editable_by_user}}disabled{{/unless}}/>
<input id="id_custom_profile_field_input_{{ field.id }}" class="custom_user_field_value {{#if for_manage_user_modal}}modal_text_input{{else}}settings_text_input{{/if}}" name="{{ field.id }}" type="{{ field_type }}" value="{{ field_value.value }}" maxlength="50" {{#unless editable_by_user}}disabled{{/unless}}/>
{{/if}}
</div>
</div>

4
web/templates/settings/language_selection_widget.hbs
View File

@@ -1,11 +1,11 @@
<div class="language_selection_widget input-group prop-element" id="id_{{section_name}}" data-setting-widget-type="language-setting">
<label class="settings-field-label">
<label class="settings-field-label" for="id_language_selection_button">
{{section_title}}
{{#if help_link_widget_link}}
{{> ../help_link_widget link=help_link_widget_link }}
{{/if}}
</label>
<button type="button" class="language_selection_button button rounded tippy-zulip-delayed-tooltip" data-section="{{section_name}}" data-tippy-content="{{t 'Change language' }}">
<button type="button" id="id_language_selection_button" class="language_selection_button button rounded tippy-zulip-delayed-tooltip" data-section="{{section_name}}" data-tippy-content="{{t 'Change language' }}">
<span class="{{section_name}}" data-language-code="{{language_code}}">{{setting_value}}</span>
</button>
</div>

12
web/templates/settings/notification_settings.hbs
View File

@@ -70,7 +70,7 @@
</div>
<div class="input-group">
<label for="automatically_follow_topics_policy" class="settings-field-label">
<label for="{{prefix}}automatically_follow_topics_policy" class="settings-field-label">
{{ settings_label.automatically_follow_topics_policy }}
{{> ../help_link_widget link="/help/follow-a-topic" }}
</label>
@@ -81,7 +81,7 @@
</div>
<div class="input-group">
<label for="automatically_unmute_topics_in_muted_streams_policy" class="settings-field-label">
<label for="{{prefix}}automatically_unmute_topics_in_muted_streams_policy" class="settings-field-label">
{{ settings_label.automatically_unmute_topics_in_muted_streams_policy }}
{{> ../help_link_widget link="/help/mute-a-topic" }}
</label>
@@ -139,7 +139,7 @@
</div>
<div class="input-group">
<label for="desktop_icon_count_display" class="settings-field-label">{{ settings_label.desktop_icon_count_display }}</label>
<label for="{{prefix}}desktop_icon_count_display" class="settings-field-label">{{ settings_label.desktop_icon_count_display }}</label>
<select name="desktop_icon_count_display" class="setting_desktop_icon_count_display prop-element settings_select bootstrap-focus-style" id="{{prefix}}desktop_icon_count_display" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=desktop_icon_count_display_values}}
</select>
@@ -184,7 +184,7 @@
<div class="input-group time-limit-setting">
<label for="email_notifications_batching_period" class="settings-field-label">
<label for="{{prefix}}email_notifications_batching_period_seconds" class="settings-field-label">
{{t "Delay before sending message notification emails" }}
</label>
<select name="email_notifications_batching_period_seconds" class="setting_email_notifications_batching_period_seconds prop-element settings_select bootstrap-focus-style" id="{{prefix}}email_notifications_batching_period_seconds" data-setting-widget-type="time-limit">
@@ -193,7 +193,7 @@
{{/each}}
</select>
<div class="dependent-settings-block">
<label for="email_notification_batching_period_edit_minutes" class="inline-block">
<label for="{{prefix}}email_notification_batching_period_edit_minutes" class="inline-block">
{{t 'Delay period (minutes)' }}:
</label>
<input type="text"
@@ -206,7 +206,7 @@
</div>
<div class="input-group">
<label for="realm_name_in_email_notifications_policy" class="settings-field-label">{{ settings_label.realm_name_in_email_notifications_policy }}</label>
<label for="{{prefix}}realm_name_in_email_notifications_policy" class="settings-field-label">{{ settings_label.realm_name_in_email_notifications_policy }}</label>
<select name="realm_name_in_email_notifications_policy" class="setting_realm_name_in_email_notifications_policy prop-element settings_select bootstrap-focus-style" id="{{prefix}}realm_name_in_email_notifications_policy" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=realm_name_in_email_notifications_policy_values}}
</select>

4
web/templates/settings/preferences_general.hbs
View File

@@ -14,7 +14,7 @@
{{/unless}}
<div class="input-group">
<label for="twenty_four_hour_time" class="settings-field-label">{{ settings_label.twenty_four_hour_time }}</label>
<label for="{{prefix}}twenty_four_hour_time" class="settings-field-label">{{ settings_label.twenty_four_hour_time }}</label>
<select name="twenty_four_hour_time" class="setting_twenty_four_hour_time prop-element settings_select bootstrap-focus-style" id="{{prefix}}twenty_four_hour_time" data-setting-widget-type="string">
{{#each twenty_four_hour_time_values}}
<option value='{{ this.value }}'>{{ this.description }}</option>
@@ -22,7 +22,7 @@
</select>
</div>
<div class="input-group">
<label for="color_scheme" class="settings-field-label">{{t "Theme" }}</label>
<label for="{{prefix}}color_scheme" class="settings-field-label">{{t "Theme" }}</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>

6
web/templates/settings/preferences_information.hbs
View File

@@ -50,14 +50,14 @@
</div>
<div class="input-group thinner setting-next-is-related">
<label for="web_animate_image_previews" class="settings-field-label">{{t "Play animated images" }}</label>
<label for="{{prefix}}web_animate_image_previews" class="settings-field-label">{{t "Play animated images" }}</label>
<select name="web_animate_image_previews" class="setting_web_animate_image_previews prop-element settings_select bootstrap-focus-style" id="{{prefix}}web_animate_image_previews" data-setting-widget-type="string">
{{> dropdown_options_widget option_values=web_animate_image_previews_values}}
</select>
</div>
<div class="input-group">
<label for="web_stream_unreads_count_display_policy" class="settings-field-label">{{t "Show unread counts for" }}</label>
<label for="{{prefix}}web_stream_unreads_count_display_policy" class="settings-field-label">{{t "Show unread counts for" }}</label>
<select name="web_stream_unreads_count_display_policy" class="setting_web_stream_unreads_count_display_policy prop-element bootstrap-focus-style settings_select" id="{{prefix}}web_stream_unreads_count_display_policy" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=web_stream_unreads_count_display_policy_values}}
</select>
@@ -73,7 +73,7 @@
{{/each}}
<div class="input-group">
<label for="demote_inactive_streams" class="settings-field-label">{{t "Demote inactive channels" }}
<label for="{{prefix}}demote_inactive_streams" class="settings-field-label">{{t "Demote inactive channels" }}
{{> ../help_link_widget link="/help/manage-inactive-channels" }}
</label>
<select name="demote_inactive_streams" class="setting_demote_inactive_streams prop-element settings_select bootstrap-focus-style" id="{{prefix}}demote_inactive_streams" data-setting-widget-type="number">

6
web/templates/settings/preferences_navigation.hbs
View File

@@ -5,7 +5,7 @@
</div>
<div class="input-group thinner setting-next-is-related">
<label for="web_home_view" class="settings-field-label">{{t "Home view" }}
<label for="{{prefix}}web_home_view" class="settings-field-label">{{t "Home view" }}
{{> ../help_link_widget link="/help/configure-home-view" }}
</label>
<select name="web_home_view" class="setting_web_home_view prop-element settings_select bootstrap-focus-style" id="{{prefix}}web_home_view" data-setting-widget-type="string">
@@ -26,7 +26,7 @@
prefix=prefix}}
<div class="input-group">
<label for="web_mark_read_on_scroll_policy" class="settings-field-label">{{t "Automatically mark messages as read" }}
<label for="{{prefix}}web_mark_read_on_scroll_policy" class="settings-field-label">{{t "Automatically mark messages as read" }}
{{> ../help_link_widget link="/help/marking-messages-as-read" }}
</label>
<select name="web_mark_read_on_scroll_policy" class="setting_web_mark_read_on_scroll_policy prop-element settings_select bootstrap-focus-style" id="{{prefix}}web_mark_read_on_scroll_policy" data-setting-widget-type="number">
@@ -35,7 +35,7 @@
</div>
<div class="input-group">
<label for="web_channel_default_view" class="settings-field-label">{{t "Channel links in the left sidebar go to" }}</label>
<label for="{{prefix}}web_channel_default_view" class="settings-field-label">{{t "Channel links in the left sidebar go to" }}</label>
<select name="web_channel_default_view" class="setting_web_channel_default_view prop-element settings_select bootstrap-focus-style" id="{{prefix}}web_channel_default_view" data-setting-widget-type="number">
{{> dropdown_options_widget option_values=web_channel_default_view_values}}
</select>

2
web/templates/settings/profile_settings.hbs
View File

@@ -18,7 +18,7 @@
<form class="timezone-setting-form">
<div class="input-group grid">
<label for="timezone" class="settings-field-label inline-block">{{t "Time zone" }}</label>
<label for="user_timezone" class="settings-field-label inline-block">{{t "Time zone" }}</label>
<div class="alert-notification timezone-setting-status"></div>
<div class="timezone-input">
<select name="timezone" id="user_timezone" class="bootstrap-focus-style settings_select">