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

Merge pull request #2959 from pengpengshui/master

Browse Source 
fix #2889 #2892 about tooltips of self-registration and member model add button problem
This commit is contained in:
Steven Zou 2017-08-04 10:03:26 +08:00 committed by GitHub
commit 1c3830086a
6 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ui_ng/src/app/config/auth/config-auth.component.html
View File

@ -131,7 +131,8 @@
<clr-checkbox name="selfReg" id="selfReg" [(ngModel)]="currentConfig.self_registration.value" [disabled]="disabled(currentConfig.self_registration)">
<a href="javascript:void(0)" role="tooltip" aria-haspopup="true" class="tooltip tooltip-top-right" style="top:-7px;">
<clr-icon shape="info-circle" class="info-tips-icon" size="24"></clr-icon>
<span class="tooltip-content">{{'CONFIG.TOOLTIP.SELF_REGISTRATION' | translate}}</span>
<span *ngIf="checkboxenable; else elseBlock" class="tooltip-content">{{'CONFIG.TOOLTIP.SELF_REGISTRATION_ENABLE' | translate}}</span>
<ng-template #elseBlock><span class="tooltip-content">{{'CONFIG.TOOLTIP.SELF_REGISTRATION_DISABLE' | translate}}</span></ng-template>
</a>
</clr-checkbox>
</div>

6
src/ui_ng/src/app/config/auth/config-auth.component.ts
View File

@ -28,6 +28,12 @@ export class ConfigurationAuthComponent {
@ViewChild("authConfigFrom") authForm: NgForm;
get checkboxenable(){
return this.currentConfig &&
this.currentConfig.self_registration &&
this.currentConfig.self_registration.value === true;
}
constructor() { }
public get showLdap(): boolean {

12
src/ui_ng/src/app/project/member/add-member/add-member.component.ts
View File

@ -19,7 +19,7 @@ import {
ViewChild,
AfterViewChecked,
OnInit,
OnDestroy
OnDestroy, ChangeDetectionStrategy, ChangeDetectorRef
} from '@angular/core';
import { Response } from '@angular/http';
import { NgForm } from '@angular/forms';
@ -40,7 +40,8 @@ import 'rxjs/add/operator/distinctUntilChanged';
@Component({
selector: 'add-member',
templateUrl: 'add-member.component.html',
styleUrls: ['add-member.component.css']
styleUrls: ['add-member.component.css'],
changeDetection: ChangeDetectionStrategy.OnPush
})
export class AddMemberComponent implements AfterViewChecked, OnInit, OnDestroy {
@ -71,7 +72,8 @@ export class AddMemberComponent implements AfterViewChecked, OnInit, OnDestroy {
constructor(private memberService: MemberService,
private messageHandlerService: MessageHandlerService,
private translateService: TranslateService) { }
private translateService: TranslateService,
private ref: ChangeDetectorRef) { }
ngOnInit(): void {
this.nameChecker
@ -140,6 +142,10 @@ export class AddMemberComponent implements AfterViewChecked, OnInit, OnDestroy {
}
}
);
setTimeout(() => {
setInterval(() => this.ref.markForCheck(), 100);
}, 1000);
}
onCancel() {

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

@ -391,7 +391,8 @@
"ROOT_CERT": "Registry Root Certificate",
"ROOT_CERT_LINK": "Download",
"TOOLTIP": {
"SELF_REGISTRATION": "Enable sign up.",
"SELF_REGISTRATION_ENABLE": "Enable sign up.",
"SELF_REGISTRATION_DISABLE": "Disable sign up.",
"VERIFY_REMOTE_CERT": "Determine whether the image replication should verify the certificate of a remote Harbor registry. Uncheck this box when the remote registry uses a self-signed or untrusted certificate.",
"AUTH_MODE": "By default the authentication mode is database, i.e. the credentials are stored in a local database. Set it to LDAP if you want to verify a user's credential against an LDAP server.",
"LDAP_SEARCH_DN": "A user's DN who has the permission to search the LDAP/AD server. If your LDAP/AD server does not support anonymous search, you should configure this DN and ldap_search_pwd.",

3
src/ui_ng/src/i18n/lang/es-es-lang.json
View File

@ -392,7 +392,8 @@
"ROOT_CERT": "Registro Certificado Raíz",
"ROOT_CERT_LINK": "Descargar",
"TOOLTIP": {
"SELF_REGISTRATION": "Activar registro.",
"SELF_REGISTRATION_ENABLE": "Activar registro.",
"SELF_REGISTRATION_DISABLE": "Disable sign up.",
"VERIFY_REMOTE_CERT": "Determina si la replicación de la imagen debería verificar el certificado de un registro Harbor remoto. Desmarque esta opción cuando el registro remoto use un certificado de confianza o autofirmado.",
"AUTH_MODE": "Por defecto el modo de autentificación es base de datos, es decir, las credenciales se almacenan en una base de datos local. Seleccione LDAP si quiere verificar las credenciales de usuarios a través del servidor LDAP.",
"LDAP_SEARCH_DN": "Un DN de usuario que tenga permisos para buscar el servidor LDAP/AD. Si el servidor LDAP/AD no soporta búsquedas anónimas, debería configurar este DN y ldap_search_pwd.",

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

@ -391,7 +391,8 @@
"ROOT_CERT": "镜像库根证书",
"ROOT_CERT_LINK": "下载",
"TOOLTIP": {
"SELF_REGISTRATION": "激活注册功能。",
"SELF_REGISTRATION_ENABLE": "激活注册功能。",
"SELF_REGISTRATION_DISABLE": "禁用注册功能。",
"VERIFY_REMOTE_CERT": "确定镜像复制是否要验证远程Harbor实例的证书。如果远程实例使用的是自签或者非信任证书，不要勾选此项。",
"AUTH_MODE": "默认认证模式为数据库认证，即用户凭证存储在本地数据库。如果使用LDAP来认证用户，则设置为LDAP。",
"LDAP_SEARCH_DN": "有搜索权限的LDAP用户DN。如果LDAP服务器不支持匿名搜索，则需要配置此DN及其密码。",