Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add group size info #3411

Merged
merged 1 commit into from
May 22, 2018
Merged

feat: add group size info #3411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/page/template/modal/group-creation.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
data-uie-name="enter-group-name">
<div class="group-creation-error" data-bind="text: nameError, visible: nameError().length" data-uie-name="error-group-name"></div>
<!-- ko if: isTeam -->
<div class="group-size-info" data-bind="l10n_text: z.string.groupSizeInfo"></div>
<guest-mode-toggle params="isChecked: isGuestRoom, onToggle: clickOnToggleGuestMode, extendedInfo: true"></guest-mode-toggle>
<!-- /ko -->
<!-- /ko -->
Expand Down
3 changes: 3 additions & 0 deletions app/page/template/panel/conversation-details.htm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,9 @@
</span>
<!-- /ko -->
</div>
<!-- ko if: isTeam() -->
<div class="conversation-details__group-size-info" data-bind="l10n_text: z.string.groupSizeInfo"></div>
<!-- /ko -->
<!-- /ko -->
<!-- ko if: isSingleUserMode() && userName() -->
<div class="conversation-details__user-name" data-bind="text: userName()" data-uie-name="status-username"></div>
Expand Down
1 change: 1 addition & 0 deletions app/script/localization/webapp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,7 @@ z.string.groupCreationParticipantsActionSkip = 'Skip';
z.string.groupCreationParticipantsHeader = 'Add people';
z.string.groupCreationParticipantsHeaderWithCounter = 'Add people ({{number}})';
z.string.groupCreationParticipantsPlaceholder = 'Search by name';
z.string.groupSizeInfo = 'Up to 128 people can join a group conversation. Video calls work in groups of 4 or less.';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@AndyLnd Let's rely on z.conversation.ConversationRepository.GROUP.MAX_SIZE and the corresponding value for group video calls to create this string so we will never miss to update it.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#3414


// Guest room
z.string.guestRoomConversationName = 'Guest room';
Expand Down
7 changes: 7 additions & 0 deletions app/style/modal/group-creation.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,13 @@
margin: 8px;
}

.group-size-info {
margin: 16px 16px 0;
color: @graphite;
font-size: @font-size-xs;
line-height: @line-height-sm;
}

.group-creation-list-wrapper {
position: absolute;
right: -16px;
Expand Down
6 changes: 6 additions & 0 deletions app/style/panel/conversation-details.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,4 +177,10 @@
font-weight: @font-weight-bold;
text-transform: uppercase;
}
&__group-size-info {
margin: 8px 0 0;
color: @graphite;
font-size: @font-size-xs;
line-height: @line-height-sm;
}
}