SONAR-8666 apply feedback

diff --git a/server/sonar-web/src/main/js/apps/account/organizations/CreateOrganizationForm.js b/server/sonar-web/src/main/js/apps/account/organizations/CreateOrganizationForm.js
index 4196449ad0fd9fe86df0e232ed1d3e2e20f781a9..0d996e2915ed3d5fd55761004575d4f9a1700b5c 100644 (file)
--- a/server/sonar-web/src/main/js/apps/account/organizations/CreateOrganizationForm.js
+++ b/server/sonar-web/src/main/js/apps/account/organizations/CreateOrganizationForm.js
@@ -126,28 +126,13 @@ class CreateOrganizationForm extends React.Component {
 
           <form onSubmit={this.handleSubmit}>
             <div className="modal-body">
-              <div className="modal-field">
-                <label htmlFor="organization-key">
-                  {translate('organization.key')}
-                </label>
-                <input id="organization-key"
-                       autoFocus={true}
-                       name="key"
-                       type="text"
-                       maxLength="64"
-                       value={this.state.key}
-                       disabled={this.state.loading}
-                       onChange={e => this.setState({ key: e.target.value })}/>
-                <div className="modal-field-description">
-                  {translate('organization.key.description')}
-                </div>
-              </div>
               <div className="modal-field">
                 <label htmlFor="organization-name">
                   {translate('organization.name')}
                   <em className="mandatory">*</em>
                 </label>
                 <input id="organization-name"
+                       autoFocus={true}
                        name="name"
                        required={true}
                        type="text"
@@ -159,6 +144,21 @@ class CreateOrganizationForm extends React.Component {
                   {translate('organization.name.description')}
                 </div>
               </div>
+              <div className="modal-field">
+                <label htmlFor="organization-key">
+                  {translate('organization.key')}
+                </label>
+                <input id="organization-key"
+                       name="key"
+                       type="text"
+                       maxLength="64"
+                       value={this.state.key}
+                       disabled={this.state.loading}
+                       onChange={e => this.setState({ key: e.target.value })}/>
+                <div className="modal-field-description">
+                  {translate('organization.key.description')}
+                </div>
+              </div>
               <div className="modal-field">
                 <label htmlFor="organization-avatar">
                   {translate('organization.avatar')}

diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
index a963f404ac86c7aab29a77b64170252b0dea4d15..5e755d935b23e53d90c75fd1e0b87ed5ddd405bf 100644 (file)
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2772,7 +2772,7 @@ organization.description=Description
 organization.description.description=Description of the organization (256 characters max).
 organization.edit=Edit Organization
 organization.key=Key
-organization.key.description=Key of the organization (2 to 32 characters). The key is unique to the whole SonarQube. When not specified, the key is computed from the name.
+organization.key.description=Key of the organization (2 to 32 characters). All chars must be lower-case letters (a to z), digits or dash (but dash can neither be trailing nor heading). The key is unique to the whole SonarQube. When not specified, the key is computed from the name.
 organization.name=Name
 organization.name.description=Name of the organization (2 to 64 characters).
 organization.updated=Organization details have been updated.