OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

mark destructive actions in red

pull/21833/head
Bruno Windels 2019-11-13 18:00:35 +01:00
parent 0bd1e7112d
commit 030827f77d
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/css/views/right_panel/_UserInfo.scss
View File

@ -136,6 +136,9 @@ limitations under the License.
line-height: 16px; line-height: 16px;
margin: 8px 0; margin: 8px 0;
&.mx_UserInfo_destructive {
color: $warning-color;
}
} }
.mx_UserInfo_statusMessage { .mx_UserInfo_statusMessage {

24
src/components/views/right_panel/UserInfo.js
View File

@ -224,7 +224,7 @@ const UserOptionsSection = withLegacyMatrixClient(({matrixClient: cli, member, i
}; };
ignoreButton = ( ignoreButton = (
<AccessibleButton onClick={onIgnoreToggle} className="mx_UserInfo_field"> <AccessibleButton onClick={onIgnoreToggle} className={classNames("mx_UserInfo_field", {mx_UserInfo_destructive: !isIgnored})}>
{ isIgnored ? _t("Unignore") : _t("Ignore") } { isIgnored ? _t("Unignore") : _t("Ignore") }
</AccessibleButton> </AccessibleButton>
); );
@ -306,7 +306,7 @@ const UserOptionsSection = withLegacyMatrixClient(({matrixClient: cli, member, i
let unverifyButton; let unverifyButton;
if (devices && devices.some(device => device.isVerified())) { if (devices && devices.some(device => device.isVerified())) {
unverifyButton = ( unverifyButton = (
<AccessibleButton onClick={() => unverifyUser(cli, member.userId)} className="mx_UserInfo_field"> <AccessibleButton onClick={() => unverifyUser(cli, member.userId)} className="mx_UserInfo_field mx_UserInfo_destructive">
{ _t('Unverify user') } { _t('Unverify user') }
</AccessibleButton> </AccessibleButton>
); );
@ -428,7 +428,7 @@ const RoomKickButton = withLegacyMatrixClient(({matrixClient: cli, member, start
}; };
const kickLabel = member.membership === "invite" ? _t("Disinvite") : _t("Kick"); const kickLabel = member.membership === "invite" ? _t("Disinvite") : _t("Kick");
return <AccessibleButton className="mx_UserInfo_field" onClick={onKick}> return <AccessibleButton className="mx_UserInfo_field mx_UserInfo_destructive" onClick={onKick}>
{ kickLabel } { kickLabel }
</AccessibleButton>; </AccessibleButton>;
}); });
@ -501,7 +501,7 @@ const RedactMessagesButton = withLegacyMatrixClient(({matrixClient: cli, member}
} }
}; };
return <AccessibleButton className="mx_UserInfo_field" onClick={onRedactAllMessages}> return <AccessibleButton className="mx_UserInfo_field mx_UserInfo_destructive" onClick={onRedactAllMessages}>
{ _t("Remove recent messages") } { _t("Remove recent messages") }
</AccessibleButton>; </AccessibleButton>;
}); });
@ -553,7 +553,11 @@ const BanToggleButton = withLegacyMatrixClient(({matrixClient: cli, member, star
label = _t("Unban"); label = _t("Unban");
} }
return <AccessibleButton className="mx_UserInfo_field" onClick={onBanOrUnban}> const classes = classNames("mx_UserInfo_field", {
mx_UserInfo_destructive: member.membership !== 'ban',
});
return <AccessibleButton className={classes} onClick={onBanOrUnban}>
{ label } { label }
</AccessibleButton>; </AccessibleButton>;
}); });
@ -610,8 +614,12 @@ const MuteToggleButton = withLegacyMatrixClient(
} }
}; };
const classes = classNames("mx_UserInfo_field", {
mx_UserInfo_destructive: !isMuted,
});
const muteLabel = isMuted ? _t("Unmute") : _t("Mute"); const muteLabel = isMuted ? _t("Unmute") : _t("Mute");
return <AccessibleButton className="mx_UserInfo_field" onClick={onMuteToggle}> return <AccessibleButton className={classes} onClick={onMuteToggle}>
{ muteLabel } { muteLabel }
</AccessibleButton>; </AccessibleButton>;
}, },
@ -734,7 +742,7 @@ const GroupAdminToolsSection = withLegacyMatrixClient(
}; };
const kickButton = ( const kickButton = (
<AccessibleButton className="mx_UserInfo_field" onClick={_onKick}> <AccessibleButton className="mx_UserInfo_field mx_UserInfo_destructive" onClick={_onKick}>
{ isInvited ? _t('Disinvite') : _t('Remove from community') } { isInvited ? _t('Disinvite') : _t('Remove from community') }
</AccessibleButton> </AccessibleButton>
); );
@ -975,7 +983,7 @@ const UserInfo = withLegacyMatrixClient(({matrixClient: cli, user, groupId, room
// FIXME this should be using cli instead of MatrixClientPeg.matrixClient // FIXME this should be using cli instead of MatrixClientPeg.matrixClient
if (isSynapseAdmin && user.userId.endsWith(`:${MatrixClientPeg.getHomeserverName()}`)) { if (isSynapseAdmin && user.userId.endsWith(`:${MatrixClientPeg.getHomeserverName()}`)) {
synapseDeactivateButton = ( synapseDeactivateButton = (
<AccessibleButton onClick={onSynapseDeactivate} className="mx_UserInfo_field"> <AccessibleButton onClick={onSynapseDeactivate} className="mx_UserInfo_field mx_UserInfo_destructive">
{_t("Deactivate user")} {_t("Deactivate user")}
</AccessibleButton> </AccessibleButton>
); );