paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-08 16:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

left_sidebar: Prepare home views with selection logic, unread counts.

Browse Source
This commit is contained in:
Karl Stolley
2023-11-02 14:05:21 -05:00
committed by Tim Abbott
parent 00d00036fe
commit 4759fc9f69
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/sidebar_ui.js
View File

@@ -138,6 +138,8 @@ export function initialize_left_sidebar() {
const rendered_sidebar = render_left_sidebar({ const rendered_sidebar = render_left_sidebar({
is_guest: page_params.is_guest, is_guest: page_params.is_guest,
development_environment: page_params.development_environment, development_environment: page_params.development_environment,
is_inbox_home_view:
user_settings.web_home_view === settings_config.web_home_view_values.inbox.code,
is_all_messages_home_view: is_all_messages_home_view:
user_settings.web_home_view === settings_config.web_home_view_values.all_messages.code, user_settings.web_home_view === settings_config.web_home_view_values.all_messages.code,
is_recent_view_home_view: is_recent_view_home_view:

28
web/templates/left_sidebar.hbs
View File

@@ -5,26 +5,28 @@
{{~!-- squash whitespace --~}} {{~!-- squash whitespace --~}}
<h4 class="sidebar-title">{{t 'VIEWS' }}</h4> <h4 class="sidebar-title">{{t 'VIEWS' }}</h4>
<ul id="left-sidebar-navigation-list-condensed" class="filters"> <ul id="left-sidebar-navigation-list-condensed" class="filters">
<li class="top_left_inbox left-sidebar-navigation-condensed-item"> <li class="top_left_inbox left-sidebar-navigation-condensed-item {{#if is_inbox_home_view}}selected-home-view{{/if}}">
<a href="#inbox" class="tippy-views-tooltip left-sidebar-navigation-icon-container" data-tooltip-template-id="inbox-tooltip-template"> <a href="#inbox" {{#if is_inbox_home_view}}tabindex="0"{{/if}} class="tippy-views-tooltip left-sidebar-navigation-icon-container" data-tooltip-template-id="inbox-tooltip-template">
<span class="filter-icon"> <span class="filter-icon">
<i class="zulip-icon zulip-icon-inbox" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-inbox" aria-hidden="true"></i>
</span> </span>
<span class="unread_count"></span> <span class="unread_count"></span>
</a> </a>
</li> </li>
<li class="top_left_recent_view left-sidebar-navigation-condensed-item"> <li class="top_left_recent_view left-sidebar-navigation-condensed-item {{#if is_recent_view_home_view}}selected-home-view{{/if}}">
<a href="#recent" class="tippy-views-tooltip left-sidebar-navigation-icon-container" data-tooltip-template-id="recent-conversations-tooltip-template"> <a href="#recent" {{#if is_recent_view_home_view}}tabindex="0"{{/if}} class="tippy-views-tooltip left-sidebar-navigation-icon-container" data-tooltip-template-id="recent-conversations-tooltip-template">
<span class="filter-icon"> <span class="filter-icon">
<i class="zulip-icon zulip-icon-clock" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-clock" aria-hidden="true"></i>
</span> </span>
<span class="unread_count"></span>
</a> </a>
</li> </li>
<li class="top_left_all_messages left-sidebar-navigation-condensed-item"> <li class="top_left_all_messages left-sidebar-navigation-condensed-item {{#if is_all_messages_home_view}}selected-home-view{{/if}}">
<a href="#all_messages" class="home-link tippy-views-tooltip left-sidebar-navigation-icon-container" data-tooltip-template-id="all-message-tooltip-template"> <a href="#all_messages" {{#if is_all_messages_home_view}}tabindex="0"{{/if}} class="home-link tippy-views-tooltip left-sidebar-navigation-icon-container" data-tooltip-template-id="all-message-tooltip-template">
<span class="filter-icon"> <span class="filter-icon">
<i class="zulip-icon zulip-icon-all-messages" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-all-messages" aria-hidden="true"></i>
</span> </span>
<span class="unread_count"></span>
</a> </a>
</li> </li>
<li class="top_left_mentions left-sidebar-navigation-condensed-item"> <li class="top_left_mentions left-sidebar-navigation-condensed-item">
@@ -49,8 +51,8 @@
</div> </div>
</div> </div>
<ul id="left-sidebar-navigation-list" class="left-sidebar-navigation-list filters"> <ul id="left-sidebar-navigation-list" class="left-sidebar-navigation-list filters">
<li class="tippy-views-tooltip top_left_inbox top_left_row hidden-for-spectators" data-tooltip-template-id="inbox-tooltip-template"> <li class="tippy-views-tooltip top_left_inbox top_left_row hidden-for-spectators {{#if is_inbox_home_view}}selected-home-view{{/if}}" data-tooltip-template-id="inbox-tooltip-template">
<a href="#inbox" class="left-sidebar-navigation-label-container"> <a href="#inbox" {{#if is_inbox_home_view}}tabindex="0"{{/if}} class="left-sidebar-navigation-label-container">
<span class="filter-icon"> <span class="filter-icon">
<i class="zulip-icon zulip-icon-inbox" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-inbox" aria-hidden="true"></i>
</span> </span>
@@ -60,25 +62,27 @@
</a> </a>
<span class="arrow sidebar-menu-icon inbox-sidebar-menu-icon hidden-for-spectators"><i class="zulip-icon zulip-icon-more-vertical" aria-hidden="true"></i></span> <span class="arrow sidebar-menu-icon inbox-sidebar-menu-icon hidden-for-spectators"><i class="zulip-icon zulip-icon-more-vertical" aria-hidden="true"></i></span>
</li> </li>
<li class="tippy-views-tooltip top_left_recent_view top_left_row" data-tooltip-template-id="recent-conversations-tooltip-template"> <li class="tippy-views-tooltip top_left_recent_view top_left_row {{#if is_recent_view_home_view}}selected-home-view{{/if}}" data-tooltip-template-id="recent-conversations-tooltip-template">
<a href="#recent" class="left-sidebar-navigation-label-container"> <a href="#recent" {{#if is_recent_view_home_view}}tabindex="0"{{/if}} class="left-sidebar-navigation-label-container">
<span class="filter-icon"> <span class="filter-icon">
<i class="zulip-icon zulip-icon-clock" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-clock" aria-hidden="true"></i>
</span> </span>
{{~!-- squash whitespace --~}} {{~!-- squash whitespace --~}}
<span class="left-sidebar-navigation-label">{{t 'Recent conversations' }}</span> <span class="left-sidebar-navigation-label">{{t 'Recent conversations' }}</span>
<span class="unread_count"></span>
</a> </a>
<span class="arrow sidebar-menu-icon recent-view-sidebar-menu-icon hidden-for-spectators {{#if is_recent_view_home_view}}hide{{/if}}"> <span class="arrow sidebar-menu-icon recent-view-sidebar-menu-icon hidden-for-spectators {{#if is_recent_view_home_view}}hide{{/if}}">
<i class="zulip-icon zulip-icon-more-vertical" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-more-vertical" aria-hidden="true"></i>
</span> </span>
</li> </li>
<li class="tippy-views-tooltip top_left_all_messages top_left_row" data-tooltip-template-id="all-message-tooltip-template"> <li class="tippy-views-tooltip top_left_all_messages top_left_row {{#if is_all_messages_home_view}}selected-home-view{{/if}}" data-tooltip-template-id="all-message-tooltip-template">
<a href="#all_messages" class="home-link left-sidebar-navigation-label-container"> <a href="#all_messages" {{#if is_all_messages_home_view}}tabindex="0"{{/if}} class="home-link left-sidebar-navigation-label-container">
<span class="filter-icon"> <span class="filter-icon">
<i class="zulip-icon zulip-icon-all-messages" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-all-messages" aria-hidden="true"></i>
</span> </span>
{{~!-- squash whitespace --~}} {{~!-- squash whitespace --~}}
<span class="left-sidebar-navigation-label">{{t 'All messages' }}</span> <span class="left-sidebar-navigation-label">{{t 'All messages' }}</span>
<span class="unread_count"></span>
</a> </a>
<span class="arrow sidebar-menu-icon all-messages-sidebar-menu-icon hidden-for-spectators {{#if is_all_messages_home_view}}hide{{/if}}"> <span class="arrow sidebar-menu-icon all-messages-sidebar-menu-icon hidden-for-spectators {{#if is_all_messages_home_view}}hide{{/if}}">
<i class="zulip-icon zulip-icon-more-vertical" aria-hidden="true"></i> <i class="zulip-icon zulip-icon-more-vertical" aria-hidden="true"></i>