diff --git a/web/client/components/manager/users/UserCard.jsx b/web/client/components/manager/users/UserCard.jsx index 1acc77bd1a..51cb62fbb3 100644 --- a/web/client/components/manager/users/UserCard.jsx +++ b/web/client/components/manager/users/UserCard.jsx @@ -48,27 +48,18 @@ const UserCard = React.createClass({ ); }, renderGroups() { - return (
-
{this.props.user && this.props.user.groups ? this.props.user.groups.map((group) => (
{group.groupName}
)) : null}
+ return (
+
{this.props.user && this.props.user.groups ? this.props.user.groups.map((group) => (
{group.groupName}
)) : null}
); }, renderRole() { - return (
+ return (
{this.props.user.role}
); }, renderAvatar() { - return (
); }, @@ -77,9 +68,11 @@ const UserCard = React.createClass({ - {this.renderAvatar()} - {this.renderRole()} - {this.renderGroups()} +
+ {this.renderAvatar()} + {this.renderRole()} + {this.renderGroups()} +
{this.renderStatus()}
); diff --git a/web/client/components/manager/users/style/usercard.css b/web/client/components/manager/users/style/usercard.css index 0fa06a8a7f..82013ee6d0 100644 --- a/web/client/components/manager/users/style/usercard.css +++ b/web/client/components/manager/users/style/usercard.css @@ -12,7 +12,31 @@ .user-thumb .gridcard-tools,.group-thumb .gridcard-tools { right: 0 } +.user-data-container { + display: flex; + width: 100%; +} +.user-thumb .role-containter{ + width: 50px; +} +.user-thumb .avatar-containter{ + width: 50px; +} +.user-thumb .groups-container { + white-space: nowrap; + overflow: hidden; +} +.user-thumb .groups-container .groups-list{ + width: 100%; + max-height: 100px; + overflow-y: auto; + overflow-x: hidden; +} +.user-thumb .groups-container .groups-list .group-item { + overflow-x: hidden; + text-overflow: ellipsis; +} .group-thumb .group-thumb-description { /* ellipsis for description */ margin: 10px;