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

compose: Show globe icon for web public streams.

Browse Source 
Fixes #20285.
This commit is contained in:
Aman Agrawal
2021-11-20 03:20:21 +00:00
committed by Tim Abbott
parent a7b2c7f7ea
commit d9338a68d1
5 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
frontend_tests/node_tests/stream_data.js
View File

@@ -119,6 +119,9 @@ test("basics", () => {
"invite-only-public-history",
);
assert.equal(stream_data.get_stream_privacy_policy(web_public_stream.stream_id), "web-public");
assert.ok(stream_data.is_web_public_by_stream_name(web_public_stream.name));
assert.ok(!stream_data.is_web_public_by_stream_name(social.name));
assert.ok(!stream_data.is_web_public_by_stream_name("unknown"));
assert.ok(stream_data.get_invite_only("social"));
assert.ok(!stream_data.get_invite_only("unknown"));

19
static/js/stream_bar.js
View File

@@ -4,14 +4,21 @@ import * as color_class from "./color_class";
import * as stream_data from "./stream_data";
function update_compose_stream_icon(stream_name) {
const icon = $("#compose-lock-icon");
const streamfield = $("#stream_message_recipient_stream");
if (stream_data.get_invite_only(stream_name)) {
icon.show();
streamfield.addClass("lock-padding");
} else {
icon.hide();
const globe_icon = $("#compose-globe-icon");
const lock_icon = $("#compose-lock-icon");
// Reset state
globe_icon.hide();
lock_icon.hide();
streamfield.removeClass("lock-padding");
if (stream_data.get_invite_only(stream_name)) {
lock_icon.show();
streamfield.addClass("lock-padding");
} else if (stream_data.is_web_public_by_stream_name(stream_name)) {
globe_icon.show();
streamfield.addClass("lock-padding");
}
}

8
static/js/stream_data.js
View File

@@ -581,6 +581,14 @@ export function get_invite_only(stream_name) {
return sub.invite_only;
}
export function is_web_public_by_stream_name(stream_name) {
const sub = get_sub(stream_name);
if (sub === undefined) {
return false;
}
return sub.is_web_public;
}
export function set_realm_default_streams(realm_default_streams) {
default_stream_ids.clear();

9
static/styles/compose.css
View File

@@ -128,12 +128,19 @@
font-weight: 600;
}
#compose-lock-icon {
#compose-lock-icon,
#compose-globe-icon {
position: relative;
left: 5px;
width: 0;
}
#compose-globe-icon {
top: 1px;
left: 4.5px;
padding-right: 2px;
}
.message_header {
background: none;
background-color: hsl(0, 0%, 92%);

3
static/templates/compose.hbs
View File

@@ -64,6 +64,9 @@
<span id="compose-lock-icon">
<i class="fa fa-lock" title="{{t 'This is a private stream' }}" aria-hidden="true"></i>
</span>
<span id="compose-globe-icon">
<i class="fa fa-globe" title="{{t 'This is a web public stream' }}" aria-hidden="true"></i>
</span>
<input type="text" class="recipient_box" name="stream_message_recipient_stream" id="stream_message_recipient_stream" maxlength="30" value="" placeholder="{{t 'Stream' }}" autocomplete="off" tabindex="0" aria-label="{{t 'Stream' }}" />
<i class="fa fa-angle-right" aria-hidden="true"></i>
<input type="text" class="recipient_box" name="stream_message_recipient_topic" id="stream_message_recipient_topic" maxlength="60" value="" placeholder="{{t 'Topic' }}" autocomplete="off" tabindex="0" aria-label="{{t 'Topic' }}" />