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

stream_types: Suggest private, shared history before protected history. 

This feels like the more common use case for most users.
This commit is contained in:
Tim Abbott 2018-05-30 14:16:28 -07:00
parent ee45125f82
commit bab09a6579
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend_tests/node_tests/templates.js
View File

@ -1256,8 +1256,8 @@ run_test('handlebars_bug', () => {
var other_options = $(html).find("input[name=privacy]"); var other_options = $(html).find("input[name=privacy]");
assert.equal(other_options[0].value, 'public'); assert.equal(other_options[0].value, 'public');
assert.equal(other_options[1].value, 'invite-only'); assert.equal(other_options[1].value, 'invite-only-public-history');
assert.equal(other_options[2].value, 'invite-only-public-history'); assert.equal(other_options[2].value, 'invite-only');
var button = $(html).find("#change-stream-privacy-button"); var button = $(html).find("#change-stream-privacy-button");
assert(button.hasClass("btn-danger")); assert(button.hasClass("btn-danger"));

16
static/templates/stream_types.handlebars
View File

@ -7,14 +7,6 @@
{{/tr}} {{/tr}}
</label> </label>
</li> </li>
<li>
<label class="radio">
<input type="radio" name="privacy" value="invite-only" {{#if is_private}}checked{{/if}} />
{{#tr this}}
<b>Private, protected history:</b> must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users
{{/tr}}
</label>
</li>
<li> <li>
<label class="radio"> <label class="radio">
<input type="radio" name="privacy" value="invite-only-public-history" {{#if is_private_with_public_history}}checked{{/if}} /> <input type="radio" name="privacy" value="invite-only-public-history" {{#if is_private_with_public_history}}checked{{/if}} />
@ -23,4 +15,12 @@
{{/tr}} {{/tr}}
</label> </label>
</li> </li>
<li>
<label class="radio">
<input type="radio" name="privacy" value="invite-only" {{#if is_private}}checked{{/if}} />
{{#tr this}}
<b>Private, protected history:</b> must be invited by a member; new members can only see messages sent after they join; hidden from non-administrator users
{{/tr}}
</label>
</li>
</ul> </ul>