diff --git a/web/src/filter.ts b/web/src/filter.ts index 9150f9f88f..a495535eee 100644 --- a/web/src/filter.ts +++ b/web/src/filter.ts @@ -1325,6 +1325,10 @@ export class Filter { icon = "question-circle-o"; break; } + if (sub.is_archived) { + zulip_icon = "archive"; + break; + } if (sub.invite_only) { zulip_icon = "lock"; break; diff --git a/web/styles/app_components.css b/web/styles/app_components.css index 988db07f1e..9f1d4b9731 100644 --- a/web/styles/app_components.css +++ b/web/styles/app_components.css @@ -962,6 +962,7 @@ input.settings_text_input { width: 12px; &.zulip-icon-globe, + &.zulip-icon-archive, &.zulip-icon-hashtag { font-size: 0.75em; } diff --git a/web/templates/inline_decorated_stream_name.hbs b/web/templates/inline_decorated_stream_name.hbs index 561049e95e..9f943c19ea 100644 --- a/web/templates/inline_decorated_stream_name.hbs +++ b/web/templates/inline_decorated_stream_name.hbs @@ -1,5 +1,7 @@ {{! This controls whether the swatch next to streams in the left sidebar has a lock icon. }} -{{~#if stream.invite_only ~}} +{{~#if stream.is_archived ~}} + {{stream.name ~}} +{{~ else if stream.invite_only ~}} {{stream.name ~}} {{~ else if stream.is_web_public ~}} {{stream.name ~}} diff --git a/web/templates/popovers/stream_card_popover.hbs b/web/templates/popovers/stream_card_popover.hbs index 05cd17a530..8f59dca0ae 100644 --- a/web/templates/popovers/stream_card_popover.hbs +++ b/web/templates/popovers/stream_card_popover.hbs @@ -4,7 +4,8 @@ {{stream.name}} diff --git a/web/templates/stream_privacy.hbs b/web/templates/stream_privacy.hbs index bebdac58ab..21c877cd6b 100644 --- a/web/templates/stream_privacy.hbs +++ b/web/templates/stream_privacy.hbs @@ -1,5 +1,7 @@ {{! This controls whether the swatch next to streams in the left sidebar has a lock icon. }} -{{#if invite_only}} +{{#if is_archived}} + +{{else if invite_only}} {{else if is_web_public}} diff --git a/web/templates/stream_settings/selected_stream_title.hbs b/web/templates/stream_settings/selected_stream_title.hbs index ac292053fb..4755dca4cc 100644 --- a/web/templates/stream_settings/selected_stream_title.hbs +++ b/web/templates/stream_settings/selected_stream_title.hbs @@ -2,6 +2,7 @@ {{#unless preview_url}}{{t "Add subscribers to "}}{{/unless}} {{> stream_privacy_icon invite_only=sub.invite_only - is_web_public=sub.is_web_public }} + is_web_public=sub.is_web_public + is_archived=sub.is_archived }} {{sub.name}} diff --git a/web/templates/stream_settings/stream_privacy_icon.hbs b/web/templates/stream_settings/stream_privacy_icon.hbs index d7baf062d9..9a27ab69c6 100644 --- a/web/templates/stream_settings/stream_privacy_icon.hbs +++ b/web/templates/stream_settings/stream_privacy_icon.hbs @@ -1,5 +1,9 @@ {{! This controls whether the swatch next to streams in the stream edit page has a lock icon. }} -{{#if invite_only}} +{{#if is_archived}} +
+{{else if invite_only}} diff --git a/web/templates/stream_settings/subscription_setting_icon.hbs b/web/templates/stream_settings/subscription_setting_icon.hbs index 8a3cb123cc..215fe5396a 100644 --- a/web/templates/stream_settings/subscription_setting_icon.hbs +++ b/web/templates/stream_settings/subscription_setting_icon.hbs @@ -1,6 +1,8 @@