diff --git a/static/js/settings_profile_fields.js b/static/js/settings_profile_fields.js index e1e996200c..bf3024a2a9 100644 --- a/static/js/settings_profile_fields.js +++ b/static/js/settings_profile_fields.js @@ -59,7 +59,7 @@ export function field_type_id_to_string(type_id) { return undefined; } -// Checking custom profile field type is valid for showing display in profile summary checkbox field. +// Checking custom profile field type is valid for showing display on user card checkbox field. function is_valid_to_display_in_summary(field_type) { if (field_type === field_types.LONG_TEXT.id || field_type === field_types.USER.id) { return false; @@ -246,7 +246,7 @@ function set_up_create_field_form() { $("#profile_field_hint").val(default_hint); } - // Not showing "display in profile summary" option for long text/user profile field. + // Not showing "display on user card" option for long text/user profile field. if (is_valid_to_display_in_summary(profile_field_type)) { $("#profile_field_display_in_profile_summary").closest(".input-group").show(); const check_display_in_profile_summary_by_default = @@ -310,8 +310,7 @@ function open_custom_profile_field_form_modal() { clear_form_data(); // If we already have 2 custom profile fields configured to be - // displayed in the user profile summary, disable the input to - // change it. + // displayed on the user card, disable the input to change it. $("#add-new-custom-profile-field-form #profile_field_display_in_profile_summary").prop( "disabled", display_in_profile_summary_fields_limit_reached, @@ -469,8 +468,8 @@ function open_edit_form_modal(e) { function set_initial_values_of_profile_field() { const $profile_field_form = $("#edit-custom-profile-field-form-" + field_id); - // If its passes or equals the max limit we are disabling option for display custom profile field - // in user profile summary and adding tooptip except already checked field. + // If it exceeds or equals the max limit, we are disabling option for display custom + // profile field on user card and adding tooptip, unless the field is already checked. if (display_in_profile_summary_fields_limit_reached && !field.display_in_profile_summary) { $profile_field_form .find("input[name=display_in_profile_summary]") @@ -565,8 +564,8 @@ function open_edit_form_modal(e) { }); } -// If passes or equals the max limit, we are disabling option for -// display custom profile field in user profile summary and adding tooltip. +// If exceeds or equals the max limit, we are disabling option for +// display custom profile field on user card and adding tooltip. function update_profile_fields_checkboxes() { // Disabling only uncheck checkboxes in table, so user should able uncheck checked checkboxes. $("#admin_profile_fields_table .display_in_profile_summary_checkbox_false").prop( diff --git a/static/js/tippyjs.js b/static/js/tippyjs.js index c30fbae13e..d2d013ffa9 100644 --- a/static/js/tippyjs.js +++ b/static/js/tippyjs.js @@ -386,7 +386,7 @@ export function initialize() { "#add-new-custom-profile-field-form .display_in_profile_summary_tooltip", ], content: $t({ - defaultMessage: "Only 2 custom profile fields can be displayed in the profile summary.", + defaultMessage: "Only 2 custom profile fields can be displayed on the user card.", }), appendTo: () => document.body, onTrigger(instance) { diff --git a/static/templates/keyboard_shortcuts.hbs b/static/templates/keyboard_shortcuts.hbs index f505dc32a8..4772e72f3f 100644 --- a/static/templates/keyboard_shortcuts.hbs +++ b/static/templates/keyboard_shortcuts.hbs @@ -209,7 +209,7 @@ ← - {{t "Show message sender's profile" }} + {{t "Show message sender's user card" }} U diff --git a/static/templates/me_message.hbs b/static/templates/me_message.hbs index da4cf21d74..5548af43ff 100644 --- a/static/templates/me_message.hbs +++ b/static/templates/me_message.hbs @@ -1,13 +1,13 @@ - + {{> message_avatar}} - + {{msg/sender_full_name}} diff --git a/static/templates/message_body.hbs b/static/templates/message_body.hbs index 8c0a79282b..1ecc11f1e2 100644 --- a/static/templates/message_body.hbs +++ b/static/templates/message_body.hbs @@ -2,7 +2,7 @@ {{#unless status_message}} {{#if include_sender}} - + {{> message_avatar ~}} {{msg/sender_full_name}}{{> status_emoji msg/status_emoji_info}} {{#if sender_is_bot}} diff --git a/static/templates/settings/add_new_custom_profile_field_form.hbs b/static/templates/settings/add_new_custom_profile_field_form.hbs index 9b2442f8bc..a2c226d32c 100644 --- a/static/templates/settings/add_new_custom_profile_field_form.hbs +++ b/static/templates/settings/add_new_custom_profile_field_form.hbs @@ -40,7 +40,7 @@ diff --git a/static/templates/settings/edit_custom_profile_field_form.hbs b/static/templates/settings/edit_custom_profile_field_form.hbs index 882c944307..b4c4ca50d3 100644 --- a/static/templates/settings/edit_custom_profile_field_form.hbs +++ b/static/templates/settings/edit_custom_profile_field_form.hbs @@ -41,7 +41,7 @@ {{/if}} diff --git a/static/templates/settings/profile_field_settings_admin.hbs b/static/templates/settings/profile_field_settings_admin.hbs index 3ad1cc6c8e..84693b25a0 100644 --- a/static/templates/settings/profile_field_settings_admin.hbs +++ b/static/templates/settings/profile_field_settings_admin.hbs @@ -13,7 +13,7 @@ {{t "Hint" }} {{t "Type" }} {{#if is_admin}} - {{t "Summary"}} + {{t "Card"}} {{t "Actions" }} {{/if}} diff --git a/templates/zerver/help/custom-profile-fields.md b/templates/zerver/help/custom-profile-fields.md index 69acf6806e..59a385e597 100644 --- a/templates/zerver/help/custom-profile-fields.md +++ b/templates/zerver/help/custom-profile-fields.md @@ -56,13 +56,13 @@ There are several different types of fields available. * **Person picker**: For selecting one or more users, like "Manager" or "Direct reports". -## Display custom fields in user profile summaries +## Display custom fields on user card -Organizations may find it useful to display additional fields in a user's -profile summary, such as pronouns, GitHub username, job title, team, etc. +Organizations may find it useful to display additional fields on the +user card, such as pronouns, GitHub username, job title, team, etc. All field types other than "Long text" or "Person" have a checkbox option -that controls whether to display a custom field in a user's profile summary. +that controls whether to display a custom field on the user card. There's a limit to the number of custom profile fields that can be displayed at a time. If the maximum number of fields is already selected, all unselected checkboxes will be disabled. @@ -74,14 +74,14 @@ checkboxes will be disabled. 1. In the **Actions** column, click the **pencil** () icon for the profile field you want to edit. -1. Toggle **Display in profile summary**. +1. Toggle **Display on user card**. 4. Click **Save changes**. !!! tip "" You can also choose which custom profile fields will be displayed by toggling - the checkboxes in the **Summary** column of the **Custom profile fields** table. + the checkboxes in the **Card** column of the **Custom profile fields** table. {end_tabs} diff --git a/templates/zerver/help/include/manage-this-user.md b/templates/zerver/help/include/manage-this-user.md index e9fd41bbc0..048679f63b 100644 --- a/templates/zerver/help/include/manage-this-user.md +++ b/templates/zerver/help/include/manage-this-user.md @@ -1,3 +1,3 @@ -{!profile-summary-three-dot-menu.md!} +{!user-card-three-dot-menu.md!} 1. Click **Manage this user**. diff --git a/templates/zerver/help/include/profile-summary-three-dot-menu.md b/templates/zerver/help/include/profile-summary-three-dot-menu.md deleted file mode 100644 index 4f4d8e0f29..0000000000 --- a/templates/zerver/help/include/profile-summary-three-dot-menu.md +++ /dev/null @@ -1,4 +0,0 @@ -{!right-sidebar-profile-menu.md!} - -1. Click on the **ellipsis** () - in the user's profile summary. diff --git a/templates/zerver/help/include/right-sidebar-profile-menu.md b/templates/zerver/help/include/right-sidebar-user-card.md similarity index 69% rename from templates/zerver/help/include/right-sidebar-profile-menu.md rename to templates/zerver/help/include/right-sidebar-user-card.md index bf0b7e0992..66997996a5 100644 --- a/templates/zerver/help/include/right-sidebar-profile-menu.md +++ b/templates/zerver/help/include/right-sidebar-user-card.md @@ -1,4 +1,4 @@ 1. Hover over a user's name in the right sidebar. 1. Click on the **ellipsis** () - to the right of their name. + to the right of their name to open their **user card**. diff --git a/templates/zerver/help/include/right-sidebar-view-full-profile.md b/templates/zerver/help/include/right-sidebar-view-full-profile.md index b1ddb531ea..5469a3bbe9 100644 --- a/templates/zerver/help/include/right-sidebar-view-full-profile.md +++ b/templates/zerver/help/include/right-sidebar-view-full-profile.md @@ -1,3 +1,3 @@ -{!right-sidebar-profile-menu.md!} +{!right-sidebar-user-card.md!} 1. Click **View full profile**. diff --git a/templates/zerver/help/include/self-user-actions-menu.md b/templates/zerver/help/include/self-user-card.md similarity index 67% rename from templates/zerver/help/include/self-user-actions-menu.md rename to templates/zerver/help/include/self-user-card.md index e17075d31f..e2a458fafa 100644 --- a/templates/zerver/help/include/self-user-actions-menu.md +++ b/templates/zerver/help/include/self-user-card.md @@ -1,3 +1,4 @@ 1. Hover over your name in the right sidebar. -1. Click on the **ellipsis** (). +1. Click on the **ellipsis** () + to open your **user card**. diff --git a/templates/zerver/help/include/user-card-three-dot-menu.md b/templates/zerver/help/include/user-card-three-dot-menu.md new file mode 100644 index 0000000000..cd72554cee --- /dev/null +++ b/templates/zerver/help/include/user-card-three-dot-menu.md @@ -0,0 +1,3 @@ +{!right-sidebar-user-card.md!} + +1. Click on the **ellipsis** () in the user card. diff --git a/templates/zerver/help/keyboard-shortcuts.md b/templates/zerver/help/keyboard-shortcuts.md index 7086b3c151..cd51032004 100644 --- a/templates/zerver/help/keyboard-shortcuts.md +++ b/templates/zerver/help/keyboard-shortcuts.md @@ -139,7 +139,7 @@ below, and add more to your repertoire as needed. ### For a selected message (outlined in blue) -* **Show sender's profile**: U +* **Show message sender's user card**: U * **View image**: V diff --git a/templates/zerver/help/mention-a-user-or-group.md b/templates/zerver/help/mention-a-user-or-group.md index b2aa4734b3..15901c82a6 100644 --- a/templates/zerver/help/mention-a-user-or-group.md +++ b/templates/zerver/help/mention-a-user-or-group.md @@ -23,7 +23,7 @@ messages and alert words. {start_tabs} -{!right-sidebar-profile-menu.md!} +{!right-sidebar-user-card.md!} 1. Select **Copy mention syntax** to add it to your clipboard. @@ -35,7 +35,8 @@ messages and alert words. {start_tabs} -1. Click on a user's profile picture or name on a message they sent. +1. Click on a user's profile picture or name on a message they sent + to open their **user card**. 1. Select **Reply mentioning user** to start a reply to the conversation with a mention inserted into the compose box. diff --git a/templates/zerver/help/mute-a-user.md b/templates/zerver/help/mute-a-user.md index d9e2badb51..88b8e03bf3 100644 --- a/templates/zerver/help/mute-a-user.md +++ b/templates/zerver/help/mute-a-user.md @@ -51,7 +51,7 @@ have the following effects: {start_tabs} -{!profile-summary-three-dot-menu.md!} +{!user-card-three-dot-menu.md!} 1. Click **Mute this user**. @@ -60,7 +60,8 @@ have the following effects: !!! Tip "" You can also click on a user's profile picture or name on a - message they sent, and skip to step 3. + message they sent to open their **user card**, and skip to + step 3. {end_tabs} diff --git a/templates/zerver/help/private-messages.md b/templates/zerver/help/private-messages.md index 61852da5f7..bbf8eac324 100644 --- a/templates/zerver/help/private-messages.md +++ b/templates/zerver/help/private-messages.md @@ -29,8 +29,9 @@ and do not appear in your list of streams. !!! tip "" - You can also click on any user in the right sidebar, or click on a - user's profile picture or name, and select **Send private message**. + You can also click on any user in the right sidebar to start composing + a private message to them. Or open their **user card** by clicking on + their profile picture or name, and select **Send private message**. {tab|mobile} diff --git a/templates/zerver/help/status-and-availability.md b/templates/zerver/help/status-and-availability.md index 422709bc96..9b0d3f02c3 100644 --- a/templates/zerver/help/status-and-availability.md +++ b/templates/zerver/help/status-and-availability.md @@ -23,7 +23,7 @@ You can set a status emoji, status message, or both. {tab|desktop-web} -{!self-user-actions-menu.md!} +{!self-user-card.md!} 1. Click **Set a status**. @@ -52,8 +52,8 @@ and compose box. You can view status messages by hovering over your or anyone else's name in the left or right sidebar, or by clicking the user's name or avatar in the main -message feed. If someone hasn't set a message as part of their status, then no -status message will appear. +message feed to open their **user card**. If someone hasn't set a message as +part of their status, then no status message will appear. ## Availability @@ -88,7 +88,7 @@ the UI will be frozen as the approximate time you enabled this setting. {tab|desktop-web} -{!self-user-actions-menu.md!} +{!self-user-card.md!} 1. To enable, you'll select **Go invisible**. diff --git a/templates/zerver/help/view-messages-sent-by-a-user.md b/templates/zerver/help/view-messages-sent-by-a-user.md index 33ae36f11e..172e9deb14 100644 --- a/templates/zerver/help/view-messages-sent-by-a-user.md +++ b/templates/zerver/help/view-messages-sent-by-a-user.md @@ -7,7 +7,7 @@ including yourself. {start_tabs} -{!right-sidebar-profile-menu.md!} +{!right-sidebar-user-card.md!} 1. Select **View messages sent** to view all messages sent by this user. @@ -17,7 +17,7 @@ including yourself. {start_tabs} -{!self-user-actions-menu.md!} +{!self-user-card.md!} 1. Select **View messages sent** to view all the messages you've sent. @@ -33,7 +33,7 @@ including yourself. {start_tabs} -{!self-user-actions-menu.md!} +{!self-user-card.md!} 1. Select **View messages with yourself** to view messages you sent to yourself. diff --git a/templates/zerver/help/view-someones-profile.md b/templates/zerver/help/view-someones-profile.md index 9e96935478..6451381c92 100644 --- a/templates/zerver/help/view-someones-profile.md +++ b/templates/zerver/help/view-someones-profile.md @@ -47,7 +47,8 @@ Additional tabs showing: !!! Tip "" You can also click on a user's profile picture or name on a - message they sent, and skip to the last step. + message they sent to open their **user card**, and skip to + the last step. {tab|mobile} diff --git a/zerver/openapi/zulip.yaml b/zerver/openapi/zulip.yaml index 1a4afa65a3..0e2c824c86 100644 --- a/zerver/openapi/zulip.yaml +++ b/zerver/openapi/zulip.yaml @@ -15593,7 +15593,7 @@ components: display_in_profile_summary: type: boolean description: | - Whether the custom profile field, display or not in the user profile summary. + Whether the custom profile field, display or not on the user card. Currently it's value not allowed to be `true` of `Long text` and `Person picker` [profile field types](/help/custom-profile-fields#profile-field-types).