Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

left_sidebar: Group topic markers and controls. 

This also corrects a set of single quotes, on the href attribute in
the topic list-item template..
This commit is contained in:
Karl Stolley 2023-09-21 13:21:14 -05:00 committed by Tim Abbott
parent c19c23e311
commit 951714b2d0
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
web/templates/more_topics.hbs
View File

@ -3,13 +3,15 @@
{{#if more_topics_unread_count_muted}}more_topic_unreads_muted_only{{/if}}">
<div class="topic-box">
<a class="topic-name" tabindex="0">{{t "more topics" }}</a>
{{#if more_topics_have_unread_mention_messages}}
<span class="unread_mention_info">
@
<div class="topic-markers-and-controls">
{{#if more_topics_have_unread_mention_messages}}
<span class="unread_mention_info">
@
</span>
{{/if}}
<span class="unread_count {{#unless more_topics_unreads}}zero_count{{/unless}}">
{{more_topics_unreads}}
</span>
{{/if}}
<span class="unread_count {{#unless more_topics_unreads}}zero_count{{/unless}}">
{{more_topics_unreads}}
</span>
</div>
</div>
</li>

24
web/templates/topic_list_item.hbs
View File

@ -3,20 +3,22 @@
<span class="sidebar-topic-check">
{{topic_resolved_prefix}}
</span>
<a href='{{url}}' class="topic-name" title="{{topic_name}}">
<a href="{{url}}" class="topic-name" title="{{topic_name}}">
{{topic_display_name}}
</a>
{{#if contains_unread_mention}}
<span class="unread_mention_info">
@
<div class="topic-markers-and-controls">
{{#if contains_unread_mention}}
<span class="unread_mention_info">
@
</span>
{{else if is_followed}}
<i class="zulip-icon zulip-icon-follow" aria-hidden="true"> </i>
&nbsp;
{{/if}}
<span class="unread_count {{#if is_zero}}zero_count{{/if}}">
{{unread}}
</span>
{{else if is_followed}}
<i class="zulip-icon zulip-icon-follow" aria-hidden="true"> </i>
&nbsp;
{{/if}}
<span class="unread_count {{#if is_zero}}zero_count{{/if}}">
{{unread}}
</span>
</div>
<span class="sidebar-menu-icon topic-sidebar-menu-icon">
<i class="zulip-icon zulip-icon-more-vertical" aria-hidden="true"></i>
</span>