Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-22 18:25:56 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4717 from pengpengshui/breadScrumb

Browse Source 
Modify bread crumb for vic
This commit is contained in:
Steven Zou 2018-04-19 19:24:27 +08:00 committed by GitHub
commit 4da4dd6694
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 61 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ui_ng/lib/src/repository/repository.component.css.ts
View File

@ -3,13 +3,21 @@ export const REPOSITORY_STYLE = `.option-right {
margin-bottom: 12px;
}
.arrow-block a{
text-decoration: none;
cursor: pointer;
color: #007cbb;
font-size: 12px;
.arrow-back {
cursor: pointer;
}
.arrow-block {
border-right: 2px solid #cccccc;
margin-right: 6px;
display: inline-flex;
padding: 6px 6px 6px 12px;
}
.title-block {
display: inline-block;
}
.tag-name {
font-weight: 300;
font-size: 32px;

7
src/ui_ng/lib/src/repository/repository.component.html.ts
View File

@ -1,11 +1,10 @@
export const REPOSITORY_TEMPLATE = `
<section class="overview-section">
<div class="title-wrapper">
<div class="arrow-block">
<a (click)="goProBack()">< {{'SIDE_NAV.PROJECTS'| translate}}</a>
<a (click)="goRepBack()">< {{'REPOSITORY.REPOSITORIES'| translate}}</a>
<div class="title-block arrow-block" *ngIf="withAdmiral">
<clr-icon class="rotate-90 arrow-back" shape="arrow" size="36" (click)="goBack()"></clr-icon>
</div>
<div>
<div class="title-block">
<h2 sub-header-title class="custom-h2">{{repoName}}</h2>
</div>
</div>

10
src/ui_ng/lib/src/repository/repository.component.ts
View File

