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/01/23 15:33:14 UTC
[incubator-dlab] branch develop updated: [DLAB-1466]: Fixed set of
minor issues (#549)
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 0dce6c8 [DLAB-1466]: Fixed set of minor issues (#549)
0dce6c8 is described below
commit 0dce6c833aa0aced0f8dfb2612dc8741d81581fe
Author: Dmytro Gnatyshyn <42...@users.noreply.github.com>
AuthorDate: Thu Jan 23 17:33:06 2020 +0200
[DLAB-1466]: Fixed set of minor issues (#549)
[DLAB-1466]:Fixed set of minor issues
---
.../management-grid/management-grid.component.html | 6 +++---
.../management-grid/management-grid.component.scss | 12 ++++++------
.../computational-resource-create-dialog.component.html | 2 +-
.../computational-resource-create-dialog.component.ts | 2 +-
.../app/resources/manage-ungit/manage-ungit.component.html | 2 +-
.../main/resources/webapp/src/assets/styles/_general.scss | 5 +++++
6 files changed, 17 insertions(+), 12 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 c5666da..ced278d 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
@@ -121,8 +121,8 @@
</ng-container>
<ng-container matColumnDef="actions">
- <th mat-header-cell *matHeaderCellDef class=""></th>
- <td mat-cell *matCellDef="let element" class=" settings">
+ <th mat-header-cell *matHeaderCellDef class="actions"></th>
+ <td mat-cell *matCellDef="let element" class="settings actions-col">
<span #settings class="actions" (click)="actions.toggle($event, settings)" *ngIf="element.type !== 'edge node'"
[ngClass]="{
'disabled' : isActiveResources(element),
@@ -199,7 +199,7 @@
</th>
</ng-container>
<ng-container matColumnDef="actions-filter" sticky>
- <th mat-header-cell *matHeaderCellDef>
+ <th mat-header-cell *matHeaderCellDef class="actions-col">
<div class="actions">
<button mat-icon-button class="btn reset" (click)="resetFilterConfigurations()">
<i class="material-icons">close</i>
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 c1b3ad0..87bef73 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
@@ -23,7 +23,7 @@
.user,
.name,
.project {
- width: 14%;
+ width: 12%;
.list-menu li {
text-transform: inherit;
@@ -31,11 +31,11 @@
}
.shape {
- width: 18% !important;
+ width: 19% !important;
}
.status {
- width: 15% !important;
+ width: 13% !important;
}
.type {
@@ -43,12 +43,12 @@
}
.resources {
- width: 25%;
+ width: 22%;
padding: 5px;
}
.settings {
- padding-right: 24px;
+ padding-right: 14px;
.actions {
margin-top: 2px;
@@ -56,7 +56,7 @@
}
.actions-col {
- width: 10%;
+ width: 6%;
}
.dashboard_table_body {
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
index 3cae0dc..7b956fc 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.html
@@ -124,7 +124,7 @@
<label class="label">Slave instance size</label>
<div class="control selector-wrapper">
<mat-form-field>
- <mat-label>Select cluster type</mat-label>
+ <mat-label>Select {{ DICTIONARY.notebook_instance_size }}</mat-label>
<mat-select formControlName="shape_slave" disableOptionCentering>
<mat-optgroup *ngFor="let item of (selectedImage.computation_resources_shapes | keys)"
[label]="item.key | underscoreless">
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
index 52731b2..eeb8bdb 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.ts
@@ -141,7 +141,7 @@ export class ComputationalResourceCreateDialogComponent implements OnInit {
template_name: ['', [Validators.required]],
version: [''],
shape_master: ['', Validators.required],
- shape_slave: ['', Validators.required],
+ shape_slave: ['', Validators.required],
cluster_alias_name: ['', [Validators.required, Validators.pattern(PATTERNS.namePattern), Validators.maxLength(DICTIONARY[this.PROVIDER].max_cluster_name_length),
this.checkDuplication.bind(this)]],
instance_number: ['', [Validators.required, Validators.pattern(PATTERNS.nodeCountPattern), this.validInstanceNumberRange.bind(this)]],
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
index b3d444b..bcecfd2 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/manage-ungit/manage-ungit.component.html
@@ -134,7 +134,7 @@
<div class="control">
<input type="password" formControlName="confirmPassword" placeholder="Enter Password">
</div>
- <span class="danger_color" *ngIf="updateAccountCredentialsForm.value.password !== updateAccountCredentialsForm.value.confirmPassword && updateAccountCredentialsForm.controls['password'].touched && !!updateAccountCredentialsForm.value.password">
+ <span class="danger_color" *ngIf="updateAccountCredentialsForm.value.password !== updateAccountCredentialsForm.value.confirmPassword && updateAccountCredentialsForm.controls['confirmPassword'].touched && !!updateAccountCredentialsForm.value.password">
Passwords don't match.
</span>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss
index fd2dbe5..769b5ef 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_general.scss
@@ -167,3 +167,8 @@ button {
color: #35afd5;
line-height: 26px;
}
+
+input[type=file],
+input[type=file]::-webkit-file-upload-button {
+ cursor: pointer;
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org