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

Modify cofiguration tooltip

Browse Source 
Refine the tooltip content in configuration tooltips
This commit is contained in:
Mia ZHOU 2018-08-03 12:55:35 +08:00
parent a7fc977bc3
commit 8e66d90904
7 changed files with 50 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ui_ng/lib/src/config/system/system-settings.component.html
View File

@ -1,6 +1,19 @@
<form #systemConfigFrom="ngForm" class="compact">
<section class="form-block" style="margin-top:0px;margin-bottom:0px;">
<label style="font-size:14px;font-weight:600;" *ngIf="showSubTitle">{{'CONFIG.SYSTEM' | translate}}</label>
<div class="form-group">
<label for="proCreation">{{'CONFIG.PRO_CREATION_RESTRICTION' | translate}}</label>
<div class="select">
<select id="proCreation" name="proCreation" [(ngModel)]="systemSettings.project_creation_restriction.value" [disabled]="disabled(systemSettings.project_creation_restriction)">
<option value="everyone">{{'CONFIG.PRO_CREATION_EVERYONE' | translate }}</option>
<option value="adminonly">{{'CONFIG.PRO_CREATION_ADMIN' | translate }}</option>
</select>
</div>
<a href="javascript:void(0)" role="tooltip" aria-haspopup="true" class="tooltip tooltip-lg tooltip-top-right" style="top: -1px;">
<clr-icon shape="info-circle" class="info-tips-icon" size="24"></clr-icon>
<span class="tooltip-content">{{'CONFIG.TOOLTIP.PRO_CREATION_RESTRICTION' | translate}}</span>
</a>
</div>
<div class="form-group">
<label for="tokenExpiration" class="required">{{'CONFIG.TOKEN_EXPIRATION' | translate}}</label>
<label for="tokenExpiration" aria-haspopup="true" role="tooltip" class="tooltip tooltip-validation tooltip-md tooltip-top-right" [class.invalid]="tokenExpirationInput.invalid && (tokenExpirationInput.dirty || tokenExpirationInput.touched)">

4
src/ui_ng/lib/src/config/system/system-settings.component.ts
View File

@ -44,6 +44,10 @@ export class SystemSettingsComponent {
this.systemSettings.read_only.value = $event;
}
disabled(prop: any): boolean {
return !(prop && prop.editable);
}
get canDownloadCert(): boolean {
return this.hasAdminRole && this.hasCAFile;
}

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

@ -15,7 +15,6 @@
</a>
</div>
</section>
<section class="form-block" *ngIf="showUAA">
<div class="form-group">
<label for="uaa-endpoint" class="required">{{'CONFIG.UAA.ENDPOINT' | translate}}</label>
@ -126,16 +125,6 @@
<span class="tooltip-content">{{'CONFIG.TOOLTIP.LDAP_SCOPE' | translate}}</span>
</a>
</div>
<div class="form-group">
<label for="ldapVerifyCert">{{'CONFIG.LDAP.VERIFY_CERT' | translate}}</label>
<clr-checkbox name="ldapVerifyCert" id="ldapVerifyCert" [clrChecked]="currentConfig.ldap_verify_cert.value" [clrDisabled]="disabled(currentConfig.ldap_scope)"
(clrCheckedChange)="setVerifyCertValue($event)">
<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.VERIFY_CERT' | translate}}</span>
</a>
</clr-checkbox>
</div>
<div class="form-group">
<label for="ldapGroupBaseDN">{{'CONFIG.LDAP.LDAP_GROUP_BASE_DN' | translate}}</label>
<input name="ldapGroupBaseDN" class="padding-right-28" type="text" #ldapGroupDNInput="ngModel" [(ngModel)]="currentConfig.ldap_group_base_dn.value"
@ -198,22 +187,8 @@
</clr-tooltip-content>
</clr-tooltip>
</div>
</section>
<section class="form-block">
<div class="form-group">
<label for="proCreation">{{'CONFIG.PRO_CREATION_RESTRICTION' | translate}}</label>
<div class="select">
<select id="proCreation" name="proCreation" [(ngModel)]="currentConfig.project_creation_restriction.value" [disabled]="disabled(currentConfig.project_creation_restriction)">
<option value="everyone">{{'CONFIG.PRO_CREATION_EVERYONE' | translate }}</option>
<option value="adminonly">{{'CONFIG.PRO_CREATION_ADMIN' | translate }}</option>
</select>
</div>
<a href="javascript:void(0)" role="tooltip" aria-haspopup="true" class="tooltip tooltip-lg tooltip-top-right" style="top: -1px;">
<clr-icon shape="info-circle" class="info-tips-icon" size="24"></clr-icon>
<span class="tooltip-content">{{'CONFIG.TOOLTIP.PRO_CREATION_RESTRICTION' | translate}}</span>
</a>
</div>
<div class="form-group" *ngIf="showSelfReg">
<label for="selfReg">{{'CONFIG.SELF_REGISTRATION' | translate}}</label>
<clr-checkbox name="selfReg" id="selfReg" [(ngModel)]="currentConfig.self_registration.value" [disabled]="disabled(currentConfig.self_registration)">
@ -227,4 +202,16 @@
</clr-checkbox>
</div>
</section>
<section>
<div class="form-group">
<label for="ldapVerifyCert">{{'CONFIG.LDAP.VERIFY_CERT' | translate}}</label>
<clr-checkbox name="ldapVerifyCert" id="ldapVerifyCert" [clrChecked]="currentConfig.ldap_verify_cert.value" [clrDisabled]="disabled(currentConfig.ldap_scope)"
(clrCheckedChange)="setVerifyCertValue($event)">
<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.VERIFY_CERT' | translate}}</span>
</a>
</clr-checkbox>
</div>
</section>
</form>

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