@ -52,8 +52,7 @@ export class RepositoryComponent implements OnInit {
@Input() hasProjectAdminRole: boolean;
@Input() isGuest: boolean;
@Output() tagClickEvent = new EventEmitter<TagClickEvent>();
@Output() backRepEvt: EventEmitter<any> = new EventEmitter<any>();
@Output() backProEvt: EventEmitter<any> = new EventEmitter<any>();
@Output() backEvt: EventEmitter<any> = new EventEmitter<any>();
onGoing = false;
editing = false;
@ -156,11 +155,8 @@ export class RepositoryComponent implements OnInit {
.catch(error => this.errorHandler.error(error));
}
goRepBack(): void {
this.backRepEvt.emit(this.projectId);
}
goProBack(): void {
this.backProEvt.emit();
goBack(): void {
this.backEvt.emit(this.projectId);
}
hasChanges() {

21
src/ui_ng/lib/src/tag/tag-detail.component.css.ts
View File

@ -10,10 +10,15 @@ export const TAG_DETAIL_STYLES: string = `
padding-right: 24px;
}
.title-block {
display: inline-block;
}
.tag-name {
font-weight: 300;
font-size: 32px;
}
.tag-name h2{margin-top:0;}
.tag-timestamp {
font-weight: 400;
@ -33,11 +38,19 @@ export const TAG_DETAIL_STYLES: string = `
transform: rotate(-90deg);
}
.arrow-block a{
text-decoration: none;
.arrow-back {
cursor: pointer;
color: #007cbb;
font-size: 12px;
}
.arrow-block {
border-right: 2px solid #cccccc;
margin-right: 6px;
display: inline-flex;
padding: 6px 6px 6px 12px;
}
.title-block {
display: inline-block;
}

10
src/ui_ng/lib/src/tag/tag-detail.component.html.ts
View File

@ -2,13 +2,11 @@ export const TAG_DETAIL_HTML: string = `
<div>
<section class="overview-section">
<div class="title-wrapper">
<div class="arrow-block">
<a (click)="onBackPro()">< {{'SIDE_NAV.PROJECTS'| translate}}</a>
<a (click)="onBackRep()">< {{'REPOSITORY.REPOSITORIES'| translate}}</a>
<a (click)="onBackTag()">< {{repositoryId}}</a>
<div class="title-block arrow-block" *ngIf="withAdmiral">
<clr-icon class="rotate-90 arrow-back" shape="arrow" size="36" (click)="onBack()"></clr-icon>
</div>
<div class="">
<h2 class="custom-h2" sub-header-title>{{repositoryId}}:{{tagDetails.name}}</h2>
<div class="title-block">
<h2 class="custom-h2">{{repositoryId}}:{{tagDetails.name}}</h2>
</div>
</div>
<div class="summary-block">

14
src/ui_ng/lib/src/tag/tag-detail.component.ts
View File

@ -38,9 +38,7 @@ export class TagDetailComponent implements OnInit {
labels: [],
};
@Output() backTagEvt: EventEmitter<any> = new EventEmitter<any>();
@Output() backRepEvt: EventEmitter<any> = new EventEmitter<any>();
@Output() backProEvt: EventEmitter<any> = new EventEmitter<any>();
@Output() backEvt: EventEmitter<any> = new EventEmitter<any>();
constructor(
private tagService: TagService,
@ -79,14 +77,8 @@ export class TagDetailComponent implements OnInit {
}
}
onBackTag(): void {
this.backTagEvt.emit(this.repositoryId);
}
onBackRep(): void {
this.backRepEvt.emit();
}
onBackPro(): void {
this.backProEvt.emit();
onBack(): void {
this.backEvt.emit(this.repositoryId);
}
getPackageText(count: number): string {

2
src/ui_ng/package.json
View File

@ -30,7 +30,7 @@
"clarity-icons": "0.10.24",
"clarity-ui": "0.10.24",
"core-js": "^2.4.1",
"harbor-ui": "0.7.2",
"harbor-ui": "0.7.3",
"intl": "^1.2.5",
"mutationobserver-shim": "^0.3.2",
"ngx-cookie": "^1.0.0",

7
src/ui_ng/src/app/repository/tag-detail/tag-detail-page.component.html
View File

@ -1,3 +1,8 @@
<div>
<hbr-tag-detail (backTagEvt)="goBackTag($event)" (backRepEvt)="goBackRep()" (backProEvt)="goBackPro()" [tagId]="tagId" [withClair]="withClair" [withAdmiral]="withAdmiral" [repositoryId]="repositoryId"></hbr-tag-detail>
<div class="arrow-block" *ngIf="!withAdmiral">
<a (click)="goBackPro()">< {{'SIDE_NAV.PROJECTS'| translate}}</a>
<a (click)="goBackRep()">< {{'REPOSITORY.REPOSITORIES'| translate}}</a>
<a (click)="goBack(repositoryId)">< {{repositoryId}}</a>
</div>
<hbr-tag-detail (backEvt)="goBack($event)" [tagId]="tagId" [withClair]="withClair" [withAdmiral]="withAdmiral" [repositoryId]="repositoryId"></hbr-tag-detail>
</div>

5
src/ui_ng/src/app/repository/tag-detail/tag-detail-page.component.ts
View File

@ -17,7 +17,8 @@ import {AppConfigService} from "../../app-config.service";
@Component({
selector: 'repository',
templateUrl: 'tag-detail-page.component.html'
templateUrl: 'tag-detail-page.component.html',
styles: ['.arrow-block a{text-decoration: none; cursor: pointer; cursor: pointer; color: #007cbb; font-size: 12px;}']
})
export class TagDetailPageComponent implements OnInit {
tagId: string;
@ -45,7 +46,7 @@ export class TagDetailPageComponent implements OnInit {
return this.appConfigService.getConfig().with_clair;
}
goBackTag(tag: string): void {
goBack(tag: string): void {
this.router.navigate(["harbor", "projects", this.projectId, "repositories", tag]);
}
goBackRep(): void {

3
src/ui_ng/src/app/repository/tag-repository/tag-repository.component.css
View File

@ -1,3 +1,4 @@
.sub-header-title {
margin-top: 12px;
}
}
.arrow-block a{text-decoration: none; cursor: pointer; cursor: pointer; color: #007cbb; font-size: 12px;}

6
src/ui_ng/src/app/repository/tag-repository/tag-repository.component.html
View File

@ -1,4 +1,8 @@
<div>
<div class="arrow-block" *ngIf="!withAdmiral">
<a (click)="goProBack()">< {{'SIDE_NAV.PROJECTS'| translate}}</a>
<a (click)="watchGoBackEvt(projectId)">< {{'REPOSITORY.REPOSITORIES'| translate}}</a>
</div>
<hbr-repository [repoName]="repoName" [hasSignedIn]="hasSignedIn" [hasProjectAdminRole]="hasProjectAdminRole" [projectId]="projectId" [isGuest]="isGuest"
(tagClickEvent)="watchTagClickEvt($event)" (backRepEvt)="goRepBack($event)" (backProEvt)="goProBack()"></hbr-repository>
(tagClickEvent)="watchTagClickEvt($event)" (backEvt)="watchGoBackEvt($event)"></hbr-repository>
</div>

2
src/ui_ng/src/app/repository/tag-repository/tag-repository.component.ts
View File

@ -85,7 +85,7 @@ export class TagRepositoryComponent implements OnInit {
this.router.navigate(linkUrl);
}
goRepBack(projectId: string): void {
watchGoBackEvt(projectId: string| number): void {
this.router.navigate(["harbor", "projects", projectId, "repositories"]);
}
goProBack(): void {