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 #1979 from steven-zou/master

Browse Source 
Fix ui bugs
This commit is contained in:
Steven Zou 2017-04-11 15:26:41 +08:00 committed by GitHub
commit b0c730a46f
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui_ng/src/app/account/sign-in/sign-in.component.html
View File

@ -3,7 +3,7 @@
<label class="title">{{appTitle | translate}}<span class="trademark">&#8482;</span>
</label>
<div class="login-group">
<label for="username" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-left" [class.invalid]="userNameInput.invalid && (userNameInput.dirty || userNameInput.touched)">
<label for="username" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-left">
<input class="username" type="text" required
[(ngModel)]="signInCredential.principal"
name="login_username" id="login_username" placeholder='{{"PLACEHOLDER.SIGN_IN_NAME" | translate}}'
@ -12,7 +12,7 @@
{{ 'TOOLTIP.SIGN_IN_USERNAME' | translate }}
</span>
</label>
<label for="username" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-left" [class.invalid]="passwordInput.invalid && (passwordInput.dirty || passwordInput.touched)">
<label for="username" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-left">
<input class="password" type="password" required
[(ngModel)]="signInCredential.password"
name="login_password" id="login_password" placeholder='{{"PLACEHOLDER.SIGN_IN_PWD" | translate}}'

14
src/ui_ng/src/app/account/sign-in/sign-in.component.ts
View File

@ -82,7 +82,7 @@ export class SignInComponent implements AfterViewChecked, OnInit {
//App title
public get appTitle(): string {
if(this.appConfig && this.appConfig.with_admiral){
if (this.appConfig && this.appConfig.with_admiral) {
return "APP_TITLE.VIC";
}
@ -191,7 +191,14 @@ export class SignInComponent implements AfterViewChecked, OnInit {
//Trigger the signin action
signIn(): void {
//Should validate input firstly
if (!this.isValid || this.isOnGoing) {
if (!this.isValid) {
//Set error status
this.signInStatus = signInStatusError;
return;
}
if (this.isOnGoing) {
//Ongoing, directly return
return;
}
@ -202,7 +209,8 @@ export class SignInComponent implements AfterViewChecked, OnInit {
this.session.signIn(this.signInCredential)
.then(() => {
//Set status
this.signInStatus = signInStatusNormal;
//Keep it ongoing to keep the button 'disabled'
//this.signInStatus = signInStatusNormal;
//Remeber me
this.remeberMe();

2
src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html
View File

@ -10,7 +10,7 @@
</div>
<div style="height: 12px;"></div>
<div>
<p class="p5">{{'ABOUT.COPYRIGHT' | translate}} <a href="http://www.vmware.com/go/patents" target="_blank" class="about-text-link">http://www.vmware.com/go/patents</a></p>
<p class="p5">{{'ABOUT.COPYRIGHT' | translate}} <a href="http://www.vmware.com/go/patents" target="_blank" class="about-text-link">http://www.vmware.com/go/patents</a> {{'ABOUT.COPYRIGHT_SUFIX' | translate}}</p>
<p class="p5">{{'ABOUT.TRADEMARK' | translate}}</p>
<p class="p5">
<a href="https://raw.githubusercontent.com/vmware/harbor/master/LICENSE" target="_blank">{{'ABOUT.OPEN_SOURCE_LICENSE' | translate}}</a>

3
src/ui_ng/src/i18n/lang/en-us-lang.json
View File

@ -405,12 +405,13 @@
"VERSION": "Version",
"BUILD": "Build",
"COPYRIGHT": "Copyright 1998-2017 VMware. Inc. All rights reserved. This product is protected by U.S. and international property laws. VMware products are covered by one or more patents listed at",
"COPYRIGHT_SUFIX": ".",
"TRADEMARK": "VMware is a registered trademark or trademark of VMware. Inc. in the United States and other jurisdictions. All other marks and names mentioned herein may be trademark of their respective companies.",
"END_USER_LICENSE": "End User License Agreement",
"OPEN_SOURCE_LICENSE": "Open Source/Third Party License"
},
"START_PAGE": {
"GETTING_START": "Project Harbor is an enterprise-class registry server that stores and distributes Docker images. Harbor extends the open source Docker Distribution by adding the functionalities usually required by an enterprise, such as security, identity and management. As an enterprise private registry, Harbor offers better performance and security.",
"GETTING_START": "",
"GETTING_START_TITLE": "Getting Started"
},
"TOP_REPO": "Popular Repositories",

7
src/ui_ng/src/i18n/lang/zh-cn-lang.json
View File

@ -404,13 +404,14 @@
"ABOUT": {
"VERSION": "版本",
"BUILD": "构建",
"COPYRIGHT": "Copyright 1998-2017 VMware. Inc. All rights reserved. This product is protected by U.S. and international property laws. VMware products are covered by one or more patents listed at",
"TRADEMARK": "VMware is a registered trademark or trademark of VMware. Inc. in the United States and other jurisdictions. All other marks and names mentioned herein may be trademark of their respective companies.",
"COPYRIGHT": "版权所有 © 1998-2017 VMware. Inc. 保留所有权利。此产品受美国及其他国家/地区的版权和知识产权以及国际条约保护。VMware产品受",
"COPYRIGHT_SUFIX": "上列出的一项或多项专利保护。",
"TRADEMARK": "VMware徽标及设计都是VMware. Inc.在美国和/或其他法律辖区的注册商标或者商标。此处提到的其他所有商标和名称分别是其各自公司的商标。",
"END_USER_LICENSE": "终端用户许可协议",
"OPEN_SOURCE_LICENSE": "开源/第三方许可协议"
},
"START_PAGE": {
"GETTING_START": "Project Harbor is an enterprise-class registry server that stores and distributes Docker images. Harbor extends the open source Docker Distribution by adding the functionalities usually required by an enterprise, such as security, identity and management. As an enterprise private registry, Harbor offers better performance and security.",
"GETTING_START": "",
"GETTING_START_TITLE": "从这开始"
},
"TOP_REPO": "受欢迎的镜像仓库",