From 585f3438a50dc49a31f05948451d1dd333268cbe Mon Sep 17 00:00:00 2001
From: Stas Vilchik <stas.vilchik@sonarsource.com>
Date: Tue, 4 Dec 2018 11:37:10 +0100
Subject: [PATCH] SONAR-11534 fix glitch on the permission templates page

---
 .../components/PermissionCell.js                     | 12 +++++++++++-
 .../permissions/shared/components/UserHolder.tsx     |  7 ++++++-
 .../main/resources/org/sonar/l10n/core.properties    |  5 +++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.js b/server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.js
index ec89cc25d5e..aa447f2aaf7 100644
--- a/server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.js
+++ b/server/sonar-web/src/main/js/apps/permission-templates/components/PermissionCell.js
@@ -19,7 +19,9 @@
  */
 import React from 'react';
 import { PermissionType } from '../propTypes';
+import HelpTooltip from '../../../components/controls/HelpTooltip';
 import { translate } from '../../../helpers/l10n';
+import { isSonarCloud } from '../../../helpers/system';
 
 export default class PermissionCell extends React.PureComponent {
   static propTypes = {
@@ -34,8 +36,16 @@ export default class PermissionCell extends React.PureComponent {
         <div className="permission-column-inner">
           <ul>
             {p.withProjectCreator && (
-              <li className="little-spacer-bottom">
+              <li className="little-spacer-bottom display-flex-center">
                 {translate('permission_templates.project_creators')}
+                <HelpTooltip
+                  className="little-spacer-left"
+                  overlay={translate(
+                    isSonarCloud()
+                      ? 'permission_templates.project_creators.explanation.sonarcloud'
+                      : 'permission_templates.project_creators.explanation'
+                  )}
+                />
               </li>
             )}
             <li className="little-spacer-bottom">
diff --git a/server/sonar-web/src/main/js/apps/permissions/shared/components/UserHolder.tsx b/server/sonar-web/src/main/js/apps/permissions/shared/components/UserHolder.tsx
index 0a7ed8dde02..1f0397e54e4 100644
--- a/server/sonar-web/src/main/js/apps/permissions/shared/components/UserHolder.tsx
+++ b/server/sonar-web/src/main/js/apps/permissions/shared/components/UserHolder.tsx
@@ -23,6 +23,7 @@ import PermissionCell from './PermissionCell';
 import Avatar from '../../../../components/ui/Avatar';
 import { translate } from '../../../../helpers/l10n';
 import { isPermissionDefinitionGroup } from '../../utils';
+import { isSonarCloud } from '../../../../helpers/system';
 
 interface Props {
   onToggle: (user: T.PermissionUser, permission: string) => Promise<void>;
@@ -84,7 +85,11 @@ export default class UserHolder extends React.PureComponent<Props, State> {
                 <strong>{user.name}</strong>
               </div>
               <div className="little-spacer-top" style={{ whiteSpace: 'normal' }}>
-                {translate('permission_templates.project_creators.explanation')}
+                {translate(
+                  isSonarCloud()
+                    ? 'permission_templates.project_creators.explanation.sonarcloud'
+                    : 'permission_templates.project_creators.explanation'
+                )}
               </div>
             </div>
           </td>
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 ba3aaa79164..29353f113c4 100644
--- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties
+++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties
@@ -2144,8 +2144,9 @@ permission_template.edit_permissions=Edit Permissions: {0}
 permission_template.key_pattern=Project key pattern
 permission_template.key_pattern.description=Should be a valid regular expression
 permission_template.default_for=Default for {0}
-permission_templates.project_creators=Project/Portfolio/Application Creators
-permission_templates.project_creators.explanation=When a new project / portfolio / application is created, the user who creates it will receive these permissions on the it.
+permission_templates.project_creators=Creators
+permission_templates.project_creators.explanation=When a new project, portfolio or application is created, the user who creates it will receive these permissions.
+permission_templates.project_creators.explanation.sonarcloud=When a new project is created, the user who creates it will receive these permissions.
 permission_templates.bulk_apply_permission_template=Bulk Apply Permission Template
 permission_templates.bulk_apply_permission_template.apply_to_selected=You're about to apply the selected permission template to {0} selected item(s).
 permission_templates.bulk_apply_permission_template.apply_to_all=You're about to apply the selected permission template to {0} item(s).
-- 
2.39.5