You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by bh...@apache.org on 2019/07/25 11:31:28 UTC
[incubator-dlab] 06/12: [DLAB-4]: added terminal per notebook on
actions panel
This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch v2.1.1
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 45378b00994e6411db9501210794bc139ced6ef0
Author: Andriana Kovalyshyn <an...@epam.com>
AuthorDate: Wed May 8 16:32:10 2019 +0300
[DLAB-4]: added terminal per notebook on actions panel
---
.../exploratory/detail-dialog/detail-dialog.component.html | 5 -----
.../webapp/src/app/resources/exploratory/detail-dialog/index.ts | 2 --
.../resources/webapp/src/app/resources/resources-grid/index.ts | 3 ++-
.../src/app/resources/resources-grid/resources-grid.component.css | 8 +++++++-
.../app/resources/resources-grid/resources-grid.component.html | 6 ++++++
.../src/app/resources/resources-grid/resources-grid.component.ts | 5 -----
6 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
index 8e9373e..4fe8794 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/detail-dialog.component.html
@@ -118,11 +118,6 @@
(click)="editClusterConfiguration(configurationForm.value)">Update</button>
</div>
</div>
-
- <div>
- <label>Terminal: </label>
- <a target="_blank" [routerLink]="['/terminal', notebook.ip]" mat-raised-button type="button" class="butt action">Open terminal</a>
- </div>
</div>
</div>
</modal-content>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts
index 0a7bcac..1571d71 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/exploratory/detail-dialog/index.ts
@@ -20,7 +20,6 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { RouterModule } from '@angular/router';
import { ModalModule } from '../../../shared';
import { MaterialModule } from '../../../shared/material.module';
import { DetailDialogComponent } from './detail-dialog.component';
@@ -34,7 +33,6 @@ export * from './detail-dialog.component';
ModalModule,
FormsModule,
ReactiveFormsModule,
- RouterModule,
MaterialModule,
DirectivesModule
],
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts
index b078349..ea94971 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/index.ts
@@ -19,7 +19,7 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
-
+import { RouterModule } from '@angular/router';
import { MaterialModule } from '../../shared/material.module';
import { ResourcesGridComponent } from './resources-grid.component';
import { ComputationalResourcesModule } from '../computational/computational-resources-list';
@@ -36,6 +36,7 @@ import { UnderscorelessPipeModule } from '../../core/pipes/underscoreless-pipe';
@NgModule({
imports: [
CommonModule,
+ RouterModule,
ComputationalResourcesModule,
ModalModule,
ConfirmationDialogModule,
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css
index 6b4682f..ec1d129 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.css
@@ -174,6 +174,11 @@
color: #577289;
transition: all 0.45s ease-in-out;
}
+.dashboard_table .list-menu a.navigate {
+ text-decoration: none;
+ color: #577289;
+ transition: all 0.45s ease-in-out;
+}
.dashboard_table .list-menu li i {
font-size: 18px;
@@ -181,7 +186,8 @@
vertical-align: bottom;
}
-.dashboard_table .list-menu li:hover {
+.dashboard_table .list-menu li:hover,
+.dashboard_table .list-menu li:hover a {
background: none !important;
color: #36afd5;
}
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
index 8502953..559cd13 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.html
@@ -141,6 +141,12 @@
<i class="material-icons">developer_board</i>
<span>Manage libraries</span>
</li>
+ <li (click)="openTerminal(env.ip)">
+ <a target="_blank" [routerLink]="['/terminal', env.ip]" class="navigate">
+ <i class="material-icons">laptop</i>
+ <span>Open terminal</span>
+ </a>
+ </li>
</ul>
</bubble-up>
</td>
diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
index c897950..1a5564b 100644
--- a/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/resources/resources-grid/resources-grid.component.ts
@@ -305,9 +305,4 @@ export class ResourcesGridComponent implements OnInit {
this.createAMI.open({ isFooter: false }, data);
}
}
-
- dropdownPosition($event): void {
- const contentHeight = document.body.offsetHeight > window.outerHeight ? document.body.offsetHeight : window.outerHeight;
- this.isOutscreenDropdown = $event.pageY + 285 > contentHeight ? true : false;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org