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

settings: Update remove/unsubscribe buttons to action button component.

Browse Source 
This commit updates the remove and unsubscribe buttons in channel
settings and user group settings to use the action button component.
This commit is contained in:
Sayam Samal
2025-03-22 08:52:30 +05:30
committed by Tim Abbott
parent 703acbaccc
commit 91549cfba0
5 changed files with 12 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/src/stream_edit_subscribers.ts
View File

@@ -466,8 +466,8 @@ export function initialize(): void {
}); });
$("#channels_overlay_container").on( $("#channels_overlay_container").on(
"submit", "click",
".edit_subscribers_for_stream .subscriber_list_remove form", ".edit_subscribers_for_stream .remove-subscriber-button",
function (this: HTMLElement, e): void { function (this: HTMLElement, e): void {
e.preventDefault(); e.preventDefault();

8
web/src/user_group_edit_members.ts
View File

@@ -509,8 +509,8 @@ export function initialize(): void {
}); });
$("#groups_overlay_container").on( $("#groups_overlay_container").on(
"submit", "click",
".edit_members_for_user_group .subscriber_list_remove form", ".edit_members_for_user_group .remove-subscriber-button",
function (this: HTMLElement, e): void { function (this: HTMLElement, e): void {
e.preventDefault(); e.preventDefault();
@@ -523,8 +523,8 @@ export function initialize(): void {
); );
$("#groups_overlay_container").on( $("#groups_overlay_container").on(
"submit", "click",
".edit_members_for_user_group .subgroup_list_remove form", ".edit_members_for_user_group .remove-subgroup-button",
function (this: HTMLElement, e): void { function (this: HTMLElement, e): void {
e.preventDefault(); e.preventDefault();

11
web/styles/subscriptions.css
View File

@@ -178,12 +178,6 @@ h4.user_group_setting_subsection_title {
} }
} }
.subscriber_list_remove,
.subgroup-list-remove {
padding-right: 16px;
display: inline-block;
}
& thead th { & thead th {
&:first-of-type { &:first-of-type {
border-top-left-radius: 4px; border-top-left-radius: 4px;
@@ -274,11 +268,6 @@ h4.user_group_setting_subsection_title {
display: inline; display: inline;
} }
.remove-subscriber-form,
.remove-subgroup-form {
margin: 0;
}
.subscriptions-container .subscriptions-header .fa-chevron-left, .subscriptions-container .subscriptions-header .fa-chevron-left,
.user-groups-container .user-groups-header .fa-chevron-left { .user-groups-container .user-groups-header .fa-chevron-left {
position: relative; position: relative;

16
web/templates/stream_settings/stream_member_list_entry.hbs
View File

@@ -9,17 +9,11 @@
{{/if}} {{/if}}
{{#if can_remove_subscribers}} {{#if can_remove_subscribers}}
<td class="unsubscribe"> <td class="unsubscribe">
<div class="subscriber_list_remove"> {{#if for_user_group_members}}
<form class="remove-subscriber-form"> {{> ../components/action_button label=(t "Remove") custom_classes="remove-subscriber-button" attention="quiet" intent="danger" aria-label=(t "Remove") }}
<button type="submit" name="unsubscribe" class="remove-subscriber-button button small rounded button-danger"> {{else}}
{{#if for_user_group_members}} {{> ../components/action_button label=(t "Unsubscribe") custom_classes="remove-subscriber-button" attention="quiet" intent="danger" aria-label=(t "Unsubscribe") }}
{{t 'Remove'}} {{/if}}
{{else}}
{{t 'Unsubscribe' }}
{{/if}}
</button>
</form>
</div>
</td> </td>
{{/if}} {{/if}}
</tr> </tr>

8
web/templates/user_group_settings/user_group_subgroup_entry.hbs
View File

@@ -5,13 +5,7 @@
<td class="empty-email-col-for-user-group"></td> <td class="empty-email-col-for-user-group"></td>
{{#if can_remove_members}} {{#if can_remove_members}}
<td class="remove"> <td class="remove">
<div class="subgroup_list_remove"> {{> ../components/action_button custom_classes="remove-subgroup-button" label=(t "Remove") attention="quiet" intent="danger" aria-label=(t "Remove") }}
<form class="remove-subgroup-form">
<button type="submit" name="remove" class="remove-subgroup-button button small rounded button-danger">
{{t 'Remove'}}
</button>
</form>
</div>
</td> </td>
{{/if}} {{/if}}
</tr> </tr>