Zulip server and web application. Open-source team chat that helps teams stay productive and focused.
user_group_settings: Show member loading spinner next to the heading.
Shubham Padia89986f38b6d1
diff --git a/web/src/add_group_members_pill.ts b/web/src/add_group_members_pill.tsindex d1e52bdc768..2a4ca998703 100644--- a/web/src/add_group_members_pill.ts+++ b/web/src/add_group_members_pill.ts@@ -122,7 +122,7 @@ export function create({latest_fetch_id += 1;const fetch_id = latest_fetch_id;loading.make_indicator($loading_spinner, {- height: 56, // 4em at 14px / 1em+ height: 28, // 2em at 14px / 1em});const user_ids = await get_pill_user_ids(pill_widget);if (fetch_id !== latest_fetch_id) {@@ -205,7 +205,7 @@ export function set_up_handlers({const $loading_spinner = $parent_container.find(spinner_selector);void (async () => {loading.make_indicator($loading_spinner, {- height: 56, // 4em at 14px / 1em+ height: 28, // 2em at 14px / 1em});const pill_user_ids = await get_pill_user_ids(pill_widget);// If we're no longer in the same view after fetchingdiff --git a/web/styles/subscriptions.css b/web/styles/subscriptions.cssindex 47347f18fb1..14ecae8248d 100644--- a/web/styles/subscriptions.css+++ b/web/styles/subscriptions.css@@ -161,7 +161,7 @@}}-.subscribers-heading {+.settings-table-heading {display: flex;align-items: center;@@ -171,10 +171,6 @@}}-.add-group-member-loading-spinner {- align-self: center;-}-.member-list-box,.subscriber-list-box {text-align: center;diff --git a/web/templates/stream_settings/new_stream_users.hbs b/web/templates/stream_settings/new_stream_users.hbsindex 1bb186a9b72..bf445a5167a 100644--- a/web/templates/stream_settings/new_stream_users.hbs+++ b/web/templates/stream_settings/new_stream_users.hbs@@ -12,7 +12,7 @@</div><div class="settings_panel_list_header">- <div class="subscribers-heading">+ <div class="settings-table-heading"><h3 class="settings-table-title">{{t 'Subscribers preview' }}</h3><div class="add-subscriber-loading-spinner"></div></div>diff --git a/web/templates/stream_settings/stream_members.hbs b/web/templates/stream_settings/stream_members.hbsindex c2defbf84a5..3eb3044ae5a 100644--- a/web/templates/stream_settings/stream_members.hbs+++ b/web/templates/stream_settings/stream_members.hbs@@ -24,7 +24,7 @@}}</div><div class="settings_panel_list_header">- <div class="subscribers-heading">+ <div class="settings-table-heading"><h3 class="settings-table-title">{{t "Subscribers"}}</h3><div class="add-subscriber-loading-spinner"></div></div>diff --git a/web/templates/user_group_settings/new_user_group_users.hbs b/web/templates/user_group_settings/new_user_group_users.hbsindex e892ec6cf7a..608d1703271 100644--- a/web/templates/user_group_settings/new_user_group_users.hbs+++ b/web/templates/user_group_settings/new_user_group_users.hbs@@ -13,14 +13,15 @@</div><div class="settings_panel_list_header create_user_group_member_list_header">- <h3 class="settings-table-title">{{t 'Members preview' }}</h3>+ <div class="settings-table-heading">+ <h3 class="settings-table-title">{{t 'Members preview' }}</h3>+ <div class="add-group-member-loading-spinner"></div>+ </div><div class="user_filters">{{> ../settings/filter_text_input placeholder=(t 'Filter') aria_label=(t 'Filter members') }}</div></div>-<div class="add-group-member-loading-spinner"></div>-<div class="member-list-box"><div class="member_list_container" data-simplebar data-simplebar-tab-index="-1"><table class="member-list table table-striped">diff --git a/web/templates/user_group_settings/user_group_members.hbs b/web/templates/user_group_settings/user_group_members.hbsindex 55002188122..3858baf2563 100644--- a/web/templates/user_group_settings/user_group_members.hbs+++ b/web/templates/user_group_settings/user_group_members.hbs@@ -23,12 +23,14 @@</div>{{/unless}}<div class="settings_panel_list_header members-list-header">- <h3 class="settings-table-title">{{t "Members"}}</h3>+ <div class="settings-table-heading">+ <h3 class="settings-table-title">{{t "Members"}}</h3>+ <div class="add-group-member-loading-spinner"></div>+ </div><div class="user_filters">{{> ../settings/filter_text_input placeholder=(t 'Filter') aria_label=(t 'Filter members') }}</div></div>- <div class="add-group-member-loading-spinner"></div><div class="member-list-box">{{> user_group_members_table .}}</div>