You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by an...@apache.org on 2019/09/26 07:55:05 UTC

[incubator-dlab] branch DLAB-1056 updated: [DLAB-1151][DLAB-1149]: extended tags tooltips;

This is an automated email from the ASF dual-hosted git repository.

ankovalyshyn pushed a commit to branch DLAB-1056
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1056 by this push:
     new 022f4ca  [DLAB-1151][DLAB-1149]: extended tags tooltips;
022f4ca is described below

commit 022f4cae1221424f954fd9cdedf027ef672d2865
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Sep 26 10:54:54 2019 +0300

    [DLAB-1151][DLAB-1149]: extended tags tooltips;
---
 .../management-grid/management-grid.component.scss     |  6 +++++-
 .../management/management.component.html               |  8 ++++----
 .../resources-grid/resources-grid.component.html       | 18 +++++++++++++-----
 3 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
index ca86dba..dc6b90b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.scss
@@ -30,7 +30,10 @@
       }
     }
 
-    .shape,
+    .shape {
+      width: 16% !important;
+    }
+
     .status {
       width: 16% !important;
     }
@@ -41,6 +44,7 @@
 
     .resources {
       width: 25%;
+      padding: 5px;
     }
 
     .dashboard_table_body {
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html
index 63c253f..7f2d728 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.component.html
@@ -23,15 +23,15 @@
       <button mat-raised-button class="butt ssn" (click)="showEndpointsDialog()">
         <i class="material-icons"></i>Endpoints
       </button>
-      <button mat-raised-button class="butt ssn" (click)="openSsnMonitorDialog()">
+      <!-- <button mat-raised-button class="butt ssn" (click)="openSsnMonitorDialog()">
         <i class="material-icons"></i>SSN Monitor
-      </button>
+      </button> -->
       <button mat-raised-button class="butt env" (click)="openManageEnvironmentDialog()">
         <i class="material-icons"></i>Manage environment
       </button>
-      <button mat-raised-button class="butt" (click)="showBackupDialog()" [disabled]="creatingBackup">
+      <!-- <button mat-raised-button class="butt" (click)="showBackupDialog()" [disabled]="creatingBackup">
         <i class="material-icons">backup</i>Backup
-      </button>
+      </button> -->
     </div>
     <button mat-raised-button class="butt" (click)="buildGrid()">
       <i class="material-icons">autorenew</i>Refresh
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
index 730b09c..82bb10b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
@@ -111,11 +111,19 @@
 
           <td class="tag-col selection">
             <mat-chip-list aria-label="Tags">
-              <mat-chip matTooltip="Endpoint tag" matTooltipPosition="above">{{ element.tags.endpoint_tag }}</mat-chip>
-              <mat-chip *ngIf="element.tags.custom_tag" matTooltip="Custom tag" matTooltipPosition="above">
-                {{ element.tags.custom_tag }}</mat-chip>
-              <mat-chip matTooltip="User tag" matTooltipPosition="above">{{ element.tags.user_tag }}</mat-chip>
-              <mat-chip matTooltip="Project tag" matTooltipPosition="above">{{ element.tags.project_tag }}</mat-chip>
+              <mat-chip matTooltip="Endpoint tag: {{ element.tags.endpoint_tag }}" matTooltipPosition="above">
+                {{ element.tags.endpoint_tag }}
+              </mat-chip>
+              <mat-chip *ngIf="element.tags.custom_tag" matTooltip="Custom tag: {{ element.tags.custom_tag }}"
+                matTooltipPosition="above">
+                {{ element.tags.custom_tag }}
+              </mat-chip>
+              <mat-chip matTooltip="User tag: {{ element.tags.user_tag }}" matTooltipPosition="above">
+                {{ element.tags.user_tag }}
+              </mat-chip>
+              <mat-chip matTooltip="Project tag: {{ element.tags.project_tag }}" matTooltipPosition="above">
+                {{ element.tags.project_tag }}
+              </mat-chip>
             </mat-chip-list>
           </td>
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org