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 2019/12/05 13:51:52 UTC
[incubator-dlab] 01/01: [DLAB-1337] Enhancement for 'List of
resource pages' and other small fixes
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1337
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 5fc1d4ef536a386862615e84070b00bd6591212a
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Dec 5 12:41:14 2019 +0200
[DLAB-1337] Enhancement for 'List of resource pages' and other small fixes
---
.../management-grid/management-grid.component.ts | 4 ++--
.../src/app/administration/project/project.component.ts | 4 ++--
.../webapp/src/app/administration/roles/roles.component.ts | 6 +++---
.../computational-resources-list.component.scss | 4 +++-
.../computational-resources-list.component.ts | 14 +++++++-------
.../install-libraries/install-libraries.component.html | 2 +-
.../install-libraries/install-libraries.component.scss | 5 ++++-
.../resources/resources-grid/resources-grid.component.ts | 1 -
.../confirmation-dialog/confirmation-dialog.component.html | 4 ++--
.../notification-dialog/notification-dialog.component.ts | 8 ++++++--
.../self-service/src/main/resources/webapp/src/styles.scss | 1 +
11 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
index c94ed59..3535fd7 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management-grid/management-grid.component.ts
@@ -226,11 +226,11 @@ export class ManagementGridComponent implements OnInit {
<button type="button" class="close" (click)="dialogRef.close()">×</button>
</div>
<div mat-dialog-content class="content">
- <p>Resource <strong> {{ data.resource_name }}</strong> of user <strong> {{ data.user }} </strong> will be
+ <p>Resource <span class="strong"> {{ data.resource_name }}</span> of user <span class="strong"> {{ data.user }} </span> will be
<span *ngIf="data.action === 'terminate'"> decommissioned.</span>
<span *ngIf="data.action === 'stop'">stopped.</span>
</p>
- <p class="m-top-20"><strong>Do you want to proceed?</strong></p>
+ <p class="m-top-20"><span class="strong">Do you want to proceed?</span></p>
</div>
<div class="text-center">
<button type="button" class="butt" mat-raised-button (click)="dialogRef.close()">No</button>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
index 1669152..a501ccc 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project.component.ts
@@ -119,7 +119,7 @@ export class ProjectComponent implements OnInit, OnDestroy {
this.dialog.open(NotificationDialogComponent, {
data: {
type: 'confirmation',
- template: `Edge node in endpoint <b>${$event.endpoint.name}</b> will be ${$event.action === 'stop' ? 'stopped' : 'terminated'} for <b>${$event.project.name}</b>`,
+ template: `Edge node in endpoint <span class="strong">${$event.endpoint.name}</span> will be ${$event.action === 'stop' ? 'stopped' : 'terminated'} for <span class="strong">${$event.project.name}</span>`,
item: $event.endpoint, action: $event.action === 'stop' ? 'stopped' : 'terminated'
}, panelClass: 'modal-sm'
})
@@ -180,4 +180,4 @@ export class EditProjectComponent {
public dialogRef: MatDialogRef<EditProjectComponent>,
@Inject(MAT_DIALOG_DATA) public data: any
) { }
-}
\ No newline at end of file
+}
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
index 18e2fd5..7552ed9 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/roles/roles.component.ts
@@ -224,9 +224,9 @@ export class RolesComponent implements OnInit {
<button type="button" class="close" (click)="dialogRef.close()">×</button>
</div>
<div mat-dialog-content class="content">
- <p *ngIf="data.user">User <strong>{{ data.user }}</strong> will be deleted from <strong>{{ data.group }}</strong> group.</p>
- <p *ngIf="data.id">Group <strong class="ellipsis group-name">{{ data.group }}</strong> will be decommissioned.</p>
- <p class="m-top-20"><strong>Do you want to proceed?</strong></p>
+ <p *ngIf="data.user">User <span class="strong">{{ data.user }}</span> will be deleted from <span class="strong">{{ data.group }}</span> group.</p>
+ <p *ngIf="data.id">Group <span class="ellipsis group-name strong">{{ data.group }}</span> will be decommissioned.</p>
+ <p class="m-top-20"><span class="strong">Do you want to proceed?</span></p>
</div>
<div class="text-center">
<button type="button" class="butt" mat-raised-button (click)="dialogRef.close()">No</button>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
index f80009f..ef3776d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.scss
@@ -67,7 +67,9 @@
.schedule {
cursor: pointer;
- margin-top: 5px;
+ display: flex;
+ align-items: center;
+ font-size: 18px;
&.not-allowed {
pointer-events: none;
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
index 9981674..bd175a6 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resources-list/computational-resources-list.component.ts
@@ -96,17 +96,17 @@ export class ComputationalResourcesListComponent {
</div>
<div mat-dialog-content class="content">
<div class="dialog-max-width">
- Computational resource
- <strong matTooltip="{{ data.resource.computational_name }}"
- [matTooltipShowDelay]="2000"
- matTooltipPosition="left"
- >
+ Computational resource
+ <span class="strong" matTooltip="{{ data.resource.computational_name }}"
+ [matTooltipShowDelay]="2000"
+ matTooltipPosition="left"
+ >
{{ data.resource.computational_name }}
- </strong> will be
+ </span> will be
<span *ngIf="data.action === 'terminate'"> decommissioned.</span>
<span *ngIf="data.action === 'stop'">stopped.</span>
</div>
- <p class="m-top-20"><strong>Do you want to proceed?</strong></p>
+ <p class="m-top-20"><span class="strong">Do you want to proceed?</span></p>
</div>
<div class="text-center">
<button type="button" class="butt" mat-raised-button (click)="dialogRef.close()">No</button>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
index b015ab8..ce51091 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.html
@@ -19,7 +19,7 @@
<div class="install-libraries" id="dialog-box">
<header class="dialog-header">
- <h4 class="modal-title">Manage <b>{{ notebook?.name }}</b> Libraries</h4>
+ <h4 class="modal-title">Manage <span class="strong">{{ notebook?.name }}</span> Libraries</h4>
<button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
<div class="dialog-content">
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
index 3d033de..0f39a6c 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/install-libraries/install-libraries.component.scss
@@ -30,6 +30,9 @@
flex-direction: initial;
margin-bottom: 25px;
}
+ strong{
+ font-weight: 600;
+ }
}
}
@@ -185,7 +188,7 @@
width: 50px;
text-align: center;
font-size: 11px;
- font-weight: 300;
+ font-weight: 600;
i {
position: absolute;
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
index 720c451..7246ce4 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
@@ -95,7 +95,6 @@ export class ResourcesGridComponent implements OnInit {
public buildGrid(): void {
this.userResourceService.getUserProvisionedResources()
.subscribe((result: any) => {
- this.filtering = false;
this.environments = ExploratoryModel.loadEnvironments(result);
this.getDefaultFilterConfiguration();
(this.environments.length) ? this.getUserPreferences() : this.filteredEnvironments = [];
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.html
index a19d773..3dc0e5e 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/confirmation-dialog/confirmation-dialog.component.html
@@ -54,7 +54,7 @@
</mat-list>
<div class="text-center m-top-20">
- <p>Do you want to proceed?</p>
+ <p class="strong">Do you want to proceed?</p>
</div>
<div class="text-center m-top-20">
<button mat-raised-button type="button" class="butt action" (click)="dialogRef.close()">No</button>
@@ -62,4 +62,4 @@
</div>
</div>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
index 40e7b65..5664583 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/notification-dialog/notification-dialog.component.ts
@@ -33,7 +33,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
<div *ngIf="data.template.notebook.length > 0">
Following notebook server<span *ngIf="data.template.notebook.length>1">s </span>
<span *ngFor="let item of data.template.notebook">
- <b>{{ item.exploratory_name }}</b>
+ <span class="strong">{{ item.exploratory_name }}</span>
<span *ngIf="data.template.notebook.length > 1">, </span>
</span> will be stopped and all computational resources will be stopped/terminated
</div>
@@ -41,7 +41,7 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
<div *ngIf="data.template.cluster.length > 0">
<p *ngFor="let item of data.template.cluster">
Computational resource<span *ngIf="data.template.cluster.length > 1">s </span>
- <b>{{ item.computational_name }}</b> on <b>{{ item.exploratory_name }}</b>
+ <span class="strong">{{ item.computational_name }}</span> on <span class="strong">{{ item.exploratory_name }}</span>
will be stopped
</p>
</div>
@@ -95,6 +95,10 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
.status { width: 30%;text-align: right;}
.label { font-size: 15px; font-weight: 500; font-family: "Open Sans",sans-serif;}
.node { font-weight: 300;}
+ .label-name { display: inline-block; width: 100%}
+ .scrolling-content{overflow-y: auto; max-height: 200px;}
+ .endpoint { width: 280px;text-align: left;}
+ .status { text-align: left;}
`]
})
export class NotificationDialogComponent {
diff --git a/services/self-service/src/main/resources/webapp/src/styles.scss b/services/self-service/src/main/resources/webapp/src/styles.scss
index 1305465..2651949 100644
--- a/services/self-service/src/main/resources/webapp/src/styles.scss
+++ b/services/self-service/src/main/resources/webapp/src/styles.scss
@@ -104,6 +104,7 @@ mat-chip.mat-chip strong {
.status {
text-transform: capitalize;
+ text-align: left;
}
.running,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org