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/06/04 11:49:54 UTC
[incubator-dlab] 02/02: [DLAB-738]: fixed endpoints issues set
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch feature/projects
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 047cdb1010205e6181f90113f5b90ffd0509e733
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Tue Jun 4 14:49:42 2019 +0300
[DLAB-738]: fixed endpoints issues set
---
.../management/endpoints/endpoints.component.html | 72 +++++++++++-----------
.../management/endpoints/endpoints.component.scss | 23 ++++---
.../resources/webapp/src/assets/styles/_theme.scss | 7 +++
.../src/main/resources/webapp/src/styles.scss | 4 +-
4 files changed, 58 insertions(+), 48 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
index 99404fc..8673787 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.html
@@ -27,45 +27,47 @@
<div class="content-box">
<mat-tab-group>
<mat-tab label="CREATE ENDPOINT">
- <form [formGroup]="createEndpointForm" novalidate>
- <div class="control-group">
- <label class="label">Name</label>
- <div class="control">
- <input type="text" formControlName="name" placeholder="Enter endpoint name">
- <span class="error"
- *ngIf="!createEndpointForm?.controls.name.valid && createEndpointForm.controls.name.touched">
- Endpoint name can only contain letters, numbers, hyphens and '_' but can not end with special
- characters
- </span>
+ <div class="split">
+ <form [formGroup]="createEndpointForm" novalidate>
+ <div class="control-group">
+ <label class="label">Name</label>
+ <div class="control">
+ <input type="text" formControlName="name" placeholder="Enter endpoint name">
+ <span class="error"
+ *ngIf="!createEndpointForm?.controls.name.valid && createEndpointForm.controls.name.touched">
+ Endpoint name can only contain letters, numbers, hyphens and '_' but can not end with special
+ characters
+ </span>
+ </div>
</div>
- </div>
- <div class="control-group">
- <label class="label">Endpoint url</label>
- <div class="control">
- <input type="text" formControlName="url" placeholder="Enter endpoint url">
- <span class="error"
- *ngIf="!createEndpointForm?.controls.url.valid && createEndpointForm.controls.url.touched">
- Endpoint url can only contain letters, numbers, hyphens and '_' but can not end with special
- characters
- </span>
+ <div class="control-group">
+ <label class="label">Endpoint url</label>
+ <div class="control">
+ <input type="text" formControlName="url" placeholder="Enter endpoint url">
+ <span class="error"
+ *ngIf="!createEndpointForm?.controls.url.valid && createEndpointForm.controls.url.touched">
+ Endpoint url can only contain letters, numbers, hyphens and '_' but can not end with special
+ characters
+ </span>
+ </div>
</div>
- </div>
- <div class="control-group">
- <label class="label">Account</label>
- <div class="control">
- <input type="text" formControlName="account" placeholder="Enter account">
- <span class="error"
- *ngIf="!createEndpointForm?.controls.account.valid && createEndpointForm.controls.account.touched">
- Endpoint account can only contain letters, numbers, hyphens and '_' but can not end with special
- characters
- </span>
+ <div class="control-group">
+ <label class="label">Account</label>
+ <div class="control">
+ <input type="text" formControlName="account" placeholder="Enter account">
+ <span class="error"
+ *ngIf="!createEndpointForm?.controls.account.valid && createEndpointForm.controls.account.touched">
+ Endpoint account can only contain letters, numbers, hyphens and '_' but can not end with special
+ characters
+ </span>
+ </div>
</div>
+ </form>
+ <div class="action-group m-bott-10">
+ <button mat-raised-button type="button" class="butt action" (click)="dialogRef.close()">Cancel</button>
+ <button mat-raised-button type="button" [disabled]="!createEndpointForm.valid"
+ (click)="assignChanges(createEndpointForm.value)" class="butt butt-success action">Create</button>
</div>
- </form>
- <div class="action-group">
- <button mat-raised-button type="button" class="butt action" (click)="dialogRef.close()">Cancel</button>
- <button mat-raised-button type="button" [disabled]="!createEndpointForm.valid"
- (click)="assignChanges(createEndpointForm.value)" class="butt butt-success action">Create</button>
</div>
</mat-tab>
<mat-tab label="ENDPOINTS LIST">
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
index 9a49606..ed6e478 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/endpoints/endpoints.component.scss
@@ -20,16 +20,19 @@
.content-box {
padding: 10px 30px 30px;
height: 380px;
- display: flex;
- flex-direction: column;
- justify-content: space-between;
- form {
- padding: 20px 10px;
- .control-group {
- .error {
- position: absolute;
- right: 0;
- bottom: 5px;
+ .split {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ height: 100%;
+ form {
+ padding: 20px 10px;
+ .control-group {
+ .error {
+ position: absolute;
+ right: 0;
+ bottom: 5px;
+ }
}
}
}
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
index 22a3aba..037ee29 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_theme.scss
@@ -501,4 +501,11 @@ mat-horizontal-stepper {
word-break: break-all;
padding: 5px 10px;
}
+}
+
+mat-tab-group.mat-tab-group {
+ height: 100%;
+ .mat-tab-body-wrapper {
+ height: 100%;
+ }
}
\ No newline at end of file
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 78f7f63..c765793 100644
--- a/services/self-service/src/main/resources/webapp/src/styles.scss
+++ b/services/self-service/src/main/resources/webapp/src/styles.scss
@@ -280,9 +280,7 @@ input[type='number'] {
.m-top-10p {
margin-top: 10%;
}
-.ml-10 {
- margin-left: 10px;
-}
+.ml-10 { margin-left: 10px; }
.full-height {
height: 100%;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org