mirror of https://github.com/zulip/zulip.git
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.
This commit is contained in:
parent
2067c71a93
commit
af07db7971
|
@ -64,7 +64,7 @@ you send. Zulip emoji are compatible with screen readers and other accessibility
|
||||||
|
|
||||||
{settings_tab|display-settings}
|
{settings_tab|display-settings}
|
||||||
|
|
||||||
1. Under **Theme**, select **Google**,
|
1. Under **Emoji**, select **Google**,
|
||||||
**Twitter**, **Plain text**, or **Google blobs** for the emoji theme.
|
**Twitter**, **Plain text**, or **Google blobs** for the emoji theme.
|
||||||
|
|
||||||
{end_tabs}
|
{end_tabs}
|
||||||
|
|
|
@ -87,7 +87,7 @@ so](#toggle-whether-names-of-reacting-users-are-displayed) is enabled.
|
||||||
|
|
||||||
{settings_tab|display-settings}
|
{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**.
|
reacted to a message**.
|
||||||
|
|
||||||
{end_tabs}
|
{end_tabs}
|
||||||
|
|
|
@ -21,7 +21,7 @@ automatically by Zulip.
|
||||||
|
|
||||||
{settings_tab|display-settings}
|
{settings_tab|display-settings}
|
||||||
|
|
||||||
1. Under **Theme**, select **Convert emoticons before sending**.
|
1. Under **Emoji**, select **Convert emoticons before sending**.
|
||||||
|
|
||||||
{end_tabs}
|
{end_tabs}
|
||||||
|
|
||||||
|
|
|
@ -198,7 +198,7 @@ export function set_up(settings_panel) {
|
||||||
if (current_emojiset === data.emojiset) {
|
if (current_emojiset === data.emojiset) {
|
||||||
return;
|
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});
|
loading.make_indicator($spinner, {text: settings_ui.strings.saving});
|
||||||
|
|
||||||
channel.patch({
|
channel.patch({
|
||||||
|
@ -209,7 +209,7 @@ export function set_up(settings_panel) {
|
||||||
ui_report.error(
|
ui_report.error(
|
||||||
settings_ui.strings.failure_html,
|
settings_ui.strings.failure_html,
|
||||||
xhr,
|
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.
|
// update in all active browser windows.
|
||||||
await emojisets.select(settings_panel.settings_object.emojiset);
|
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) {
|
if ($spinner.length) {
|
||||||
loading.destroy_indicator($spinner);
|
loading.destroy_indicator($spinner);
|
||||||
ui_report.success(
|
ui_report.success(
|
||||||
|
|
|
@ -21,22 +21,19 @@
|
||||||
{{/each}}
|
{{/each}}
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</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">
|
<div class="input-group">
|
||||||
<label for="color_scheme" class="dropdown-title">{{t "Color scheme" }}</label>
|
<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">
|
<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}}
|
{{> dropdown_options_widget option_values=color_scheme_values}}
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</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">
|
<div class="input-group">
|
||||||
<label class="emoji-theme title">{{t "Emoji theme" }}</label>
|
<label class="emoji-theme title">{{t "Emoji theme" }}</label>
|
||||||
|
|
Loading…
Reference in New Issue