Skip to content

Commit

Permalink
Fix #1453. Improved style in user manager
Browse files Browse the repository at this point in the history
Now support long group names and long groups lists.
  • Loading branch information
offtherailz committed Feb 15, 2017
1 parent 053933c commit bb3c0f5
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 2 deletions.
16 changes: 14 additions & 2 deletions web/client/components/manager/users/UserCard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ const UserCard = React.createClass({
backgroundPosition: "center",
backgroundRepeat: "repeat-x"
},
innerItemStyle: {"float": "left", margin: "10px"}
innerItemStyle: {"float": "left",
margin: "10px"
}
};
},
renderStatus() {
Expand All @@ -47,7 +49,17 @@ const UserCard = React.createClass({
},
renderGroups() {
return (<div key="groups" style={this.props.innerItemStyle}><div><strong><Message msgId="users.groupTitle"/></strong></div>
{this.props.user && this.props.user.groups ? this.props.user.groups.map((group)=> (<div key={"group-" + group.id}>{group.groupName}</div>)) : null}
<div style={{
width: "260px",
maxHeight: "100px",
overflowY: "auto",
overflowX: "visible"
}}>{this.props.user && this.props.user.groups ? this.props.user.groups.map((group) => (<div style={{
maxWidth: "240px",
overflowX: "hidden",
textOverflow: "ellipsis"
}}key={"group-" + group.id}>{group.groupName}</div>)) : null}</div>

</div>);
},
renderRole() {
Expand Down
9 changes: 9 additions & 0 deletions web/client/components/manager/users/style/userdialog.css
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,12 @@
text-overflow: ellipsis;
overflow: hidden;
}
.user-edit-dialog .Select--multi .Select-value-label{
max-width: 180px;
overflow: hidden;
text-overflow: ellipsis;
}
.user-edit-dialog .Select-multi-value-wrapper {
max-height: 300px;
overflow: auto;
}

0 comments on commit bb3c0f5

Please sign in to comment.