mirror of
https://github.com/goharbor/harbor.git
synced 2025-02-17 04:11:24 +01:00
Fix readonly mode show in vic and rewording the tooltip
Hidden readonly mode on vic Reword the tooltip
This commit is contained in:
parent
800870448f
commit
02b00724f9
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "harbor-ui",
|
"name": "harbor-ui",
|
||||||
"version": "0.7.0",
|
"version": "0.7.1",
|
||||||
"description": "Harbor shared UI components based on Clarity and Angular4",
|
"description": "Harbor shared UI components based on Clarity and Angular4",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "ng serve --host 0.0.0.0 --port 4500 --proxy-config proxy.config.json",
|
"start": "ng serve --host 0.0.0.0 --port 4500 --proxy-config proxy.config.json",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "harbor-ui",
|
"name": "harbor-ui",
|
||||||
"version": "0.7.0",
|
"version": "0.7.1",
|
||||||
"description": "Harbor shared UI components based on Clarity and Angular4",
|
"description": "Harbor shared UI components based on Clarity and Angular4",
|
||||||
"author": "VMware",
|
"author": "VMware",
|
||||||
"module": "index.js",
|
"module": "index.js",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
export const REGISTRY_CONFIG_HTML: string = `
|
export const REGISTRY_CONFIG_HTML: string = `
|
||||||
<div>
|
<div>
|
||||||
<system-settings #systemSettings [(systemSettings)]="config" [showSubTitle]="true" [hasAdminRole]="hasAdminRole" [hasCAFile]="hasCAFile"></system-settings>
|
<system-settings #systemSettings [(systemSettings)]="config" [showSubTitle]="true" [hasAdminRole]="hasAdminRole" [hasCAFile]="hasCAFile" [withAdmiral]="withAdmiral"></system-settings>
|
||||||
<vulnerability-config *ngIf="withClair" #vulnerabilityConfig [(vulnerabilityConfig)]="config" [showSubTitle]="true"></vulnerability-config>
|
<vulnerability-config *ngIf="withClair" #vulnerabilityConfig [(vulnerabilityConfig)]="config" [showSubTitle]="true"></vulnerability-config>
|
||||||
<div>
|
<div>
|
||||||
<button type="button" class="btn btn-primary" (click)="save()" [disabled]="shouldDisable">{{'BUTTON.SAVE' | translate}}</button>
|
<button type="button" class="btn btn-primary" (click)="save()" [disabled]="shouldDisable">{{'BUTTON.SAVE' | translate}}</button>
|
||||||
|
@ -57,6 +57,10 @@ export class RegistryConfigComponent implements OnInit {
|
|||||||
return this.systemInfo && this.systemInfo.with_clair;
|
return this.systemInfo && this.systemInfo.with_clair;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get withAdmiral(): boolean {
|
||||||
|
return this.systemInfo && this.systemInfo.with_admiral;
|
||||||
|
}
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
this.loadSystemInfo();
|
this.loadSystemInfo();
|
||||||
//Initialize
|
//Initialize
|
||||||
|
@ -27,7 +27,7 @@ export const SYSTEM_SETTINGS_HTML: string = `
|
|||||||
<span class="tooltip-content">{{'CONFIG.TOOLTIP.ROOT_CERT_DOWNLOAD' | translate}}</span>
|
<span class="tooltip-content">{{'CONFIG.TOOLTIP.ROOT_CERT_DOWNLOAD' | translate}}</span>
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
<div class="form-group">
|
<div *ngIf="!withAdmiral" class="form-group">
|
||||||
<label for="repoReadOnly">{{'CONFIG.REPO_READ_ONLY' | translate}}</label>
|
<label for="repoReadOnly">{{'CONFIG.REPO_READ_ONLY' | translate}}</label>
|
||||||
<clr-checkbox name="repoReadOnly" id="repoReadOnly" [clrChecked]="systemSettings.read_only.value" (clrCheckedChange)="setRepoReadOnlyValue($event)">
|
<clr-checkbox name="repoReadOnly" id="repoReadOnly" [clrChecked]="systemSettings.read_only.value" (clrCheckedChange)="setRepoReadOnlyValue($event)">
|
||||||
<a href="javascript:void(0)" role="tooltip" aria-haspopup="true" class="tooltip tooltip-top-right" style="top:-7px;">
|
<a href="javascript:void(0)" role="tooltip" aria-haspopup="true" class="tooltip tooltip-top-right" style="top:-7px;">
|
||||||
|
@ -28,6 +28,7 @@ export class SystemSettingsComponent {
|
|||||||
@Input() showSubTitle: boolean = false;
|
@Input() showSubTitle: boolean = false;
|
||||||
@Input() hasAdminRole: boolean = false;
|
@Input() hasAdminRole: boolean = false;
|
||||||
@Input() hasCAFile: boolean = false;
|
@Input() hasCAFile: boolean = false;
|
||||||
|
@Input() withAdmiral = false;
|
||||||
|
|
||||||
@ViewChild("systemConfigFrom") systemSettingsForm: NgForm;
|
@ViewChild("systemConfigFrom") systemSettingsForm: NgForm;
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
"clarity-icons": "0.10.24",
|
"clarity-icons": "0.10.24",
|
||||||
"clarity-ui": "0.10.24",
|
"clarity-ui": "0.10.24",
|
||||||
"core-js": "^2.4.1",
|
"core-js": "^2.4.1",
|
||||||
"harbor-ui": "0.7.0",
|
"harbor-ui": "0.7.1",
|
||||||
"intl": "^1.2.5",
|
"intl": "^1.2.5",
|
||||||
"mutationobserver-shim": "^0.3.2",
|
"mutationobserver-shim": "^0.3.2",
|
||||||
"ngx-cookie": "^1.0.0",
|
"ngx-cookie": "^1.0.0",
|
||||||
|
@ -489,7 +489,7 @@
|
|||||||
"ROOT_CERT_DOWNLOAD": "Download the root certificate of registry.",
|
"ROOT_CERT_DOWNLOAD": "Download the root certificate of registry.",
|
||||||
"SCANNING_POLICY": "Set image scanning policy based on different requirements. 'None': No active policy; 'Daily At': Triggering scanning at the specified time everyday.",
|
"SCANNING_POLICY": "Set image scanning policy based on different requirements. 'None': No active policy; 'Daily At': Triggering scanning at the specified time everyday.",
|
||||||
"VERIFY_CERT": "Verify Cert from LDAP Server",
|
"VERIFY_CERT": "Verify Cert from LDAP Server",
|
||||||
"REPO_TOOLTIP": "If true, means maintenance in Progress. During this period, you cannot delete repository, tag and push image."
|
"READONLY_TOOLTIP": "In read-only mode, you can not delete repositories or tags or push images. "
|
||||||
},
|
},
|
||||||
"LDAP": {
|
"LDAP": {
|
||||||
"URL": "LDAP URL",
|
"URL": "LDAP URL",
|
||||||
|
@ -489,7 +489,7 @@
|
|||||||
"ROOT_CERT_DOWNLOAD": "Download the root certificate of registry.",
|
"ROOT_CERT_DOWNLOAD": "Download the root certificate of registry.",
|
||||||
"SCANNING_POLICY": "Set image scanning policy based on different requirements. 'None': No active policy; 'Daily At': Triggering scanning at the specified time everyday.",
|
"SCANNING_POLICY": "Set image scanning policy based on different requirements. 'None': No active policy; 'Daily At': Triggering scanning at the specified time everyday.",
|
||||||
"VERIFY_CERT": "Verify Cert from LDAP Server",
|
"VERIFY_CERT": "Verify Cert from LDAP Server",
|
||||||
"REPO_TOOLTIP": "If true, means maintenance in Progress. During this period, you cannot delete repository, tag and push image."
|
"READONLY_TOOLTIP": "In read-only mode, you can not delete repositories or tags or push images. "
|
||||||
},
|
},
|
||||||
"LDAP": {
|
"LDAP": {
|
||||||
"URL": "LDAP URL",
|
"URL": "LDAP URL",
|
||||||
|
@ -454,8 +454,8 @@
|
|||||||
"TOKEN_EXPIRATION": "Le temps d'expiration (en minutes) d'un jeton créé par le service de jeton. La valeur par défaut est 30 minutes.",
|
"TOKEN_EXPIRATION": "Le temps d'expiration (en minutes) d'un jeton créé par le service de jeton. La valeur par défaut est 30 minutes.",
|
||||||
"PRO_CREATION_RESTRICTION": "L'indicateur pour définir quels utilisateurs ont le droit de créer des projets. Par défaut, tout le monde peut créer un projet. Définissez sur 'Administrateur Seulement' pour que seul un administrateur puisse créer un projet.",
|
"PRO_CREATION_RESTRICTION": "L'indicateur pour définir quels utilisateurs ont le droit de créer des projets. Par défaut, tout le monde peut créer un projet. Définissez sur 'Administrateur Seulement' pour que seul un administrateur puisse créer un projet.",
|
||||||
"ROOT_CERT_DOWNLOAD": "Téléchargez le certificat racine du dépôt.",
|
"ROOT_CERT_DOWNLOAD": "Téléchargez le certificat racine du dépôt.",
|
||||||
"SCANNING_POLICY": "Définissez la politique d'analyse des images en fonction des différentes exigences. 'Aucune' : pas de politique active; 'Tousles jours à' : déclenchement du balayage à l'heure spécifiée tous les jours."
|
"SCANNING_POLICY": "Définissez la politique d'analyse des images en fonction des différentes exigences. 'Aucune' : pas de politique active; 'Tousles jours à' : déclenchement du balayage à l'heure spécifiée tous les jours.",
|
||||||
"REPO_TOOLTIP": "If true, means maintenance in Progress. During this period, you cannot delete repository, tag and push image."
|
"READONLY_TOOLTIP": "In read-only mode, you can not delete repositories or tags or push images. "
|
||||||
},
|
},
|
||||||
"LDAP": {
|
"LDAP": {
|
||||||
"URL": "URL LDAP",
|
"URL": "URL LDAP",
|
||||||
|
@ -489,7 +489,7 @@
|
|||||||
"ROOT_CERT_DOWNLOAD": "下载镜像库根证书.",
|
"ROOT_CERT_DOWNLOAD": "下载镜像库根证书.",
|
||||||
"SCANNING_POLICY": "基于不同需求设置镜像扫描策略。‘无’:不设置任何策略;‘每日定时’:每天在设置的时间定时执行扫描。",
|
"SCANNING_POLICY": "基于不同需求设置镜像扫描策略。‘无’:不设置任何策略;‘每日定时’:每天在设置的时间定时执行扫描。",
|
||||||
"VERIFY_CERT": "检查来自LDAP服务端的证书",
|
"VERIFY_CERT": "检查来自LDAP服务端的证书",
|
||||||
"REPO_TOOLTIP": "选中,表示正在维护状态,不可删除仓库及标签,也不可以推送镜像。"
|
"READONLY_TOOLTIP": "选中,表示正在维护状态,不可删除仓库及标签,也不可以推送镜像。"
|
||||||
},
|
},
|
||||||
"LDAP": {
|
"LDAP": {
|
||||||
"URL": "LDAP URL",
|
"URL": "LDAP URL",
|
||||||
|
Loading…
Reference in New Issue
Block a user