Merged in feature/jump_order (pull request #163)

Feature/jump order
This commit is contained in:
Maren Süwer
2019-01-28 13:11:30 +00:00

View File

@@ -89,14 +89,16 @@ class UserForm extends React.Component<Props, State> {
let passwordChangeField = null; let passwordChangeField = null;
if (!this.props.user) { if (!this.props.user) {
nameField = ( nameField = (
<InputField <div className="column is-half">
label={t("user.name")} <InputField
onChange={this.handleUsernameChange} label={t("user.name")}
value={user ? user.name : ""} onChange={this.handleUsernameChange}
validationError={this.state.nameValidationError} value={user ? user.name : ""}
errorMessage={t("validation.name-invalid")} validationError={this.state.nameValidationError}
helpText={t("help.usernameHelpText")} errorMessage={t("validation.name-invalid")}
/> helpText={t("help.usernameHelpText")}
/>
</div>
); );
passwordChangeField = ( passwordChangeField = (
@@ -105,9 +107,9 @@ class UserForm extends React.Component<Props, State> {
} }
return ( return (
<form onSubmit={this.submit}> <form onSubmit={this.submit}>
<div className="columns"> <div className="columns is-multiline">
{nameField}
<div className="column is-half"> <div className="column is-half">
{nameField}
<InputField <InputField
label={t("user.displayName")} label={t("user.displayName")}
onChange={this.handleDisplayNameChange} onChange={this.handleDisplayNameChange}