This is an automated email from the ASF dual-hosted git repository.
kaihsun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 8901fa1 SUBMARINE-887. Fix some front-end apperance
8901fa1 is described below
commit 8901fa1f79943257ea030cf140d9ce98a317f69d
Author: noidname01 <tim983...@gmail.com>
AuthorDate: Sat Jul 3 14:43:41 2021 +0800
SUBMARINE-887. Fix some front-end apperance
### What is this PR for?
1. notebook table modify to sync with other pages
2. the color of the first row of experiment table
3. delete redundant description in each page.
4. Some title with each page.
### What type of PR is it?
[Improvement]
### Todos
### What is the Jira issue?
https://issues.apache.org/jira/projects/SUBMARINE/issues/SUBMARINE-887
### How should this be tested?
```bash
cd submarine-workbench/workbench-web
npm install
npm start
```
### Screenshots (if appropriate)
1. notebook table
2. experiment table
3. remove description(Template as example)
4. New appearance of Manager pages
### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: noidname01 <tim983...@gmail.com>
Signed-off-by: Kai-Hsun Chen <kaih...@apache.org>
Closes #636 from noidname01/SUBMARINE-887 and squashes the following
commits:
9c115299 [noidname01] manager remove description
48e789f8 [noidname01] appearance modify
---
.../page-layout/page-layout.component.html | 11 +++---
.../page-layout/page-layout.component.scss | 5 ---
.../page-layout/page-layout.component.ts | 3 +-
.../environment/environment.component.html | 1 -
.../experiment-list/experiment-list.component.html | 1 -
.../workbench/experiment/experiment.component.html | 1 -
.../pages/workbench/manager/manager.component.html | 6 +--
.../pages/workbench/manager/manager.component.ts | 44 ++++++++++------------
.../notebook-list/notebook-list.component.html | 3 +-
.../workbench/notebook/notebook.component.html | 1 -
.../workbench/template/template.component.html | 1 -
11 files changed, 29 insertions(+), 48 deletions(-)
diff --git
a/submarine-workbench/workbench-web/src/app/components/page-layout/page-layout.component.html
b/submarine-workbench/workbench-web/src/app/components/page-layout/page-layout.component.html
index b4d2143..23c0831 100644
---
a/submarine-workbench/workbench-web/src/app/components/page-layout/page-layout.component.html
+++
b/submarine-workbench/workbench-web/src/app/components/page-layout/page-layout.component.html
@@ -16,21 +16,20 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
-<div [ngStyle]="!title ? { margin: '-24px -24px 0' } : null">
- <nz-page-header [nzTitle]="title | titlecase" *ngIf="breadCrumb">
+<div [ngStyle]="title ? { margin: '-24px -24px 0' } : null">
+ <nz-page-header *ngIf="breadCrumb" style="background-color: white;
padding-left: 30px; padding-top: 20px">
<nz-breadcrumb nz-page-header-breadcrumb>
<nz-breadcrumb-item *ngFor="let item of breadCrumb">
<a *ngIf="item.routerLink" [routerLink]="item.routerLink">{{
item.title | titlecase }}</a>
<span *ngIf="!item.routerLink">{{ item.title | titlecase }}</span>
</nz-breadcrumb-item>
</nz-breadcrumb>
- <nz-page-header-content *ngIf="description">
- <p>{{ description }}</p>
+ <nz-page-header-content *ngIf="title">
+ <h2>{{ title | titlecase }}</h2>
</nz-page-header-content>
</nz-page-header>
- <div class="content">
+ <div class="content" style="margin: 15px; padding: 15px; background-color:
white">
<ng-content></ng-content>
</div>
</div>
diff --git
a/submarine-workbench/workbench-web/src/app/components/page-layout/page-layout.component.scss
b/submarine-workbench/workbench-web/src/app/components/page-layout/page-layout.component.scss
index ecea51c..3d56d22 100644
---
a/submarine-workbench/workbench-web/src/app/components/page-layout/page-layout.component.scss
+++
b/submarine-workbench/workbench-web/src/app/components/page-layout/page-layout.component.scss
@@ -16,8 +16,3 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-nz-page-header {
- margin: -24px -24px 16px;
-}
-
diff --git
a/submarine-workbench/workbench-web/src/app/components/page-layout/page-layout.component.ts
b/submarine-workbench/workbench-web/src/app/components/page-layout/page-layout.component.ts
index ec0774d..d66e58e 100644
---
a/submarine-workbench/workbench-web/src/app/components/page-layout/page-layout.component.ts
+++
b/submarine-workbench/workbench-web/src/app/components/page-layout/page-layout.component.ts
@@ -27,11 +27,10 @@ interface BreadCrumbItem {
@Component({
selector: 'submarine-page-layout',
templateUrl: './page-layout.component.html',
- styleUrls: ['./page-layout.component.scss']
+ styleUrls: ['./page-layout.component.scss'],
})
export class PageLayoutComponent implements OnInit {
@Input() title: string;
- @Input() description: string;
@Input() breadCrumb: BreadCrumbItem[];
constructor() {}
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/environment/environment.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/environment/environment.component.html
index c266640..07e6943 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/environment/environment.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/environment/environment.component.html
@@ -30,7 +30,6 @@
<div>
<br />
<h2>Environment</h2>
- <nz-content>Apache submarine support environment management for
experiments and notebooks.</nz-content>
</div>
<br />
</div>
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-list/experiment-list.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-list/experiment-list.component.html
index f79dc1a..1738b5d 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-list/experiment-list.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment-home/experiment-list/experiment-list.component.html
@@ -24,7 +24,6 @@
[nzData]="experimentList"
[nzNoResult]="'No data'"
[nzLoading]="isLoading"
- nzSize="small"
>
<thead>
<tr>
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment.component.html
index b22a6f8..9a510f4 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/experiment/experiment.component.html
@@ -34,7 +34,6 @@
<div *ngIf="experimentID == null">
<br />
<h2>Experiment</h2>
- <nz-content>A experiment is a way of running a adhoc, pre-defined or
pipeline on a scheduled basis.</nz-content>
</div>
<br />
</div>
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/manager/manager.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/manager/manager.component.html
index 598d7db..340816d 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/manager/manager.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/manager/manager.component.html
@@ -17,10 +17,6 @@
~ under the License.
-->
-<submarine-page-layout
- [title]="currentHeaderInfo?.title"
- [breadCrumb]="currentHeaderInfo?.breadCrumb"
- [description]="currentHeaderInfo?.description"
->
+<submarine-page-layout [title]="currentHeaderInfo?.title"
[breadCrumb]="currentHeaderInfo?.breadCrumb">
<router-outlet></router-outlet>
</submarine-page-layout>
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/manager/manager.component.ts
b/submarine-workbench/workbench-web/src/app/pages/workbench/manager/manager.component.ts
index 935b192..b20d9ee 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/manager/manager.component.ts
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/manager/manager.component.ts
@@ -24,7 +24,6 @@ import _ from 'lodash';
interface HeaderInfo {
title: string;
- description: string;
breadCrumb: Array<{ title: string; routerLink?: string }>;
}
@@ -32,58 +31,55 @@ interface HeaderInfo {
selector: 'submarine-manager',
templateUrl: './manager.component.html',
styleUrls: ['./manager.component.scss'],
- providers: [Location, { provide: LocationStrategy, useClass:
PathLocationStrategy }]
+ providers: [Location, { provide: LocationStrategy, useClass:
PathLocationStrategy }],
})
export class ManagerComponent implements OnInit {
private headerInfo: { [key: string]: HeaderInfo } = {
user: {
title: 'user',
- description: 'You can check the user, delete the user, lock and unlock
the user, etc.',
breadCrumb: [
{
- title: 'Home'
- //routerLink: '/workbench/home'
+ title: 'Home',
+ // routerLink: '/workbench/home'
},
{
- title: 'manager'
+ title: 'manager',
},
{
- title: 'user'
- }
- ]
+ title: 'user',
+ },
+ ],
},
dataDict: {
- title: 'Data Dict',
- description: 'System Dict Manager',
+ title: 'dataDict',
breadCrumb: [
{
- title: 'Home'
- //routerLink: '/workbench/home'
+ title: 'Home',
+ // routerLink: '/workbench/home'
},
{
- title: 'manager'
+ title: 'manager',
},
{
- title: 'Data Dict'
- }
- ]
+ title: 'Data Dict',
+ },
+ ],
},
department: {
title: 'department',
- description: 'System Department Manager',
breadCrumb: [
{
- title: 'Home'
+ title: 'Home',
//routerLink: '/workbench/home'
},
{
- title: 'manager'
+ title: 'manager',
},
{
- title: 'department'
- }
- ]
- }
+ title: 'department',
+ },
+ ],
+ },
};
currentHeaderInfo: HeaderInfo;
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/notebook/notebook-home/notebook-list/notebook-list.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/notebook/notebook-home/notebook-list/notebook-list.component.html
index 5a84233..88af07e 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/notebook/notebook-home/notebook-list/notebook-list.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/notebook/notebook-home/notebook-list/notebook-list.component.html
@@ -17,7 +17,8 @@
~ under the License.
-->
-<nz-table id="notebookListTable" style="padding-top: 5px" #basicTable
[nzData]="notebookList" [nzNoResult]="'No data'">
+<!-- style="padding-top: 5px" -->
+<nz-table id="notebookListTable" #basicTable [nzData]="notebookList"
[nzNoResult]="'No data'" nzBordered>
<thead>
<tr>
<th></th>
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/notebook/notebook.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/notebook/notebook.component.html
index f430035..6f90185 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/notebook/notebook.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/notebook/notebook.component.html
@@ -29,7 +29,6 @@
<div>
<br />
<h2>Notebook</h2>
- <nz-content>Apache submarine support jupyter notebook.</nz-content>
</div>
<br />
</div>
diff --git
a/submarine-workbench/workbench-web/src/app/pages/workbench/template/template.component.html
b/submarine-workbench/workbench-web/src/app/pages/workbench/template/template.component.html
index 6c6011e..6f4be1b 100644
---
a/submarine-workbench/workbench-web/src/app/pages/workbench/template/template.component.html
+++
b/submarine-workbench/workbench-web/src/app/pages/workbench/template/template.component.html
@@ -33,7 +33,6 @@
<div *ngIf="templateName == null">
<br />
<h2>Template</h2>
- <nz-content>Apache submarine support predefined-template for
experiment.</nz-content>
</div>
<br />
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@submarine.apache.org
For additional commands, e-mail: dev-h...@submarine.apache.org
