mirror of
https://github.com/zulip/zulip.git
synced 2025-10-23 04:52:12 +00:00
tooltips: Clean up aria-label for visiblity tooltips.
Using different punctuation for the aria-label from the tooltip is silly. Additionally, we don't need to repeat the channel name in aria-label; it essentially will never be seen and the message list copy of getting the channel name was buggy.
This commit is contained in:
@@ -436,7 +436,6 @@ function format_topic(
|
|||||||
is_topic: true,
|
is_topic: true,
|
||||||
stream_id,
|
stream_id,
|
||||||
topic_name: topic,
|
topic_name: topic,
|
||||||
stream_name: stream_data.get_stream_name_from_id(stream_id),
|
|
||||||
unread_count: topic_unread_count,
|
unread_count: topic_unread_count,
|
||||||
conversation_key: get_topic_key(stream_id, topic),
|
conversation_key: get_topic_key(stream_id, topic),
|
||||||
topic_url: hash_util.by_stream_topic_url(stream_id, topic),
|
topic_url: hash_util.by_stream_topic_url(stream_id, topic),
|
||||||
|
@@ -289,10 +289,8 @@ function populate_group_from_message_container(group, message_container) {
|
|||||||
// module. Ideally, we'd clean this up by making the
|
// module. Ideally, we'd clean this up by making the
|
||||||
// tutorial populate stream_settings_ui.js "properly".
|
// tutorial populate stream_settings_ui.js "properly".
|
||||||
group.stream_id = -1;
|
group.stream_id = -1;
|
||||||
group.stream_name = $t({defaultMessage: "Unknown channel"});
|
|
||||||
} else {
|
} else {
|
||||||
group.stream_id = sub.stream_id;
|
group.stream_id = sub.stream_id;
|
||||||
group.stream_name = stream_data.get_stream_name_from_id(sub.stream_id);
|
|
||||||
}
|
}
|
||||||
group.is_subscribed = stream_data.is_subscribed(group.stream_id);
|
group.is_subscribed = stream_data.is_subscribed(group.stream_id);
|
||||||
group.topic_is_resolved = resolved_topic.is_resolved(group.topic);
|
group.topic_is_resolved = resolved_topic.is_resolved(group.topic);
|
||||||
|
@@ -51,16 +51,16 @@
|
|||||||
data-stream-id="{{stream_id}}" data-topic-name="{{topic_name}}" tabindex="0" data-col-index="{{ column_indexes.TOPIC_VISIBILITY }}">
|
data-stream-id="{{stream_id}}" data-topic-name="{{topic_name}}" tabindex="0" data-col-index="{{ column_indexes.TOPIC_VISIBILITY }}">
|
||||||
{{#if (eq visibility_policy all_visibility_policies.FOLLOWED)}}
|
{{#if (eq visibility_policy all_visibility_policies.FOLLOWED)}}
|
||||||
<i class="zulip-icon zulip-icon-follow recipient_bar_icon" data-tippy-content="{{t 'You follow this topic.'}}"
|
<i class="zulip-icon zulip-icon-follow recipient_bar_icon" data-tippy-content="{{t 'You follow this topic.'}}"
|
||||||
role="button" aria-haspopup="true" aria-label="{{t 'You follow this topic' }}"></i>
|
role="button" aria-haspopup="true" aria-label="{{t 'You follow this topic.' }}"></i>
|
||||||
{{else if (eq visibility_policy all_visibility_policies.UNMUTED)}}
|
{{else if (eq visibility_policy all_visibility_policies.UNMUTED)}}
|
||||||
<i class="zulip-icon zulip-icon-unmute-new recipient_bar_icon" data-tippy-content="{{t 'You have unmuted this topic.'}}"
|
<i class="zulip-icon zulip-icon-unmute-new recipient_bar_icon" data-tippy-content="{{t 'You have unmuted this topic.'}}"
|
||||||
role="button" aria-haspopup="true" aria-label="{{t 'You have unmuted this topic' }}"></i>
|
role="button" aria-haspopup="true" aria-label="{{t 'You have unmuted this topic.' }}"></i>
|
||||||
{{else if (eq visibility_policy all_visibility_policies.MUTED)}}
|
{{else if (eq visibility_policy all_visibility_policies.MUTED)}}
|
||||||
<i class="zulip-icon zulip-icon-mute-new recipient_bar_icon" data-tippy-content="{{t 'You have muted this topic.'}}"
|
<i class="zulip-icon zulip-icon-mute-new recipient_bar_icon" data-tippy-content="{{t 'You have muted this topic.'}}"
|
||||||
role="button" aria-haspopup="true" aria-label="{{t 'You have muted this topic' }}"></i>
|
role="button" aria-haspopup="true" aria-label="{{t 'You have muted this topic.' }}"></i>
|
||||||
{{else if (eq visibility_policy all_visibility_policies.INHERIT)}}
|
{{else if (eq visibility_policy all_visibility_policies.INHERIT)}}
|
||||||
<i class="zulip-icon zulip-icon-inherit recipient_bar_icon"
|
<i class="zulip-icon zulip-icon-inherit recipient_bar_icon"
|
||||||
role="button" aria-haspopup="true" aria-label="{{t 'Notifications are based on your configuration for #{stream_name}' }}"></i>
|
role="button" aria-haspopup="true" aria-label="{{t 'Notifications are based on your configuration for this channel.' }}"></i>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</span>
|
</span>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
@@ -63,16 +63,16 @@
|
|||||||
<span class="recent_view_focusable change_visibility_policy hidden-for-spectators" data-stream-id="{{stream_id}}" data-topic-name="{{topic}}" data-col-index="{{ column_indexes.mute }}">
|
<span class="recent_view_focusable change_visibility_policy hidden-for-spectators" data-stream-id="{{stream_id}}" data-topic-name="{{topic}}" data-col-index="{{ column_indexes.mute }}">
|
||||||
{{#if (eq visibility_policy all_visibility_policies.FOLLOWED)}}
|
{{#if (eq visibility_policy all_visibility_policies.FOLLOWED)}}
|
||||||
<i class="zulip-icon zulip-icon-follow recipient_bar_icon" data-tippy-content="{{t 'You follow this topic.'}}"
|
<i class="zulip-icon zulip-icon-follow recipient_bar_icon" data-tippy-content="{{t 'You follow this topic.'}}"
|
||||||
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You follow this topic' }}"></i>
|
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You follow this topic.' }}"></i>
|
||||||
{{else if (eq visibility_policy all_visibility_policies.UNMUTED)}}
|
{{else if (eq visibility_policy all_visibility_policies.UNMUTED)}}
|
||||||
<i class="zulip-icon zulip-icon-unmute-new recipient_bar_icon" data-tippy-content="{{t 'You have unmuted this topic.'}}"
|
<i class="zulip-icon zulip-icon-unmute-new recipient_bar_icon" data-tippy-content="{{t 'You have unmuted this topic.'}}"
|
||||||
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You have unmuted this topic' }}"></i>
|
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You have unmuted this topic.' }}"></i>
|
||||||
{{else if (eq visibility_policy all_visibility_policies.MUTED)}}
|
{{else if (eq visibility_policy all_visibility_policies.MUTED)}}
|
||||||
<i class="zulip-icon zulip-icon-mute-new recipient_bar_icon" data-tippy-content="{{t 'You have muted this topic.'}}"
|
<i class="zulip-icon zulip-icon-mute-new recipient_bar_icon" data-tippy-content="{{t 'You have muted this topic.'}}"
|
||||||
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You have muted this topic' }}"></i>
|
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You have muted this topic.' }}"></i>
|
||||||
{{else}}
|
{{else}}
|
||||||
<i class="zulip-icon zulip-icon-inherit recipient_bar_icon"
|
<i class="zulip-icon zulip-icon-inherit recipient_bar_icon"
|
||||||
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'Notifications are based on your configuration for #{stream_name}' }}"></i>
|
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'Notifications are based on your configuration for this channel.' }}"></i>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
|
@@ -62,16 +62,16 @@
|
|||||||
<span class="change_visibility_policy hidden-for-spectators" data-stream-id="{{stream_id}}" data-topic-name="{{topic}}">
|
<span class="change_visibility_policy hidden-for-spectators" data-stream-id="{{stream_id}}" data-topic-name="{{topic}}">
|
||||||
{{#if (eq visibility_policy all_visibility_policies.FOLLOWED)}}
|
{{#if (eq visibility_policy all_visibility_policies.FOLLOWED)}}
|
||||||
<i class="zulip-icon zulip-icon-follow recipient_bar_icon" data-tippy-content="{{t 'You follow this topic.'}}"
|
<i class="zulip-icon zulip-icon-follow recipient_bar_icon" data-tippy-content="{{t 'You follow this topic.'}}"
|
||||||
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You follow this topic' }}"></i>
|
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You follow this topic.' }}"></i>
|
||||||
{{else if (eq visibility_policy all_visibility_policies.UNMUTED)}}
|
{{else if (eq visibility_policy all_visibility_policies.UNMUTED)}}
|
||||||
<i class="zulip-icon zulip-icon-unmute-new recipient_bar_icon" data-tippy-content="{{t 'You have unmuted this topic.'}}"
|
<i class="zulip-icon zulip-icon-unmute-new recipient_bar_icon" data-tippy-content="{{t 'You have unmuted this topic.'}}"
|
||||||
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You have unmuted this topic' }}"></i>
|
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You have unmuted this topic.' }}"></i>
|
||||||
{{else if (eq visibility_policy all_visibility_policies.MUTED)}}
|
{{else if (eq visibility_policy all_visibility_policies.MUTED)}}
|
||||||
<i class="zulip-icon zulip-icon-mute-new recipient_bar_icon" data-tippy-content="{{t 'You have muted this topic.'}}"
|
<i class="zulip-icon zulip-icon-mute-new recipient_bar_icon" data-tippy-content="{{t 'You have muted this topic.'}}"
|
||||||
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You have muted this topic' }}"></i>
|
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'You have muted this topic.' }}"></i>
|
||||||
{{else}}
|
{{else}}
|
||||||
<i class="zulip-icon zulip-icon-inherit recipient_bar_icon"
|
<i class="zulip-icon zulip-icon-inherit recipient_bar_icon"
|
||||||
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'Notifications are based on your configuration for #{stream_name}' }}"></i>
|
role="button" tabindex="0" aria-haspopup="true" aria-label="{{t 'Notifications are based on your configuration for this channel.' }}"></i>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
</span>
|
</span>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
Reference in New Issue
Block a user