paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 05:53:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

user-settings: Update icon for reactivating user.

Browse Source 
Co-authored-by: Lauryn Menard <lauryn@zulip.com>
This commit is contained in:
ahmedgulabkhan
2025-03-15 20:37:56 +01:00
committed by Tim Abbott
parent 61bda06266
commit 50582b72b6
7 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
help/deactivate-or-reactivate-a-bot.md
View File

@@ -63,8 +63,8 @@ bot, regardless of who owns them.
{settings_tab|bot-list-admin} {settings_tab|bot-list-admin}
1. In the **Actions** column, click the **reactivate bot** (<i class="fa fa-user-plus"></i>) 1. In the **Actions** column, click the **reactivate bot** (<i class="zulip-icon
icon for the bot you want to reactivate. zulip-icon-user-plus"></i>) icon for the bot you want to reactivate.
1. Approve by clicking **Confirm**. 1. Approve by clicking **Confirm**.

4
help/deactivate-or-reactivate-a-user.md
View File

@@ -90,8 +90,8 @@ bots will be deactivated until the user manually
1. Select the **Deactivated** tab. 1. Select the **Deactivated** tab.
1. Click the **Reactivate** button to the right of the user that you 1. In the **Actions** column, click the **reactivate user** (<i class="zulip-icon
want to reactivate. zulip-icon-user-plus"></i>) icon for the user you want to reactivate.
{tab|via-user-profile} {tab|via-user-profile}

4
web/e2e-tests/user-deactivation.test.ts
View File

@@ -65,7 +65,7 @@ async function test_deactivate_user(page: Page): Promise<void> {
async function test_reactivate_user(page: Page): Promise<void> { async function test_reactivate_user(page: Page): Promise<void> {
let cordelia_user_row = await user_row(page, common.fullname.cordelia); let cordelia_user_row = await user_row(page, common.fullname.cordelia);
await page.waitForSelector(cordelia_user_row + ".deactivated_user"); await page.waitForSelector(cordelia_user_row + ".deactivated_user");
await page.waitForSelector(cordelia_user_row + " .fa-user-plus"); await page.waitForSelector(cordelia_user_row + " .zulip-icon-user-plus");
await page.click(cordelia_user_row + " .reactivate"); await page.click(cordelia_user_row + " .reactivate");
await test_reactivation_confirmation_modal(page, common.fullname.cordelia); await test_reactivation_confirmation_modal(page, common.fullname.cordelia);
@@ -126,7 +126,7 @@ async function test_bot_deactivation_and_reactivation(page: Page): Promise<void>
await common.wait_for_micromodal_to_close(page); await common.wait_for_micromodal_to_close(page);
await page.waitForSelector(default_bot_user_row + ".deactivated_user", {visible: true}); await page.waitForSelector(default_bot_user_row + ".deactivated_user", {visible: true});
await page.waitForSelector(default_bot_user_row + " .fa-user-plus"); await page.waitForSelector(default_bot_user_row + " .zulip-icon-user-plus");
await page.click(default_bot_user_row + " .reactivate"); await page.click(default_bot_user_row + " .reactivate");
await test_reactivation_confirmation_modal(page, "Zulip Default Bot"); await test_reactivation_confirmation_modal(page, "Zulip Default Bot");

6
web/shared/icons/user-plus.svg
View File

@@ -1 +1,5 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M5.256 1.363 C 4.180 1.488,3.186 2.187,2.698 3.162 C 2.451 3.655,2.343 4.115,2.343 4.667 C 2.343 6.262,3.428 7.591,5.013 7.936 C 5.345 8.009,6.031 8.004,6.360 7.927 C 7.360 7.694,8.165 7.081,8.611 6.213 C 8.880 5.688,8.991 5.239,8.991 4.667 C 8.991 2.663,7.258 1.131,5.256 1.363 M6.037 2.705 C 6.441 2.783,6.763 2.953,7.068 3.253 C 7.445 3.624,7.627 4.035,7.648 4.567 C 7.662 4.928,7.632 5.123,7.517 5.411 C 7.202 6.203,6.428 6.699,5.573 6.659 C 4.745 6.619,4.048 6.092,3.768 5.293 C 3.699 5.095,3.694 5.051,3.694 4.667 C 3.694 4.283,3.699 4.238,3.768 4.040 C 3.878 3.728,4.034 3.481,4.265 3.253 C 4.750 2.777,5.385 2.580,6.037 2.705 M13.116 4.709 C 12.949 4.760,12.769 4.937,12.711 5.106 C 12.674 5.215,12.667 5.355,12.667 5.951 L 12.667 6.667 11.965 6.667 C 11.144 6.667,11.058 6.682,10.873 6.862 C 10.605 7.123,10.602 7.536,10.866 7.801 C 11.051 7.986,11.128 8.000,11.951 8.000 L 12.667 8.000 12.667 8.715 C 12.667 9.539,12.681 9.616,12.866 9.801 C 13.127 10.062,13.540 10.062,13.801 9.801 C 13.986 9.616,14.000 9.539,14.000 8.715 L 14.000 8.000 14.715 8.000 C 15.539 8.000,15.616 7.986,15.801 7.801 C 16.065 7.536,16.062 7.123,15.794 6.862 C 15.608 6.682,15.523 6.667,14.702 6.667 L 14.000 6.667 14.000 5.951 C 14.000 5.120,13.987 5.049,13.794 4.862 C 13.609 4.683,13.373 4.629,13.116 4.709 M3.040 9.350 C 3.003 9.356,2.883 9.373,2.773 9.389 C 2.663 9.405,2.459 9.455,2.320 9.499 C 1.114 9.883,0.232 10.922,0.039 12.187 C 0.011 12.367,0.000 12.679,0.000 13.269 C -0.000 14.217,0.010 14.278,0.199 14.467 C 0.519 14.787,1.060 14.701,1.258 14.300 C 1.318 14.177,1.320 14.148,1.336 13.240 C 1.349 12.491,1.361 12.277,1.396 12.157 C 1.607 11.433,2.152 10.904,2.882 10.717 C 3.096 10.662,8.237 10.662,8.451 10.717 C 9.188 10.906,9.710 11.417,9.940 12.173 C 9.972 12.276,9.985 12.518,9.997 13.240 C 10.013 14.148,10.015 14.177,10.076 14.300 C 10.273 14.701,10.815 14.787,11.134 14.467 C 11.323 14.278,11.333 14.217,11.333 13.269 C 11.333 12.339,11.308 12.093,11.172 11.664 C 10.802 10.504,9.873 9.671,8.639 9.395 C 8.461 9.355,8.155 9.350,5.773 9.345 C 4.307 9.342,3.077 9.344,3.040 9.350 " stroke="none" fill-rule="evenodd"></path></svg> <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6 1.3335C7.84095 1.3335 9.33333 2.82588 9.33333 4.66683C9.33333 6.50778 7.84095 8.00016 6 8.00016C4.15905 8.00016 2.66667 6.50778 2.66667 4.66683C2.66667 2.82588 4.15905 1.3335 6 1.3335ZM4 4.66683C4 5.7714 4.89543 6.66683 6 6.66683C7.10457 6.66683 8 5.7714 8 4.66683C8 3.56226 7.10457 2.66683 6 2.66683C4.89543 2.66683 4 3.56226 4 4.66683Z" fill="black"/>
<path d="M4 9.3335H8C8.88406 9.3335 9.7319 9.68469 10.357 10.3098C10.9821 10.9349 11.3333 11.7828 11.3333 12.6668V14.0002C11.3333 14.3684 11.0349 14.6668 10.6667 14.6668C10.2985 14.6668 10 14.3684 10 14.0002V12.6668C10 12.1364 9.78929 11.6277 9.41421 11.2526C9.03914 10.8775 8.53043 10.6668 8 10.6668H4C3.46957 10.6668 2.96086 10.8775 2.58579 11.2526C2.21071 11.6277 2 12.1364 2 12.6668V14.0002C2 14.3684 1.70152 14.6668 1.33333 14.6668C0.965144 14.6668 0.666667 14.3684 0.666667 14.0002V12.6668C0.666667 11.7828 1.01786 10.9349 1.64298 10.3098C2.2681 9.68469 3.11595 9.3335 4 9.3335Z" fill="black"/>
<path d="M12.6667 4.66683C13.0349 4.66683 13.3333 4.96531 13.3333 5.3335V6.66683H14.6667C15.0349 6.66683 15.3333 6.96531 15.3333 7.3335C15.3333 7.70169 15.0349 8.00016 14.6667 8.00016H13.3333V9.3335C13.3333 9.70169 13.0349 10.0002 12.6667 10.0002C12.2985 10.0002 12 9.70169 12 9.3335V8.00016H10.6667C10.2985 8.00016 10 7.70169 10 7.3335C10 6.96531 10.2985 6.66683 10.6667 6.66683H12V5.3335C12 4.96531 12.2985 4.66683 12.6667 4.66683Z" fill="black"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

6
web/src/settings_users.ts
View File

@@ -132,7 +132,11 @@ export function update_view_on_deactivate(user_id: number, is_bot: boolean): voi
$button.addClass("reactivate-user-tooltip"); $button.addClass("reactivate-user-tooltip");
$button.removeClass("deactivate-user-tooltip"); $button.removeClass("deactivate-user-tooltip");
} }
$button.empty().append($("<i>").addClass(["fa", "fa-user-plus"]).attr("aria-hidden", "true")); $button
.empty()
.append(
$("<i>").addClass(["zulip-icon", "zulip-icon-user-plus"]).attr("aria-hidden", "true"),
);
$row.removeClass("active-user"); $row.removeClass("active-user");
$row.addClass("deactivated_user"); $row.addClass("deactivated_user");

6
web/styles/settings.css
View File

@@ -1324,6 +1324,12 @@ label.preferences-radio-choice-label {
margin-right: 1px; margin-right: 1px;
} }
.reactivate-user-button {
display: inline-flex;
align-items: center;
min-height: 35px;
}
.invite-user-link .fa-user-plus { .invite-user-link .fa-user-plus {
text-decoration: none; text-decoration: none;
margin-right: 5px; margin-right: 5px;

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

@@ -51,8 +51,8 @@
</button> </button>
</span> </span>
{{else}} {{else}}
<button class="button rounded small button-warning reactivate {{#if is_bot}}reactivate-bot-tooltip{{else}}reactivate-user-tooltip{{/if}}"> <button class="button rounded small button-warning reactivate reactivate-user-button {{#if is_bot}}reactivate-bot-tooltip{{else}}reactivate-user-tooltip{{/if}}">
<i class="fa fa-user-plus" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-user-plus" aria-hidden="true"></i>
</button> </button>
{{/if}} {{/if}}
</span> </span>