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/20 14:13:27 UTC
[incubator-dlab] 03/03: [DLAB-747]: patch project creation form
with file
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 fef3054506bbc81a336eb38baa2b44a41e4b63db
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Thu Jun 20 17:13:14 2019 +0300
[DLAB-747]: patch project creation form with file
---
.../project-form/project-form.component.html | 49 +++++++++++++---------
.../project-form/project-form.component.scss | 6 +++
.../webapp/src/assets/styles/_dialogs.scss | 2 +-
3 files changed, 36 insertions(+), 21 deletions(-)
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 a48c10d..45314de 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
@@ -21,28 +21,35 @@
<mat-horizontal-stepper #stepper class="stepper ani">
<mat-step>
<ng-template matStepLabel>Key upload</ng-template>
-
- <div class="row-wrap upload-key">
- <div class="col">
- <label class="control-label">
- <span>Upload public key to start project creation</span>
- </label>
- <div>
- <a href="#/help/publickeyguide" target="_blank">
- <small class="helper_instruction"><i class="material-icons">help_outline</i>Where can I get public key?</small>
- </a>
+ <section class="inner-step mat-reset upload-key">
+ <div class="form-block split">
+ <div class="row-wrap">
+ <div class="col">
+ <label class="control-label">
+ <span>Upload public key to start project creation</span>
+ </label>
+ <div>
+ <a href="#/help/publickeyguide" target="_blank">
+ <small class="helper_instruction"><i class="material-icons">help_outline</i>Where can I get public key?</small>
+ </a>
+ </div>
+ </div>
+ <div class="col txt-r">
+ <span mat-raised-button class="butt butt-file">
+ <span class="upload-icon"></span> Upload
+ <input (change)="onFileChange($event)" type="file" name="file" accept=".pub" />
+ </span>
+
+ <div *ngIf="keyLabel" class="m-bott-10 m-top-10 ellipsis" [class.danger_color]="!accessKeyValid">{{ keyLabel }}</div>
+ </div>
+ </div>
+ <div class="text-center m-bott-10">
+ <button mat-raised-button type="button" class="butt" [disabled]="item" (click)="reset()">Clear</button>
+ <button mat-raised-button type="button" class="butt next" matStepperNext>Next<i
+ class="material-icons">keyboard_arrow_right</i></button>
</div>
</div>
- <div class="col txt-r">
- <span mat-raised-button class="butt butt-file">
- <span class="upload-icon"></span> Upload
- <input (change)="onFileChange($event)" type="file" name="file" accept=".pub" />
- </span>
-
- <div *ngIf="keyLabel" class="m-bott-10 m-top-10 ellipsis" [class.danger_color]="!accessKeyValid">{{ keyLabel }}</div>
- </div>
- </div>
-
+ </section>
</mat-step>
<mat-step>
<ng-template matStepLabel>Project</ng-template>
@@ -99,6 +106,8 @@
<div class="text-center m-bott-10">
<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>
<button mat-raised-button type="button" class="butt next" matStepperNext>Next<i
class="material-icons">keyboard_arrow_right</i></button>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
index bbdf8cd..8782430 100644
--- a/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/administration/project/project-form/project-form.component.scss
@@ -41,3 +41,9 @@
font-weight: 300;
}
}
+
+.upload-key {
+ .row-wrap {
+ padding: 35px 25px;
+ }
+}
\ No newline at end of file
diff --git a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
index f163887..311048c 100644
--- a/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
+++ b/services/self-service/src/main/resources/webapp/src/assets/styles/_dialogs.scss
@@ -105,7 +105,7 @@ mat-dialog-container {
text-align: center;
box-shadow: 0 3px 1px -2px rgba(0,0,0,.2), 0 2px 2px 0 rgba(0,0,0,.14), 0 1px 5px 0 rgba(0,0,0,.12);
.upload-icon {
- background: url(/img/upload-icon.png) no-repeat;
+ background: url(/../../assets/img/upload-icon.png) no-repeat;
background-size: 100%;
display: inline-block;
width: 17px;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org