You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/04/27 15:45:05 UTC
[incubator-dlab] branch develop updated: [DLAB-1765]: Set of task
for administration page from UI side (#710)
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/develop by this push:
new a93c60c [DLAB-1765]: Set of task for administration page from UI side (#710)
a93c60c is described below
commit a93c60c5290091189a70879200c0425b43f3d913
Author: Dmytro Gnatyshyn <42...@users.noreply.github.com>
AuthorDate: Mon Apr 27 18:44:57 2020 +0300
[DLAB-1765]: Set of task for administration page from UI side (#710)
[DLAB-1765]: Set of tasks for administration page from UI side
---
.../management-grid/management-grid.component.html | 16 ++++++++++++----
.../management-grid/management-grid.component.scss | 13 ++++++++++++-
.../project/project-form/project-form.component.html | 10 +++++-----
3 files changed, 29 insertions(+), 10 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
index 9947516..b4f726c 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.html
@@ -28,7 +28,15 @@
<span [hidden]="filtering && filterForm.users.length > 0 && !collapsedFilterRow">more_vert</span>
</i>
</button> </th>
- <td mat-cell *matCellDef="let element">{{ element.user }}</td>
+ <td
+ mat-cell *matCellDef="let element"
+ class="user-name"
+ matTooltip="{{element.user}}"
+ matTooltipPosition="above"
+ [matTooltipDisabled]="element.user?.length<30"
+ >
+ <span >{{ element.user }}</span>
+ </td>
</ng-container>
<ng-container matColumnDef="project">
@@ -45,14 +53,14 @@
<ng-container matColumnDef="type">
<th mat-header-cell *matHeaderCellDef class="type label-header">
- <span class="label">Type</span>
+ <span class="label">Name</span>
<button mat-icon-button aria-label="More" class="ar" (click)="toggleFilterRow()">
<i class="material-icons">
<span *ngIf="filtering && filterForm.type.length > 0 && !collapsedFilterRow">filter_list</span>
<span [hidden]="filtering && filterForm.type.length > 0 && !collapsedFilterRow">more_vert</span>
</i>
</button> </th>
- <td mat-cell *matCellDef="let element">{{ element.name || element.type }}</td>
+ <td type mat-cell *matCellDef="let element">{{ element.name || element.type }}</td>
</ng-container>
<ng-container matColumnDef="shape">
@@ -174,7 +182,7 @@
<ng-container matColumnDef="type-filter" sticky>
<th mat-header-cell *matHeaderCellDef class="filter-row-item">
<input placeholder="Filter by environment type" type="text" class="form-control filter-field"
- [value]="filterForm.type" (input)="filterForm.type = $event.target.value" />
+ [value]="filterForm.type" (input)="filterForm.type = $event.target['value']"/>
</th>
</ng-container>
<ng-container matColumnDef="project-filter" sticky>
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 6c52559..30c082d 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
@@ -20,7 +20,9 @@
.data-grid {
&.management {
- .user,
+ .user{
+ width: 15%;
+ }
.name,
.project {
width: 12%;
@@ -40,6 +42,7 @@
.type {
width: 14%;
+ padding-left: 20px;
}
.resources {
@@ -68,6 +71,14 @@
cursor: default;
}
}
+ .user-name{
+ padding-right: 22px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ word-break: break-all;
+ white-space: nowrap;
+ max-width: 250px;
+ }
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
index 8c18309..9653332 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.html
@@ -160,11 +160,11 @@
</div>
</div>
<div class="text-center m-bott-10">
- <div class="control-group">
- <mat-slide-toggle formControlName="shared_image_enabled" labelPosition="after">
- <span class="hold-label">Use shared image</span>
- </mat-slide-toggle>
- </div>
+<!-- <div class="control-group">-->
+<!-- <mat-slide-toggle formControlName="shared_image_enabled" labelPosition="after">-->
+<!-- <span class="hold-label">Use shared image</span>-->
+<!-- </mat-slide-toggle>-->
+<!-- </div>-->
<button mat-raised-button type="button" class="butt" [disabled]="item" (click)="reset()">Clear</button>
<button mat-raised-button matStepperPrevious class="butt"><i
class="material-icons">keyboard_arrow_left</i>Back</button>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org