diff --git a/src/components/profile/changePassword/ChangePassword.jsx b/src/components/profile/changePassword/ChangePassword.jsx
index 27c9faa..d4f64cd 100644
--- a/src/components/profile/changePassword/ChangePassword.jsx
+++ b/src/components/profile/changePassword/ChangePassword.jsx
@@ -4,7 +4,7 @@ import { FormattedMessage as Message } from 'react-intl';
import { Link } from 'react-router';
import Helmet from 'react-helmet';
-import { LabeledInput, Button } from 'components/ui/Form';
+import { LabeledInput, Button, Checkbox } from 'components/ui/Form';
import FormModel from 'models/Form';
import { Form } from 'components/ui/Form';
@@ -72,6 +72,14 @@ export default class ChangePassword extends Component {
label={messages.repeatNewPasswordLabel}
/>
+
+
+
+
diff --git a/src/components/profile/changePassword/ChangePassword.messages.js b/src/components/profile/changePassword/ChangePassword.messages.js
index 19873c8..d120066 100644
--- a/src/components/profile/changePassword/ChangePassword.messages.js
+++ b/src/components/profile/changePassword/ChangePassword.messages.js
@@ -35,5 +35,9 @@ export default defineMessages({
id: 'repeatNewPasswordLabel',
defaultMessage: 'Repeat the password:'
// defaultMessage: 'Повторите указанный пароль:'
+ },
+ logoutOnAllDevices: {
+ id: 'logoutOnAllDevices',
+ defaultMessage: 'Logout on all devices'
}
});
diff --git a/src/components/ui/Form.jsx b/src/components/ui/Form.jsx
index 02f9f55..767dc55 100644
--- a/src/components/ui/Form.jsx
+++ b/src/components/ui/Form.jsx
@@ -131,14 +131,29 @@ export class Checkbox extends Component {
static displayName = 'Checkbox';
static propTypes = {
- color: PropTypes.oneOf(['green', 'blue', 'red'])
+ color: PropTypes.oneOf(['green', 'blue', 'red']),
+ skin: PropTypes.oneOf(['dark', 'light']),
+ label: PropTypes.oneOfType([
+ PropTypes.shape({
+ id: PropTypes.string
+ }),
+ PropTypes.string
+ ]).isRequired
+ };
+
+ static contextTypes = {
+ intl: intlShape.isRequired
};
render() {
- const { label, color = 'green' } = this.props;
+ let { label, color = 'green', skin = 'dark' } = this.props;
+
+ if (label && label.id) {
+ label = this.context.intl.formatMessage(label);
+ }
return (
-