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/05/08 10:39:30 UTC
[incubator-dlab] branch DLAB-290 created (now f0d166f)
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a change to branch DLAB-290
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at f0d166f [DLAB-290]: metadata infolist fixes
This branch includes the following new commits:
new f0d166f [DLAB-290]: metadata infolist fixes
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-290]: metadata infolist fixes
Posted by an...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ankovalyshyn pushed a commit to branch DLAB-290
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit f0d166fc3c6e4fe019e4e5b8ce5f840fd856c8ab
Author: Andriana Kovalyshyn <An...@epam.com>
AuthorDate: Wed May 8 13:38:40 2019 +0300
[DLAB-290]: metadata infolist fixes
---
.../key-upload-dialog.component.ts | 2 +-
.../app/shared/modal-dialog/modal.component.html | 41 +++++++++++-----------
.../app/shared/modal-dialog/modal.component.scss | 17 ---------
.../notification-dialog.component.ts | 4 +--
.../src/app/shared/navbar/navbar.component.html | 6 ++--
.../src/app/shared/navbar/navbar.component.scss | 8 ++++-
.../webapp/src/assets/styles/_general.scss | 18 +++++++++-
7 files changed, 51 insertions(+), 45 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts
index 1829096..ba4f7a4 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/key-upload-dialog/key-upload-dialog.component.ts
@@ -32,7 +32,7 @@ import { HTTP_STATUS_CODES } from '../../../core/util';
export class UploadKeyDialogComponent implements OnInit {
model: KeyUploadDialogModel;
@Input() primaryUploading: boolean = true;
-
+
@ViewChild('bindDialog') bindDialog;
@ViewChild('userAccessKeyUploadControl') userAccessKeyUploadControl;
@Output() checkInfrastructureCreationProgress: EventEmitter<{}> = new EventEmitter();
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.html
index fdd1a03..bb7bac2 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.html
@@ -17,25 +17,26 @@
~ under the License.
-->
-<div #modalRoot id="modalRoot" class="dialog" role="dialog"
- (keydown.esc)="closeOnEscape ? close() : 0"
- [ngClass]="{ in: isOpened, out: isHide }"
- (click)="closeOnOutsideClick($event) ? close() : 0">
- <div [class]="'dialog-container ' + modalClass">
- <div class="dialog-content" tabindex="0" *ngIf="isOpened">
- <div [ngClass]="{ 'dialog-header': isHeader, 'hidden': !isHeader }">
- <h4 class="modal-title" *ngIf="title">{{ title }}</h4>
- <ng-content select="modal-header"></ng-content>
- <button *ngIf="!hideCloseButton" type="button" class="close" data-dismiss="modal" [attr.aria-label]="cancelButtonLabel || 'Close'" (click)="close()">×</button>
- </div>
- <div class="dialog-body">
- <ng-content select="modal-content"></ng-content>
- </div>
- <div [ngClass]="{ 'modal-footer': isFooter, 'hidden': !isFooter }">
- <ng-content select="modal-footer"></ng-content>
- <button mat-raised-button *ngIf="cancelButtonLabel" type="button" class="btn btn-default" data-dismiss="modal" (click)="close()">{{ cancelButtonLabel }}</button>
- <button mat-raised-button *ngIf="submitButtonLabel" type="button" class="btn btn-primary" (click)="onSubmit.emit(undefined)">{{ submitButtonLabel }}</button>
- </div>
- </div>
+<div #modalRoot id="modalRoot" class="dialog" role="dialog" [ngClass]="{ in: isOpened, out: isHide }"
+ (keydown.esc)="closeOnEscape ? close() : 0" (click)="closeOnOutsideClick($event) ? close() : 0">
+ <div [class]="'dialog-container ' + modalClass">
+ <div class="dialog-content" tabindex="0" *ngIf="isOpened">
+ <div [ngClass]="{ 'dialog-header': isHeader, 'hidden': !isHeader }">
+ <h4 class="modal-title" *ngIf="title">{{ title }}</h4>
+ <ng-content select="modal-header"></ng-content>
+ <button *ngIf="!hideCloseButton" type="button" class="close" data-dismiss="modal"
+ [attr.aria-label]="cancelButtonLabel || 'Close'" (click)="close()">×</button>
+ </div>
+ <div class="dialog-body">
+ <ng-content select="modal-content"></ng-content>
+ </div>
+ <div [ngClass]="{ 'modal-footer': isFooter, 'hidden': !isFooter }">
+ <ng-content select="modal-footer"></ng-content>
+ <button mat-raised-button *ngIf="cancelButtonLabel" type="button" class="btn btn-default" data-dismiss="modal"
+ (click)="close()">{{ cancelButtonLabel }}</button>
+ <button mat-raised-button *ngIf="submitButtonLabel" type="button" class="btn btn-primary"
+ (click)="onSubmit.emit(undefined)">{{ submitButtonLabel }}</button>
+ </div>
</div>
+ </div>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
index dc2f40b..8a6c09d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/modal-dialog/modal.component.scss
@@ -369,23 +369,6 @@
}
}
-.helper_instruction {
- color: #35afd5;
- overflow: hidden;
- cursor: pointer;
- transition: all .45s ease-in-out;
- &:hover {
- color: #3392b0;
- }
- .material-icons {
- font-size: 20px;
- vertical-align: top;
- padding-right: 5px;
- overflow: hidden;
- }
-}
-
-
.detail-info {
p {
font-weight: 400;
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 86ca5a5..dab2f10 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
@@ -34,13 +34,13 @@ import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material';
<span *ngFor="let item of data.template.notebook">
<b>{{ item.exploratory_name }}</b>
<span *ngIf="data.template.notebook.length > 1">, </span>
- </span> will be stopped and all computational resources will be stopped/terminated
+ </span> will be stopped and all computational resources will be stopped/terminated
</div>
<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>
+ <b>{{ item.computational_name }}</b> on <b>{{ item.exploratory_name }}</b>
will be stopped
</p>
</div>
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
index 914edbc..8bb75c9 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html
@@ -58,11 +58,11 @@
</p>
<p>
<strong>Revision: </strong>
- <span class="ellipsis">{{ metadata?.commmit }}</span>
+ <span class="ellipsis">{{ metadata?.commit }}</span>
</p>
<p>
- <strong>Release notes: </strong>
- <span class="ellipsis">{{ metadata?.release_notes }}</span>
+ <a class="helper_instruction" [attr.href]="metadata?.release_notes" target="_blank">
+ <i class="material-icons">link</i>Release notes </a>
</p>
</div>
</bubble-up>
diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
index cc52dc6..45bc4da 100644
--- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.scss
@@ -98,11 +98,17 @@
p {
strong {
color: #455c74;
- font-size: 16px;
+ font-size: 14px;
font-weight: 600;
width: 120px;
display: inline-block;
}
+ .helper_instructiongit {
+ font-size: 14px;
+ i {
+ vertical-align: bottom;
+ }
+ }
span {
width: 180px;
display: inline-block;
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 2299f2f..77278ca 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
@@ -75,7 +75,7 @@ input[type='text']:not(.mat-input-element)::placeholder,
input[type='number']:not(.mat-input-element)::placeholder,
input[type='email']:not(.mat-input-element)::placeholder,
input[type='password']:not(.mat-input-element)::placeholder,
-textarea::placeholder, {
+textarea::placeholder {
color: #718ba6;
}
@@ -138,3 +138,19 @@ button {
font-style: normal;
}
}
+
+.helper_instruction {
+ color: #35afd5;
+ overflow: hidden;
+ cursor: pointer;
+ transition: all .45s ease-in-out;
+ &:hover {
+ color: #3392b0;
+ }
+ .material-icons {
+ font-size: 20px;
+ vertical-align: top;
+ padding-right: 5px;
+ overflow: hidden;
+ }
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org