Merge pull request #243 from bwsw/231-api-keys-tooltip

(closes #231) Add tooltip to API key reset button, put API key and Secret key right after the section title

Author: andrewbents

src/app/settings/api-info/api-info.component.html

@@ -1,27 +1,18 @@
 <section>
   <div class="header-wrap">
     <h4>{{ 'API' | translate }}</h4>
-    <mdl-button mdl-button-type="icon" (click)="askToRegenerateKeys()">
+    <mdl-button
+      mdl-button-type="icon"
+      mdl-tooltip-position="top"
+      [mdl-tooltip]="'REGENERATE_KEYS' | translate"
+      (click)="askToRegenerateKeys()"
+    >
       <mdl-icon>sync</mdl-icon>
     </mdl-button>
   </div>
   <div class="section-container">
     <div class="settings-control">
       <div *loading="loading">
-        <div>
-          <h5 [translate]="linkFields.apiUrl.title"></h5>
-          <a class="mdl-color-text--primary-dark" target="_blank" [href]="linkFields.apiUrl.href">
-            {{ linkFields.apiUrl.href }}
-          </a>
-        </div>
-
-        <div *ngIf="linkFields.apiDocLink.href">
-          <h5 [translate]="linkFields.apiDocLink.title"></h5>
-          <a class="mdl-color-text--primary-dark" target="_blank" [href]="linkFields.apiDocLink.href">
-            {{ linkFields.apiDocLink.href }}
-          </a>
-        </div>
-
         <div *ngIf="inputFields.apiKey.value">
           <h5 [translate]="inputFields.apiKey.title"></h5>
           <cs-input-group>
@@ -85,6 +76,20 @@ <h5 [translate]="inputFields.apiSecretKey.title"></h5>
             {{ 'COPY' | translate }}
           </mdl-tooltip>
         </div>
+        <div>
+          <h5 [translate]="linkFields.apiUrl.title"></h5>
+          <a class="mdl-color-text--primary-dark" target="_blank" [href]="linkFields.apiUrl.href">
+            {{ linkFields.apiUrl.href }}
+          </a>
+        </div>
+
+        <div *ngIf="linkFields.apiDocLink.href">
+          <h5 [translate]="linkFields.apiDocLink.title"></h5>
+          <a class="mdl-color-text--primary-dark" target="_blank" [href]="linkFields.apiDocLink.href">
+            {{ linkFields.apiDocLink.href }}
+          </a>
+        </div>
+
       </div>
     </div>
   </div>

src/i18n/en.json

@@ -558,6 +558,7 @@
   "API_DOC_LINK": "Documentation",
   "ASK_GENERATE_KEYS": "Are you sure you want to generate API keys?",
   "GENERATE": "Generate",
+  "REGENERATE_KEYS": "Regenerate API keys",
 
   "INSTANCE_GROUP_CHANGE": "Change instance group",
   "CREATE_NEW_GROUP": "Create a new group",

src/i18n/ru.json

@@ -558,6 +558,7 @@
   "API_DOC_LINK": "Документация",
   "ASK_GENERATE_KEYS": "Вы уверены, что хотите сгенерировать новые ключи API?",
   "GENERATE": "Сгенерировать",
+  "REGENERATE_KEYS": "Сгенерировать новые ключи API",
 
   "INSTANCE_GROUP_CHANGE": "Изменить группу",
   "CREATE_NEW_GROUP": "Создать новую",