imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1408 from matrix-org/luke/groups-membership-section-redesign

Browse source 
Redesign membership section in GroupView
This commit is contained in:
Luke Barnard 2017-09-21 17:49:47 +01:00 • committed by GitHub
commit c19ee66565
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/components/structures/GroupView.js
View file

@ -568,13 +568,15 @@ export default React.createClass({
const Spinner = sdk.getComponent("elements.Spinner"); const Spinner = sdk.getComponent("elements.Spinner");
if (this.state.membershipBusy) { if (this.state.membershipBusy) {
return <div className="mx_GroupView_invitedSection"> return <div className="mx_GroupView_membershipSection">
<Spinner /> <Spinner />
</div>; </div>;
} }
return <div className="mx_GroupView_invitedSection"> return <div className="mx_GroupView_membershipSection mx_GroupView_membershipSection_invited">
{_t("%(inviter)s has invited you to join this group", {inviter: group.inviter.userId})} <div className="mx_GroupView_membershipSection_description">
{_t("%(inviter)s has invited you to join this group", {inviter: group.inviter.userId})}
</div>
<div className="mx_GroupView_membership_buttonContainer"> <div className="mx_GroupView_membership_buttonContainer">
<AccessibleButton className="mx_GroupView_textButton mx_RoomHeader_textButton" <AccessibleButton className="mx_GroupView_textButton mx_RoomHeader_textButton"
onClick={this._onAcceptInviteClick} onClick={this._onAcceptInviteClick}
@ -593,8 +595,10 @@ export default React.createClass({
if (this.state.summary.user && this.state.summary.user.is_privileged) { if (this.state.summary.user && this.state.summary.user.is_privileged) {
youAreAMemberText = _t("You are an administrator of this group"); youAreAMemberText = _t("You are an administrator of this group");
} }
return <div className="mx_GroupView_invitedSection"> return <div className="mx_GroupView_membershipSection mx_GroupView_membershipSection_joined">
{youAreAMemberText} <div className="mx_GroupView_membershipSection_description">
{youAreAMemberText}
</div>
<div className="mx_GroupView_membership_buttonContainer"> <div className="mx_GroupView_membership_buttonContainer">
<AccessibleButton className="mx_GroupView_textButton mx_RoomHeader_textButton" <AccessibleButton className="mx_GroupView_textButton mx_RoomHeader_textButton"
onClick={this._onLeaveClick} onClick={this._onLeaveClick}