From: Stas Vilchik <vilchiks@gmail.com>
Date: Fri, 27 Nov 2015 14:42:50 +0000 (+0100)
Subject: SONAR-7051 SONAR-7052 apply feedback
X-Git-Tag: 5.3-RC1~142
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ade8512f9a8a922c91d7285d3a1ee265bf90b258;p=sonarqube.git

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 f6328a560dc..f787997587c 100644
--- 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 f994ee4d588..5d5f2d00fd7 100644
--- 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 c9c34eb2556..fccd64a2876 100644
--- 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;