SONAR-8993 Fix popup message

diff --git a/it/it-tests/src/test/java/pageobjects/organization/MembersPage.java b/it/it-tests/src/test/java/pageobjects/organization/MembersPage.java
index c219b3a2b59a9890e4c85a9de21c000e4a7862fb..56030c62133630ba9862cd8a5dcf85d46d50b82d 100644 (file)
--- a/it/it-tests/src/test/java/pageobjects/organization/MembersPage.java
+++ b/it/it-tests/src/test/java/pageobjects/organization/MembersPage.java
@@ -14,7 +14,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software Foundation§,
+ * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 

diff --git a/server/sonar-web/src/main/js/apps/organizations/components/forms/RemoveMemberForm.js b/server/sonar-web/src/main/js/apps/organizations/components/forms/RemoveMemberForm.js
index 29bccf54aca896bc42c68581f506abb88709f6ff..888e13f5ba587c5096b9fe6eb7519ec718ec9f97 100644 (file)
--- a/server/sonar-web/src/main/js/apps/organizations/components/forms/RemoveMemberForm.js
+++ b/server/sonar-web/src/main/js/apps/organizations/components/forms/RemoveMemberForm.js
@@ -69,13 +69,21 @@ export default class RemoveMemberForm extends React.PureComponent {
           <h2>{translate('users.remove')}</h2>
         </header>
         <form onSubmit={this.handleSubmit}>
-          <div className="modal-body">
-            {translateWithParameters(
-              'organization.members.remove_x',
-              this.props.member.name,
-              this.props.organization.name
-            )}
-            <ul className="list-styled">
+          <div className="modal-body markdown">
+            <p>
+              {translateWithParameters(
+                'organization.members.remove_x',
+                this.props.member.name,
+                this.props.organization.name
+              )}
+            </p>
+            <p>
+              {translateWithParameters(
+                'organization.members.remove_warning_x',
+                this.props.member.name
+              )}
+            </p>
+            <ul>
               <li>{translate('organization.members.browse_projects')}</li>
               <li>{translate('projects_role.codeviewer')}</li>
               <li>{translate('projects_role.issueadmin')}</li>

diff --git a/server/sonar-web/src/main/js/apps/organizations/components/forms/__tests__/__snapshots__/RemoveMemberForm-test.js.snap b/server/sonar-web/src/main/js/apps/organizations/components/forms/__tests__/__snapshots__/RemoveMemberForm-test.js.snap
index e27609e4b4db5874d845b40386938d62026bbfbf..cb3a26e8a76f42da57459302b685e1563a454b7a 100644 (file)
--- a/server/sonar-web/src/main/js/apps/organizations/components/forms/__tests__/__snapshots__/RemoveMemberForm-test.js.snap
+++ b/server/sonar-web/src/main/js/apps/organizations/components/forms/__tests__/__snapshots__/RemoveMemberForm-test.js.snap
@@ -44,10 +44,14 @@ exports[`test should render and open the modal 2`] = `
     <form
       onSubmit={[Function]}>
       <div
-        className="modal-body">
-        organization.members.remove_x.Admin Istrator.MyOrg
-        <ul
-          className="list-styled">
+        className="modal-body markdown">
+        <p>
+          organization.members.remove_x.Admin Istrator.MyOrg
+        </p>
+        <p>
+          organization.members.remove_warning_x.Admin Istrator
+        </p>
+        <ul>
           <li>
             organization.members.browse_projects
           </li>