From b60a80b2cb47eccc22b8e280a21f72ff4c14f6af Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Fri, 25 Jan 2019 15:57:45 +0100
Subject: [PATCH 1/4] implemented fix

---
 scm-ui/src/users/components/UserForm.js | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js
index 2d3a519f15..d33354ab76 100644
--- a/scm-ui/src/users/components/UserForm.js
+++ b/scm-ui/src/users/components/UserForm.js
@@ -105,17 +105,9 @@ class UserForm extends React.Component<Props, State> {
     }
     return (
       <form onSubmit={this.submit}>
-        <div className="columns">
+        <div className="columns is-multiline">
           <div className="column is-half">
             {nameField}
-            <InputField
-              label={t("user.displayName")}
-              onChange={this.handleDisplayNameChange}
-              value={user ? user.displayName : ""}
-              validationError={this.state.displayNameValidationError}
-              errorMessage={t("validation.displayname-invalid")}
-              helpText={t("help.displayNameHelpText")}
-            />
           </div>
           <div className="column is-half">
             <InputField
@@ -127,6 +119,16 @@ class UserForm extends React.Component<Props, State> {
               helpText={t("help.mailHelpText")}
             />
           </div>
+          <div className="column is-half">
+            <InputField
+              label={t("user.displayName")}
+              onChange={this.handleDisplayNameChange}
+              value={user ? user.displayName : ""}
+              validationError={this.state.displayNameValidationError}
+              errorMessage={t("validation.displayname-invalid")}
+              helpText={t("help.displayNameHelpText")}
+            />
+          </div>
         </div>
         <div className="columns">
           <div className="column">

From 4453f07c3b1dcf8704e93ada8412d60bf1428f17 Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Fri, 25 Jan 2019 15:58:36 +0100
Subject: [PATCH 2/4] small correction

---
 scm-ui/src/users/components/UserForm.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js
index d33354ab76..abf6c9d087 100644
--- a/scm-ui/src/users/components/UserForm.js
+++ b/scm-ui/src/users/components/UserForm.js
@@ -89,14 +89,16 @@ class UserForm extends React.Component<Props, State> {
     let passwordChangeField = null;
     if (!this.props.user) {
       nameField = (
-        <InputField
-          label={t("user.name")}
-          onChange={this.handleUsernameChange}
-          value={user ? user.name : ""}
-          validationError={this.state.nameValidationError}
-          errorMessage={t("validation.name-invalid")}
-          helpText={t("help.usernameHelpText")}
-        />
+        <div className="column is-half">
+          <InputField
+            label={t("user.name")}
+            onChange={this.handleUsernameChange}
+            value={user ? user.name : ""}
+            validationError={this.state.nameValidationError}
+            errorMessage={t("validation.name-invalid")}
+            helpText={t("help.usernameHelpText")}
+          />
+        </div>
       );
 
       passwordChangeField = (
@@ -106,9 +108,7 @@ class UserForm extends React.Component<Props, State> {
     return (
       <form onSubmit={this.submit}>
         <div className="columns is-multiline">
-          <div className="column is-half">
-            {nameField}
-          </div>
+          {nameField}
           <div className="column is-half">
             <InputField
               label={t("user.mail")}

From 5ccd79595fbe59b18d56e3a1e657f987d169c541 Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Fri, 25 Jan 2019 16:04:04 +0100
Subject: [PATCH 3/4] swapped displayname and mail

---
 scm-ui/src/users/components/UserForm.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/scm-ui/src/users/components/UserForm.js b/scm-ui/src/users/components/UserForm.js
index abf6c9d087..ba1e2f6753 100644
--- a/scm-ui/src/users/components/UserForm.js
+++ b/scm-ui/src/users/components/UserForm.js
@@ -109,16 +109,6 @@ class UserForm extends React.Component<Props, State> {
       <form onSubmit={this.submit}>
         <div className="columns is-multiline">
           {nameField}
-          <div className="column is-half">
-            <InputField
-              label={t("user.mail")}
-              onChange={this.handleEmailChange}
-              value={user ? user.mail : ""}
-              validationError={this.state.mailValidationError}
-              errorMessage={t("validation.mail-invalid")}
-              helpText={t("help.mailHelpText")}
-            />
-          </div>
           <div className="column is-half">
             <InputField
               label={t("user.displayName")}
@@ -129,6 +119,16 @@ class UserForm extends React.Component<Props, State> {
               helpText={t("help.displayNameHelpText")}
             />
           </div>
+          <div className="column is-half">
+            <InputField
+              label={t("user.mail")}
+              onChange={this.handleEmailChange}
+              value={user ? user.mail : ""}
+              validationError={this.state.mailValidationError}
+              errorMessage={t("validation.mail-invalid")}
+              helpText={t("help.mailHelpText")}
+            />
+          </div>
         </div>
         <div className="columns">
           <div className="column">

From fc76897d1847fb80138e0b2854d07825a236bd12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maren=20S=C3=BCwer?= <maren.suewer@cloudogu.com>
Date: Mon, 28 Jan 2019 13:11:30 +0000
Subject: [PATCH 4/4] Close branch feature/jump_order