SONAR-7051 SONAR-7052 apply feedback

diff --git a/it/it-tests/src/test/resources/administration/UsersUITest/generate_and_revoke_user_token.html b/it/it-tests/src/test/resources/administration/UsersUITest/generate_and_revoke_user_token.html
index f6328a560dcb6a36fb92a45f867dcbd0b3500f25..f787997587c638923bbb403605b407c06358f980 100644 (file)
--- a/it/it-tests/src/test/resources/administration/UsersUITest/generate_and_revoke_user_token.html
+++ b/it/it-tests/src/test/resources/administration/UsersUITest/generate_and_revoke_user_token.html
@@ -54,6 +54,11 @@
        <td>css=.js-user-tokens</td>
        <td></td>
 </tr>
+<tr>
+       <td>waitForText</td>
+       <td>css=.modal</td>
+       <td>*No tokens*</td>
+</tr>
 <tr>
        <td>waitForElementPresent</td>
        <td>css=.js-generate-token-form input</td>
@@ -74,6 +79,11 @@
        <td>css=.modal code</td>
        <td></td>
 </tr>
+<tr>
+       <td>waitForText</td>
+       <td>css=.modal</td>
+       <td>*test-token*</td>
+</tr>
 <tr>
        <td>waitForElementPresent</td>
        <td>css=.js-revoke-token-form</td>

diff --git a/server/sonar-web/src/main/js/apps/users/templates/users-tokens.hbs b/server/sonar-web/src/main/js/apps/users/templates/users-tokens.hbs
index f994ee4d5883f4416729464316ec52d1e1620c29..5d5f2d00fd72f39327776128466bbbdd029055e2 100644 (file)
--- a/server/sonar-web/src/main/js/apps/users/templates/users-tokens.hbs
+++ b/server/sonar-web/src/main/js/apps/users/templates/users-tokens.hbs
@@ -27,9 +27,9 @@
             <div class="big-spacer-left">
               <form class="js-revoke-token-form" data-token="{{name}}">
                 {{#if deleting}}
-                  <button class="button-red">Sure?</button>
+                  <button class="button-red input-small">Sure?</button>
                 {{else}}
-                  <button class="button-red">Revoke</button>
+                  <button class="button-red input-small">Revoke</button>
                 {{/if}}
               </form>
             </div>
@@ -48,7 +48,7 @@
 
   <hr class="big-spacer-top big-spacer-bottom">
 
-  <p class="spacer-bottom">Generate tokens for bla bla bla</p>
+  <h3 class="spacer-bottom">Generate Tokens</h3>
 
   {{#each errors}}
     <div class="alert alert-danger">{{msg}}</div>

diff --git a/server/sonar-web/src/main/js/apps/users/tokens-view.js b/server/sonar-web/src/main/js/apps/users/tokens-view.js
index c9c34eb25567ba72fc03e374e85a402b1622945b..fccd64a2876d6881cf1ed41664dbe6b9e34b0d32 100644 (file)
--- a/server/sonar-web/src/main/js/apps/users/tokens-view.js
+++ b/server/sonar-web/src/main/js/apps/users/tokens-view.js
@@ -36,7 +36,7 @@ export default Modal.extend({
     e.preventDefault();
     this.errors = [];
     this.newToken = null;
-    let tokenName = this.$('#generate-token-form input').val();
+    let tokenName = this.$('.js-generate-token-form input').val();
     generateToken(this.model.id, tokenName)
         .then(response => {
           this.newToken = response.token;