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

Merge pull request #9038 from AllForNothing/button

Browse Source 
change button text from "ADD SYSTEM" to "COPY FROM SYSTEM"
This commit is contained in:
Will Sun 2019-09-11 09:26:14 +08:00 committed by GitHub
commit c179f4f695
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/portal/lib/src/project-policy-config/project-policy-config.component.html
View File

@ -99,7 +99,7 @@
<label>{{'CVE_WHITELIST.PRO_WHITELIST'|translate}}</label>
</clr-radio-wrapper>
</clr-radio-container>
<div class="clr-row width-70per">
<div class="clr-row width-90per">
<div class="clr-col position-relative">
<div>
<button id="show-add-modal" [disabled]="isUseSystemWhitelist() || !hasChangeConfigRole"
@ -175,4 +175,4 @@
| translate}}</button>
<confirmation-dialog #cfgConfirmationDialog (confirmAction)="confirmCancel($event)"></confirmation-dialog>
</section>
</form>
</form>

6
src/portal/lib/src/project-policy-config/project-policy-config.component.scss
View File

@ -14,7 +14,7 @@
border-radius: 3px;
padding: 12px;
height: 224px;
width: 222px;
width: 270px;
color: #0079bb;
overflow-y: auto;
li {
@ -24,8 +24,8 @@
}
}
.width-70per {
width: 70%;
.width-90per {
width: 90%;
}
.none {

4
src/portal/src/i18n/lang/en-us-lang.json
View File

@ -1128,10 +1128,10 @@
"NEVER_EXPIRES": "Never expires",
"PRO_WHITELIST_EXPLAIN": "Project whitelist allows vulnerabilities in this list to be ignored in this project when pushing and pulling images.",
"PRO_OR_SYS": "You can either use the default whitelist configured at the system level or click on 'Project whitelist' to create a new whitelist",
"MERGE_INTO": "Add individual CVE IDs before clicking 'ADD SYSTEM' to add system whitelist as well.",
"MERGE_INTO": "Add individual CVE IDs before clicking 'COPY FROM SYSTEM' to add system whitelist as well.",
"SYS_WHITELIST": "System whitelist",
"PRO_WHITELIST": "Project whitelist",
"ADD_SYSTEM": "ADD SYSTEM"
"ADD_SYSTEM": "COPY FROM SYSTEM"
},
"TAG_RETENTION": {
"TAG_RETENTION": "Tag Retention",

4
src/portal/src/i18n/lang/es-es-lang.json
View File

@ -1125,10 +1125,10 @@
"NEVER_EXPIRES": "Never expires",
"PRO_WHITELIST_EXPLAIN": "Project whitelist allows vulnerabilities in this list to be ignored in this project when pushing and pulling images.",
"PRO_OR_SYS": "You can either use the default whitelist configured at the system level or click on 'Project whitelist' to create a new whitelist",
"MERGE_INTO": "Add individual CVE IDs before clicking 'ADD SYSTEM' to add system whitelist as well.",
"MERGE_INTO": "Add individual CVE IDs before clicking 'COPY FROM SYSTEM' to add system whitelist as well.",
"SYS_WHITELIST": "System whitelist",
"PRO_WHITELIST": "Project whitelist",
"ADD_SYSTEM": "ADD SYSTEM"
"ADD_SYSTEM": "COPY FROM SYSTEM"
},
"TAG_RETENTION": {
"TAG_RETENTION": "Tag Retention",

4
src/portal/src/i18n/lang/fr-fr-lang.json
View File

@ -1097,10 +1097,10 @@
"NEVER_EXPIRES": "Never expires",
"PRO_WHITELIST_EXPLAIN": "Project whitelist allows vulnerabilities in this list to be ignored in this project when pushing and pulling images.",
"PRO_OR_SYS": "You can either use the default whitelist configured at the system level or click on 'Project whitelist' to create a new whitelist",
"MERGE_INTO": "Add individual CVE IDs before clicking 'ADD SYSTEM' to add system whitelist as well.",
"MERGE_INTO": "Add individual CVE IDs before clicking 'COPY FROM SYSTEM' to add system whitelist as well.",
"SYS_WHITELIST": "System whitelist",
"PRO_WHITELIST": "Project whitelist",
"ADD_SYSTEM": "ADD SYSTEM"
"ADD_SYSTEM": "COPY FROM SYSTEM"
},
"TAG_RETENTION": {
"TAG_RETENTION": "Tag Retention",

4
src/portal/src/i18n/lang/pt-br-lang.json
View File

@ -1122,10 +1122,10 @@
"NEVER_EXPIRES": "Never expires",
"PRO_WHITELIST_EXPLAIN": "Project whitelist allows vulnerabilities in this list to be ignored in this project when pushing and pulling images.",
"PRO_OR_SYS": "You can either use the default whitelist configured at the system level or click on 'Project whitelist' to create a new whitelist",
"MERGE_INTO": "Add individual CVE IDs before clicking 'ADD SYSTEM' to add system whitelist as well.",
"MERGE_INTO": "Add individual CVE IDs before clicking 'COPY FROM SYSTEM' to add system whitelist as well.",
"SYS_WHITELIST": "System whitelist",
"PRO_WHITELIST": "Project whitelist",
"ADD_SYSTEM": "ADD SYSTEM"
"ADD_SYSTEM": "COPY FROM SYSTEM"
},
"TAG_RETENTION": {
"TAG_RETENTION": "Tag Retention",

4
src/portal/src/i18n/lang/zh-cn-lang.json
View File

@ -1124,10 +1124,10 @@
"NEVER_EXPIRES": "永不过期",
"PRO_WHITELIST_EXPLAIN": "在推送和拉取镜像时，在项目的CVE白名单中的漏洞将会被忽略",
"PRO_OR_SYS": "您可以选择使用系统的CVE白名单作为该项目的白名单，也可勾选“启用项目白名单”项来建立该项目自己的CVE白名单，",
"MERGE_INTO": "您可以点击“添加系统白名单”项将系统白名单合并至该项目白名单中，并可为该项目白名单添加特有的CVE IDs",
"MERGE_INTO": "您可以点击“复制系统白名单”项将系统白名单合并至该项目白名单中，并可为该项目白名单添加特有的CVE IDs",
"SYS_WHITELIST": "启用系统白名单",
"PRO_WHITELIST": "启用项目白名单",
"ADD_SYSTEM": "添加系统白名单"
"ADD_SYSTEM": "复制系统白名单"
},
"TAG_RETENTION": {
"TAG_RETENTION": "Tag保留",