@ -592,15 +592,15 @@
"SCOPE": "LDAP Scope",
"VERIFY_CERT": "LDAP Verify Cert",
"LDAP_GROUP_BASE_DN": "LDAP Group Base DN",
"LDAP_GROUP_BASE_DN_INFO": "The base DN of your LDAP group.",
"LDAP_GROUP_BASE_DN_INFO": "The base DN from which to look up a group in LDAP/AD.",
"LDAP_GROUP_FILTER": "LDAP Group Filter",
"LDAP_GROUP_FILTER_INFO": "The filter of your LDAP group",
"LDAP_GROUP_FILTER_INFO": "The filter to look up an LDAP/AD group, use objectclass=groupOfNames by default.",
"LDAP_GROUP_GID": "LDAP Group GID",
"LDAP_GROUP_GID_INFO": "The Group gid of your LDAP group",
"LDAP_GROUP_GID_INFO": "The attribute used in a search to match a user, it could be uid, cn or other attributes depending on your LDAP/AD. the group in Harbor is named with this attribute by default.",
"LDAP_GROUP_ADMIN_DN": "LDAP Group Admin DN",
"LDAP_GROUP_ADMIN_DN_INFO": "The Admin DN of your LDAP group",
"LDAP_GROUP_ADMIN_DN_INFO": "Specify an LDAP group DN. all LDAP user in this group will have harbor admin privilege. Keep it blank if you do not want to.",
"GROUP_SCOPE": "LDAP Group Scope",
"GROUP_SCOPE_INFO": "The scope of your LDAP Group"
"GROUP_SCOPE_INFO": "The scope to search for groups, select Subtree by default."
},
"UAA": {

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

@ -547,15 +547,15 @@
"SCOPE": "LDAP Ámbito",
"VERIFY_CERT": "LDAP Verify Cert",
"LDAP_GROUP_BASE_DN": "LDAP Group Base DN",
"LDAP_GROUP_BASE_DN_INFO": "The base DN of your LDAP group.",
"LDAP_GROUP_BASE_DN_INFO": "The base DN from which to look up a group in LDAP/AD.",
"LDAP_GROUP_FILTER": "LDAP Group Filter",
"LDAP_GROUP_FILTER_INFO": "The filter of your LDAP group",
"LDAP_GROUP_FILTER_INFO": "The filter to look up an LDAP/AD group, use objectclass=groupOfNames by default.",
"LDAP_GROUP_GID": "LDAP Group GID",
"LDAP_GROUP_GID_INFO": "The Group gid of your LDAP group",
"LDAP_GROUP_GID_INFO": "The attribute used in a search to match a user, it could be uid, cn or other attributes depending on your LDAP/AD. the group in Harbor is named with this attribute by default.",
"LDAP_GROUP_ADMIN_DN": "LDAP Group Admin DN",
"LDAP_GROUP_ADMIN_DN_INFO": "The Admin DN of your LDAP group",
"LDAP_GROUP_ADMIN_DN_INFO": "Specify an LDAP group DN. all LDAP user in this group will have harbor admin privilege. Keep it blank if you do not want to.",
"GROUP_SCOPE": "LDAP Group Scope",
"GROUP_SCOPE_INFO": "The scope of your LDAP Group"
"GROUP_SCOPE_INFO": "The scope to search for groups, select Subtree by default."
},
"UAA": {
"ENDPOINT": "UAA Endpoint",

10
src/ui_ng/src/i18n/lang/fr-fr-lang.json
View File

@ -518,15 +518,15 @@
"SCOPE": "Scope LDAP",
"VERIFY_CERT": "LDAP Verify Cert",
"LDAP_GROUP_BASE_DN": "LDAP Group Base DN",
"LDAP_GROUP_BASE_DN_INFO": "The base DN of your LDAP group.",
"LDAP_GROUP_BASE_DN_INFO": "The base DN from which to look up a group in LDAP/AD.",
"LDAP_GROUP_FILTER": "LDAP Group Filter",
"LDAP_GROUP_FILTER_INFO": "The filter of your LDAP group",
"LDAP_GROUP_FILTER_INFO": "The filter to look up an LDAP/AD group, use objectclass=groupOfNames by default.",
"LDAP_GROUP_GID": "LDAP Group GID",
"LDAP_GROUP_GID_INFO": "The Group gid of your LDAP group",
"LDAP_GROUP_GID_INFO": "The attribute used in a search to match a user, it could be uid, cn or other attributes depending on your LDAP/AD. the group in Harbor is named with this attribute by default.",
"LDAP_GROUP_ADMIN_DN": "LDAP Group Admin DN",
"LDAP_GROUP_ADMIN_DN_INFO": "The Admin DN of your LDAP group",
"LDAP_GROUP_ADMIN_DN_INFO": "Specify an LDAP group DN. all LDAP user in this group will have harbor admin privilege. Keep it blank if you do not want to.",
"GROUP_SCOPE": "LDAP Group Scope",
"GROUP_SCOPE_INFO": "The scope of your LDAP Group"
"GROUP_SCOPE_INFO": "The scope to search for groups, select Subtree by default."
},
"SCANNING": {
"TRIGGER_SCAN_ALL_SUCCESS": "Déclenchement d'analyse globale avec succès !",

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

@ -545,15 +545,15 @@
"FILTER": "LDAP过滤器",
"UID": "LDAP用户UID",
"SCOPE": "LDAP搜索范围",
"VERIFY_CERT": "LDAP 检查证书",
"VERIFY_CERT": "LDAP检查证书",
"LDAP_GROUP_BASE_DN": "LDAP组基础DN",
"LDAP_GROUP_BASE_DN_INFO": "LDAP组的基础DN",
"LDAP_GROUP_BASE_DN_INFO": "LDAP/AD中，用于查找组的基础DN",
"LDAP_GROUP_FILTER": "LDAP组过滤器",
"LDAP_GROUP_FILTER_INFO": "LDAP组的过滤器",
"LDAP_GROUP_GID": "LDAP组GID",
"LDAP_GROUP_GID_INFO": "LDAP组的GID",
"LDAP_GROUP_FILTER_INFO": "LDAP组的过滤器，默认设置为objectclass=groupOfnames",
"LDAP_GROUP_GID": "LDAP组ID属性",
"LDAP_GROUP_GID_INFO": "LDAP组的GID,用于匹配用户的一个属性，可以是uid,cn或者其他属性",
"LDAP_GROUP_ADMIN_DN": "LDAP组管理员DN",
"LDAP_GROUP_ADMIN_DN_INFO": "LDAP组管理员DN",
"LDAP_GROUP_ADMIN_DN_INFO": "LDAP组管理员DN，所有组内用户都会有管理员权限，此属性可以为空",
"GROUP_SCOPE": "LDAP组搜索范围",
"GROUP_SCOPE_INFO": "搜索范围"
},