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/02/24 14:35:46 UTC
[incubator-dlab] branch DLAB-1476 updated: [DLAB-1582]: Fixed
images are not open for job tracker
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1476
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1476 by this push:
new 16d1d50 [DLAB-1582]: Fixed images are not open for job tracker
16d1d50 is described below
commit 16d1d50fdc45fe788be70a58845108a9152c2b23
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Mon Feb 24 16:35:19 2020 +0200
[DLAB-1582]: Fixed images are not open for job tracker
---
.../cluster-details/cluster-details.component.html | 2 +-
.../demo-picture-dialog.component.html | 4 ++--
.../demo-picture-dialog.component.scss | 12 +++++++++---
.../detail-dialog/detail-dialog.component.ts | 8 +++++---
.../webapp/src/assets/img/demo/Jupyter.png | Bin 115150 -> 114283 bytes
.../resources/webapp/src/assets/img/demo/ungit.png | Bin 98113 -> 275944 bytes
.../webapp/src/assets/styles/_dialogs.scss | 4 ++--
7 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
index 8ce7fed..4738e91 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/computational/cluster-details/cluster-details.component.html
@@ -100,7 +100,7 @@
<div class="m-top-10">
<p *ngFor="let item of resource.computational_url" class="ellipsis flex">
<span class="strong">{{ item.description }}:</span>
- <a *ngIf="demoMode" href="{{item.url}}" target="_blank" matTooltip="{{item.url}}"
+ <a *ngIf="!demoMode" href="{{item.url}}" target="_blank" matTooltip="{{item.url}}"
matTooltipPosition="above">{{ item.url }}</a>
<span *ngIf="demoMode" class="fake-link" (click)="openDemoLink(item.description)" matTooltip="{{item.url}}"
matTooltipPosition="above">{{ item.url }}</span>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.html
index a45900a..3623bb3 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.html
@@ -17,9 +17,9 @@
~ under the License.
-->
-<div class="ami-dialog" id="dialog-box">
+<div class="demo-dialog" id="dialog-box">
<header class="dialog-header">
- <h4 class="modal-title">Demo {{data.title}}</h4>
+ <h4 class="modal-title"> It is only demo preview for {{data.title}} UI. For real environment you can use all available tools on {{data.title}} UI. </h4>
<button type="button" class="close" (click)="dialogRef.close()">×</button>
</header>
<div class="dialog-content">
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.scss b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.scss
index 1668e5f..0439abc 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.scss
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/demo-picture-dialog/demo-picture-dialog.component.scss
@@ -17,8 +17,14 @@
* under the License.
*/
+.demo-dialog{
+ .dialog-content{
+ font-size: 0;
-
-.demo-picture{
- width: 100%;
+ .demo-picture{
+ width: 100%;
+ }
+ }
}
+
+
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
index 6aae7ca..cbac2e6 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.ts
@@ -136,14 +136,16 @@ export class DetailDialogComponent implements OnInit {
demoData.url = 'assets/img/demo/Jupyter.png';
} else if (template === 'Ungit') {
demoData.url = 'assets/img/demo/ungit.png';
- } else if (template === 'TensorBoard') {
+ } else if (template === 'JupyterLab') {
+ demoData.url = 'assets/img/demo/jupyterLab.png';
+ } else if (template === 'TensorBoard') {
demoData.url = 'assets/img/demo/tensorboard.png';
} else if (template === 'RStudio') {
demoData.url = 'assets/img/demo/Rstudio.png';
} else if (template === 'Apache Zeppelin') {
demoData.url = 'assets/img/demo/zeppeling.png';
- } else {
- demoData.url = 'assets/img/demo/Jupyter.png';
+ } else if (template === 'Superset') {
+ demoData.url = 'assets/img/demo/superset.png';
}
this.dialog.open(DemoPictureDialogComponent, { data: demoData, panelClass: 'modal-fullscreen' })
.afterClosed().subscribe(() => console.log('done'));
diff --git a/services/self-service/src/main/resources/webapp/src/assets/img/demo/Jupyter.png b/services/self-service/src/main/resources/webapp/src/assets/img/demo/Jupyter.png
index 6fea12e..bde5214 100644
Binary files a/services/self-service/src/main/resources/webapp/src/assets/img/demo/Jupyter.png and b/services/self-service/src/main/resources/webapp/src/assets/img/demo/Jupyter.png differ
diff --git a/services/self-service/src/main/resources/webapp/src/assets/img/demo/ungit.png b/services/self-service/src/main/resources/webapp/src/assets/img/demo/ungit.png
index aa7fa9f..6b2a48a 100644
Binary files a/services/self-service/src/main/resources/webapp/src/assets/img/demo/ungit.png and b/services/self-service/src/main/resources/webapp/src/assets/img/demo/ungit.png differ
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 6acdc96..4912903 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
@@ -49,7 +49,7 @@
.modal-fullscreen {
width: 100vw;
- min-height: 80vh;
+ min-height: 60vh;
}
mat-dialog-container {
@@ -345,6 +345,6 @@ mat-dialog-container {
@media screen and (max-width: 1280px) {
.modal-fullscreen {
- max-width: 100vw !important;
+ max-width: 95vw !important;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org