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

default stream groups: Fix broken registration UI. 

The default stream groups feature (#6693) was never fully implemented;
this fixes a key detail (the registration UI being broken).
This commit is contained in:
Tim Abbott 2020-01-14 14:42:05 -08:00
parent 4562949f43
commit 8226573af6
2 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
static/styles/portico/portico-signin.scss
View File

@ -249,7 +249,9 @@ html {
margin: 0 auto 10px;
}
.register-account .terms-of-service .input-group {
.register-account .terms-of-service .input-group,
.register-account .default-stream-groups .input-group,
.register-account .default-stream-groups p {
width: 330px;
margin: 0 auto 10px;
}

29
templates/zerver/register.html
View File

@ -173,16 +173,33 @@ Form is validated both client-side using jquery-validate (see signup.js) and ser
</section>
{% if default_stream_groups %}
<div class="input-group m-10 inline-block">
<label for="default_stream_group">{{ _('What parts of the organization are you interested in?') }}</label>
<hr />
<div class="default-stream-groups">
<p class="margin">{{ _('What are you interested in?') }}</p>
{% for default_stream_group in default_stream_groups %}
<div class="input-group radio">
<input class="inline-block" type="checkbox" name="default_stream_group" value="{{ default_stream_group.name }}"
{% if "default_stream_group" in form.data and default_stream_group.name in form.data.getlist('default_stream_group') %} checked {% endif %} />
<label for="id_radio_{{ default_stream_group.name }}" class="inline-block">{{ default_stream_group.name }}</label>
<div class="input-group margin">
<label for="id_default_stream_group__{{ default_stream_group.id }}"
class="inline-block checkbox">
<input class="inline-block" type="checkbox"
name="default_stream_group"
id="id_default_stream_group__{{ default_stream_group.id }}" value="{{ default_stream_group.name }}"
{% if "default_stream_group" in form.data and default_stream_group.id in form.data.getlist('default_stream_group') %} checked {% endif %} />
<span></span>
{% set comma = joiner(", ") %}
<div class="default_stream_group_name inline-block"
title="{{ default_stream_group.description }}">
{{ default_stream_group.name }}
</div>
(
{%- for stream in default_stream_group.streams.all() -%}
{{- comma() -}} <div class="stream_name inline-block">#{{ stream.name }}</div>
{% endfor %}
)
</label>
</div>
{% endfor %}
</div>
<hr />
{% endif %}
<div class="input-group margin terms-of-service">