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 managing a user or bot.

Browse Source 
Co-authored-by: Lauryn Menard <lauryn@zulip.com>
This commit is contained in:
ahmedgulabkhan
2025-03-15 21:08:27 +01:00
committed by Tim Abbott
parent c0b3fb1bbe
commit 3ece6ca196
10 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/THIRDPARTY
View File

@@ -197,6 +197,11 @@ Files: web/shared/icons/user-plus.svg
Copyright: 2013-2023 Cole Bemis (https://feathericons.com)
License: Expat
Files: web/shared/icons/user-cog.svg
Source: https://lucide.dev/icons/user-cog
Copyright: 2013-2022 Cole Bemis
License: ISC License
Files: web/shared/icons/user-x.svg
Source: https://lucide.dev/icons/user-x
Copyright: 2013-2022 Cole Bemis

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

@@ -22,8 +22,9 @@ bot, regardless of who owns them.
!!! tip ""
You can also click the **pencil** (<i class="fa fa-pencil"></i>) icon,
scroll down to the bottom, and click **Deactivate bot**.
You can also click the **manage bot** (<i class="zulip-icon
zulip-icon-user-cog"></i>) icon, scroll down to the bottom,
and click **Deactivate bot**.
{tab|via-organization-settings}
@@ -38,8 +39,9 @@ bot, regardless of who owns them.
!!! tip ""
You can also click the **pencil** (<i class="fa fa-pencil"></i>) icon,
scroll down to the bottom, and click **Deactivate bot**.
You can also click the **manage bot** (<i class="zulip-icon
zulip-icon-user-cog"></i>) icon, scroll down to the bottom,
and click **Deactivate bot**.
{end_tabs}

8
help/edit-a-bot.md
View File

@@ -10,8 +10,8 @@ active bot in the organization.
{settings_tab|your-bots}
1. Click the **pencil** (<i class="fa fa-pencil"></i>) icon on the profile
card for the bot you want to edit.
1. Click the **manage bot** (<i class="zulip-icon zulip-icon-user-cog"></i>)
icon on the profile card for the bot you want to manage.
1. Edit bot information as desired, and click **Save changes**.
@@ -25,8 +25,8 @@ active bot in the organization.
{settings_tab|bot-list-admin}
1. In the **Actions** column, click the **pencil** (<i class="fa fa-pencil"></i>)
icon for the bot you want to edit.
1. In the **Actions** column, click the **manage bot** (<i class="zulip-icon
zulip-icon-user-cog"></i>) icon for the bot you want to manage.
1. Edit bot information as desired, and click **Save changes**.

9
help/generate-integration-url.md
View File

@@ -31,8 +31,9 @@ integration URL.
!!! tip ""
You can also click the **pencil** (<i class="fa fa-pencil"></i>) icon,
scroll down to the bottom, and click **Generate URL for an integration**.
You can also click the **manage bot** (<i class="zulip-icon
zulip-icon-user-cog"></i>) icon, scroll down to the bottom, and click
**Generate URL for an integration**.
{tab|via-organization-settings}
@@ -40,8 +41,8 @@ integration URL.
{settings_tab|bot-list-admin}
1. In the **Actions** column, click the **pencil** (<i class="fa fa-pencil"></i>)
icon for an **Incoming webhook** bot.
1. In the **Actions** column, click the **manage bot** (<i class="zulip-icon
zulip-icon-user-cog"></i>) icon for an **Incoming webhook** bot.
1. Scroll down to the bottom, and click **Generate URL for an integration**.

5
help/manage-a-user.md
View File

@@ -14,8 +14,9 @@
{settings_tab|users}
1. Find the user you would like to manage. Click the **pencil**
(<i class="fa fa-pencil"></i>) to the right of their name.
1. Find the user you would like to manage. Click the **manage user**
(<i class="zulip-icon zulip-icon-user-cog"></i>) icon to the right
of their name.
{end_tabs}

5
help/user-roles.md
View File

@@ -65,8 +65,9 @@ existing owner's role.
{settings_tab|users}
1. Find the user you would like to manage. Click the **pencil**
(<i class="fa fa-pencil"></i>) to the right of their name.
1. Find the user you would like to manage. Click the **manage bot**
(<i class="zulip-icon zulip-icon-user-cog"></i>) icon to the right
of their name.
1. Under **User role**, select a [role](#roles).

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

@@ -1 +1,5 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="none" viewBox="0 0 16 16"><path fill="#000" d="M2.668 4.668a3.332 3.332 0 1 1 6.664 0 3.332 3.332 0 0 1-6.664 0ZM6 2.666a2.002 2.002 0 1 0 0 4.003 2.002 2.002 0 0 0 0-4.003Zm8.102 5.696.118-.047a.665.665 0 0 1 .494 1.235l-.082.033a2.682 2.682 0 0 1 .017.71l.028.01a.665.665 0 1 1-.42 1.261l-.08-.026a2.68 2.68 0 0 1-.54.566l.047.116a.665.665 0 1 1-1.235.494l-.032-.08a2.692 2.692 0 0 1-.71.016l-.01.027a.665.665 0 1 1-1.261-.42l.026-.08a2.682 2.682 0 0 1-.565-.54l-.117.047a.665.665 0 1 1-.494-1.235l.081-.032a2.684 2.684 0 0 1-.016-.71l-.028-.009a.665.665 0 0 1 .42-1.261l.08.026c.152-.214.334-.404.54-.565l-.047-.119a.665.665 0 0 1 1.235-.494l.033.083a2.686 2.686 0 0 1 .709-.016l.01-.03a.665.665 0 0 1 1.261.42l-.027.082c.214.15.404.332.565.538Zm-2.785.492a1.334 1.334 0 0 0-.595 1.533.664.664 0 0 1 .134.302 1.334 1.334 0 0 0 1.53.59.664.664 0 0 1 .304-.135 1.334 1.334 0 0 0 .587-1.534.668.668 0 0 1-.132-.296 1.334 1.334 0 0 0-1.537-.59.665.665 0 0 1-.291.13ZM4 9.336a3.332 3.332 0 0 0-3.332 3.332V14a.665.665 0 1 0 1.33 0v-1.333A2.002 2.002 0 0 1 4 10.666h2.667a.665.665 0 1 0 0-1.33H4Z"/></svg>
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M6 1.33594C7.84003 1.33594 9.33167 2.82758 9.33167 4.6676C9.33167 6.50763 7.84003 7.99927 6 7.99927C4.15997 7.99927 2.66833 6.50763 2.66833 4.6676C2.66833 2.82758 4.15997 1.33594 6 1.33594ZM3.99833 4.6676C3.99833 5.77309 4.89451 6.66927 6 6.66927C7.10549 6.66927 8.00167 5.77309 8.00167 4.6676C8.00167 3.56211 7.10549 2.66594 6 2.66594C4.89451 2.66594 3.99833 3.56211 3.99833 4.6676Z" fill="black"/>
<path d="M4 9.33594H6.66667C7.03394 9.33594 7.33167 9.63367 7.33167 10.0009C7.33167 10.3682 7.03394 10.6659 6.66667 10.6659H4C3.46913 10.6659 2.96 10.8768 2.58461 11.2522C2.20922 11.6276 1.99834 12.1367 1.99834 12.6676V14.0009C1.99834 14.3682 1.7006 14.6659 1.33333 14.6659C0.966066 14.6659 0.668335 14.3682 0.668335 14.0009V12.6676C0.668335 11.784 1.01935 10.9366 1.64416 10.3118C2.26897 9.68695 3.11639 9.33594 4 9.33594Z" fill="black"/>
<path d="M10.6864 6.91493C11.0274 6.77853 11.4144 6.94439 11.5508 7.28539L11.5839 7.36823C11.7195 7.34697 11.8585 7.33594 12 7.33594C12.0989 7.33594 12.1965 7.34132 12.2925 7.35181L12.3025 7.32208C12.4186 6.97365 12.7952 6.78535 13.1436 6.90149C13.492 7.01763 13.6803 7.39424 13.5642 7.74266L13.5372 7.82368C13.7508 7.97476 13.9412 8.15647 14.1019 8.36242L14.2197 8.31532C14.5607 8.17892 14.9477 8.34478 15.0841 8.68578C15.2205 9.02678 15.0546 9.41379 14.7136 9.55019L14.6324 9.5827C14.6539 9.71896 14.665 9.85864 14.665 10.0009C14.665 10.0998 14.6596 10.1973 14.6491 10.2934L14.677 10.3027C15.0254 10.4188 15.2137 10.7954 15.0975 11.1438C14.9814 11.4923 14.6048 11.6806 14.2564 11.5644L14.1773 11.5381C14.026 11.752 13.844 11.9426 13.6377 12.1035L13.6841 12.2196C13.8205 12.5606 13.6546 12.9476 13.3136 13.084C12.9726 13.2204 12.5856 13.0546 12.4492 12.7136L12.4172 12.6335C12.2813 12.6548 12.1419 12.6659 12 12.6659C11.9008 12.6659 11.8028 12.6605 11.7064 12.65L11.6975 12.6766C11.5814 13.0251 11.2048 13.2134 10.8564 13.0972C10.508 12.9811 10.3197 12.6045 10.4358 12.2561L10.462 12.1776C10.2481 12.0262 10.0575 11.844 9.89658 11.6375L9.78032 11.684C9.43931 11.8204 9.0523 11.6546 8.9159 11.3136C8.7795 10.9726 8.94536 10.5856 9.28637 10.4492L9.36726 10.4168C9.34603 10.2813 9.33501 10.1424 9.33501 10.0009C9.33501 9.90184 9.34042 9.804 9.35096 9.7077L9.32304 9.6984C8.97462 9.58226 8.78631 9.20566 8.90245 8.85723C9.0186 8.50881 9.3952 8.32051 9.74362 8.43665L9.82316 8.46316C9.97458 8.24921 10.1567 8.05856 10.3632 7.89765L10.3159 7.77934C10.1795 7.43834 10.3454 7.05133 10.6864 6.91493ZM12 8.66594C11.8636 8.66594 11.7319 8.68641 11.6079 8.72444C11.56 8.76162 11.5061 8.79281 11.447 8.81647C11.4041 8.83363 11.3604 8.84601 11.3167 8.85385C10.9264 9.08685 10.665 9.51337 10.665 10.0009C10.665 10.1353 10.6849 10.2651 10.7218 10.3874C10.7606 10.4365 10.793 10.4919 10.8174 10.553C10.8354 10.5978 10.8481 10.6434 10.8559 10.6892C11.0895 11.0767 11.5145 11.3359 12 11.3359C12.1342 11.3359 12.2638 11.3161 12.386 11.2793C12.4355 11.24 12.4914 11.2072 12.553 11.1825C12.5982 11.1645 12.6441 11.1517 12.6902 11.1439C13.0767 10.9101 13.335 10.4857 13.335 10.0009C13.335 9.86506 13.3147 9.73392 13.277 9.61039C13.2387 9.56169 13.2067 9.50679 13.1826 9.4464C13.1651 9.40271 13.1526 9.35827 13.1448 9.31369C12.9113 8.92557 12.4859 8.66594 12 8.66594Z" fill="black"/>
</svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

2
web/styles/settings.css
View File

@@ -1324,6 +1324,7 @@ label.preferences-radio-choice-label {
margin-right: 1px;
}
.manage-user-button,
.deactivate-user-button,
.reactivate-user-button {
display: inline-flex;
@@ -1331,6 +1332,7 @@ label.preferences-radio-choice-label {
min-height: 35px;
}
.manage-bot-button,
.deactivate-bot-button {
display: inline-flex;
align-items: center;

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

@@ -5,8 +5,8 @@
<div class="bot-card-name">{{name}}</div>
{{#if is_active}}
<div class="edit-bot-buttons">
<button type="submit" class="bootstrap-btn open_edit_bot_form tippy-zulip-delayed-tooltip" data-sidebar-form="edit-bot" data-tippy-content="{{t 'Edit bot' }}" data-email="{{email}}">
<i class="fa fa-pencil blue" aria-hidden="true"></i>
<button type="submit" class="bootstrap-btn open_edit_bot_form tippy-zulip-delayed-tooltip manage-bot-button" data-sidebar-form="edit-bot" data-tippy-content="{{t 'Manage bot' }}" data-email="{{email}}">
<i class="zulip-icon zulip-icon-user-cog blue" aria-hidden="true"></i>
</button>
<a type="submit" download="{{zuliprc}}" class="bootstrap-btn download_bot_zuliprc tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Download zuliprc' }}" data-email="{{email}}">
<i class="fa fa-download sea-green" aria-hidden="true"></i>

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

@@ -40,8 +40,8 @@
<td class="actions">
<span class="user-status-settings">
<span {{#if (and is_bot cannot_edit)}}class="tippy-zulip-tooltip"{{/if}} {{#if (and is_bot cannot_edit)}}data-tippy-content="{{t 'This bot cannot be edited.'}}"{{/if}}>
<button class="button rounded small button-warning open-user-form tippy-zulip-delayed-tooltip" data-tippy-content="{{#if is_bot}}{{#unless cannot_edit}}{{t 'Manage bot' }}{{/unless}}{{else}}{{t 'Manage user' }}{{/if}}" data-user-id="{{user_id}}" {{#if cannot_edit}}disabled="disabled"{{/if}}>
<i class="fa fa-pencil" aria-hidden="true"></i>
<button class="button rounded small button-warning open-user-form tippy-zulip-delayed-tooltip manage-user-button" data-tippy-content="{{#if is_bot}}{{#unless cannot_edit}}{{t 'Manage bot' }}{{/unless}}{{else}}{{t 'Manage user' }}{{/if}}" data-user-id="{{user_id}}" {{#if cannot_edit}}disabled="disabled"{{/if}}>
<i class="zulip-icon zulip-icon-user-cog" aria-hidden="true"></i>
</button>
</span>
{{#if is_active}}