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

Merge pull request #9981 from jwangyangls/modify-nav-style-1.10

Browse Source 
[Cherry-pick#9971]Modify the style of language and modify variable name (9971)
This commit is contained in:
jwangyangls 2019-11-26 12:19:11 +08:00 committed by GitHub
commit 329dd74712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/portal/src/app/base/harbor-shell/harbor-shell.component.html
View File

@ -1,6 +1,6 @@
<clr-main-container>
<global-message [isAppLevel]="true"></global-message>
<navigator (showAccountSettingsModal)="openModal($event)" (showPwdChangeModal)="openModal($event)"></navigator>
<navigator (showAccountSettingsModal)="openModal($event)" (showDialogModalAction)="openModal($event)"></navigator>
<div class="content-container">
<div class="content-area" [class.container-override]="showSearch"
[class.content-area-override]="!shouldOverrideContent"

4
src/portal/src/app/base/navigator/navigator.component.html
View File

@ -13,7 +13,7 @@
</div>
<global-search></global-search>
<div class="header-actions">
<clr-dropdown class="dropdown bottom-left" *ngIf="!isIntegrationMode">
<clr-dropdown class="dropdown-lang dropdown bottom-left" *ngIf="!isIntegrationMode">
<button class="nav-icon nav-icon-width" clrDropdownToggle>
<clr-icon shape="world" class="icon-left"></clr-icon>
<span class="currentLang">{{currentLang}}</span>
@ -28,6 +28,7 @@
<a href="javascript:void(0)" clrDropdownItem (click)='switchLanguage("tr-tr")' [class.lang-selected]='matchLang("tr-tr")'>Türkçe</a>
</clr-dropdown-menu>
</clr-dropdown>
<div class="nav-divider"></div>
<clr-dropdown class="dropdown" *ngIf="isSessionValid">
<button class="nav-text" clrDropdownToggle>
<clr-icon shape="user" class="is-inverse user-icon" size="24"></clr-icon>
@ -42,7 +43,6 @@
<a href="javascript:void(0)" clrDropdownItem (click)="logOut()">{{'ACCOUNT_SETTINGS.LOGOUT' | translate}}</a>
</clr-dropdown-menu>
</clr-dropdown>
<div class="nav-divider" *ngIf="!isSessionValid"></div>
<a href="javascript:void(0)" id="aboutMenu" class="nav-link nav-text nav-about-link" (click)="openAboutDialog()" *ngIf="!isSessionValid">{{'ACCOUNT_SETTINGS.ABOUT' | translate}}</a>
</div>
</clr-header>

11
src/portal/src/app/base/navigator/navigator.component.scss
View File

@ -31,8 +31,10 @@
}
.nav-about-link {
padding-left: 12px !important;
padding-right: 12px !important;
padding-left: 1.6rem !important;
padding-right: 1rem !important;
min-width: 125px;
text-align: left !important;
}
.harbor-logo {
@ -47,7 +49,7 @@
left: -8px;
}
.currentLang {
padding-right: 8px;
padding-right: 30px;
}
}
@ -62,4 +64,7 @@
}
.dropdown-item {
outline: none;
}
.dropdown-lang {
padding-right: 1.3rem;
}

6
src/portal/src/app/base/navigator/navigator.component.ts
View File

@ -38,7 +38,7 @@ import { SkinableConfig } from "../../skinable-config.service";
export class NavigatorComponent implements OnInit {
// constructor(private router: Router){}
@Output() showAccountSettingsModal = new EventEmitter<ModalEvent>();
@Output() showPwdChangeModal = new EventEmitter<ModalEvent>();
@Output() showDialogModalAction = new EventEmitter<ModalEvent>();
selectedLang: string = enLang;
appTitle: string = 'APP_TITLE.HARBOR';
@ -132,7 +132,7 @@ export class NavigatorComponent implements OnInit {
// Open change password dialog
openChangePwdModal(): void {
this.showPwdChangeModal.emit({
this.showDialogModalAction.emit({
modalName: modalEvents.CHANGE_PWD,
modalFlag: true
});
@ -140,7 +140,7 @@ export class NavigatorComponent implements OnInit {
// Open about dialog
openAboutDialog(): void {
this.showPwdChangeModal.emit({
this.showDialogModalAction.emit({
modalName: modalEvents.ABOUT,
modalFlag: true
});

2
src/portal/src/app/sign-in/sign-in.component.html
View File

@ -1,6 +1,6 @@
<clr-main-container>
<global-message [isAppLevel]="true"></global-message>
<navigator (showPwdChangeModal)="openModal($event)"></navigator>
<navigator (showDialogModalAction)="openModal($event)"></navigator>
<search-result></search-result>
<div class="login-wrapper" [ngStyle]="{'background-image': customLoginBgImg? 'url(/images/' + customLoginBgImg + ')': ''}">
<form #signInForm="ngForm" class="login">