This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-578
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 4a9afaf7f0fbe92207d86f9e4870650aacb7e2b2
Author: Andriana Kovalyshyn <andriana_kovalys...@epam.com>
AuthorDate: Mon Apr 1 13:36:03 2019 +0300
[DLAB-578]: merge preemptible node labels
---
...utational-resource-create-dialog.component.html | 39 +++++++++++-----------
...utational-resource-create-dialog.component.scss | 7 ++--
2 files changed, 24 insertions(+), 22 deletions(-)
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 94f3367..a37b619 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
@@ -91,27 +91,26 @@
</div>
</div>
- <div class="checkbox-group m-top-30 m-bott-10" *ngIf="PROVIDER ===
'gcp' && model.selectedImage?.image === 'docker.dlab-dataengine-service'">
- <label>
- <input #preemptibleNode type="checkbox"
(change)="selectPreemptibleNodes($event)" /> Preemptible nodes
+ <div class="preemptible checkbox-group control-group m-top-30
m-bott-10" *ngIf="PROVIDER === 'gcp' && model.selectedImage?.image ===
'docker.dlab-dataengine-service'">
+ <label class="label">
+ <input #preemptibleNode type="checkbox"
(change)="selectPreemptibleNodes($event)" />
+ <span>Preemptible node</span>
+ <span class="align" *ngIf="preemptible?.nativeElement['checked']
|| false"> count</span>
</label>
- <div class="preemptible-details" [ngClass]="{ show:
preemptible?.nativeElement['checked'] }">
- <div *ngIf="preemptible?.nativeElement['checked']"
class="control-group">
- <label class="label">Preemptible node count</label>
- <div class="control">
- <input type="text" class="form-control"
- formControlName="preemptible_instance_number"
- (keypress)="isNumberKey($event)"
- (keydown.arrowup)="preemptibleCounter($event, 'increment')"
- (keydown.arrowdown)="preemptibleCounter($event,
'decrement')" />
- <span class="danger_color"
*ngIf="!resourceForm?.controls.preemptible_instance_number.valid">
- <span *ngIf="minPreemptibleInstanceNumber !==
maxPreemptibleInstanceNumber; else equal">
- Only integer values greater than or equal to {{
minPreemptibleInstanceNumber }} and less than {{ maxPreemptibleInstanceNumber
}} are allowed
- </span>
- <ng-template #equal>Please manage total machines
count</ng-template>
- </span>
- </div>
- </div>
+ <div *ngIf="preemptible?.nativeElement['checked']"
+ class="preemptible-details control"
+ [ngClass]="{ show: preemptible?.nativeElement['checked'] ||
false}">
+ <input type="text" class="form-control"
+ formControlName="preemptible_instance_number"
+ (keypress)="isNumberKey($event)"
+ (keydown.arrowup)="preemptibleCounter($event, 'increment')"
+ (keydown.arrowdown)="preemptibleCounter($event, 'decrement')" />
+ <span class="danger_color"
*ngIf="!resourceForm?.controls.preemptible_instance_number.valid">
+ <span *ngIf="minPreemptibleInstanceNumber !==
maxPreemptibleInstanceNumber; else equal">
+ Only integer values greater than or equal to {{
minPreemptibleInstanceNumber }} and less than {{ maxPreemptibleInstanceNumber
}} are allowed
+ </span>
+ <ng-template #equal>Please manage total machines
count</ng-template>
+ </span>
</div>
</div>
diff --git
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.scss
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.scss
index 585b514..9ccc51f 100644
---
a/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.scss
+++
b/services/self-service/src/main/resources/webapp/src/app/resources/computational/computational-resource-create-dialog/computational-resource-create-dialog.component.scss
@@ -73,7 +73,7 @@
opacity: 1;
}
}
- .preemptible-details {
+ .preemptible {
.label {
padding-left: 10px;
}
@@ -81,7 +81,10 @@
position: relative;
}
}
- .spot-details {
+ .align {
+ margin-left: 25px;
+ }
+ .spot-details, .preemptible-details {
position: relative;
.danger_color {
bottom: -5px;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
