From 397af582a223164a867e4285d175fbb9961bf9f7 Mon Sep 17 00:00:00 2001 From: Mia ZHOU Date: Thu, 26 Jul 2018 13:37:45 +0800 Subject: [PATCH] Replicate project error message is not correct Problem description: when user try to new a replication rule, he need to input source project name. In this case, if user input a project name not exist. The error message will be:"Please add a project name", this is not accurate. Fix: Modify the error message to "This project is not exist". Plus:Modify the error popup using standard tooltip component. --- .../create-edit-rule.component.html | 268 +++++++++--------- src/ui_ng/src/i18n/lang/en-us-lang.json | 2 +- src/ui_ng/src/i18n/lang/es-es-lang.json | 2 +- src/ui_ng/src/i18n/lang/fr-fr-lang.json | 2 +- src/ui_ng/src/i18n/lang/zh-cn-lang.json | 2 +- 5 files changed, 142 insertions(+), 134 deletions(-) diff --git a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html index 773516dcb..c312f8714 100644 --- a/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html +++ b/src/ui_ng/lib/src/create-edit-rule/create-edit-rule.component.html @@ -2,145 +2,153 @@

{{headerTitle | translate}}

- -
- {{deletedLabelInfo}} -
- {{'REPLICATION.ACKNOWLEDGE' | translate}} -
-
- -
-
-
- - -
- -
- - -
- -
- -
-
- - -
-
    -
  • {{project?.name}}
    • -
-
+ +
+ {{deletedLabelInfo}} +
+ {{'REPLICATION.ACKNOWLEDGE' | translate}}
-
-
- - -
- -
-
-
-
- -
-
- -
- - -
- -
- -
-
- -
-
- - {{'REPLICATION.ENDPOINTS' | translate}} -
- - -
- -
- -
- + +
+ +
- -
-
- + +
+ +
+
+ +
+
    +
  • {{project?.name}}
    • +
+
+
- - on   -
- -
- - at   -
-
-
- - {{'REPLICATION.DELETE_REMOTE_IMAGES' | translate}} - -
-
- - {{'REPLICATION.REPLICATE_IMMEDIATE' | translate}} - -
-
-
- -
-
+ + +
+ +
+
+
+
+ +
+ +
+ +
+ + +
+ +
+
+
+ +
+ + +
+ +
+ +
+
+ +
+
+ + {{'REPLICATION.ENDPOINTS' | translate}} +
+ + +
+ +
+ +
+ +
+ +
+
+ +
+ + on   +
+ +
+ + at   + +
+
+
+ + {{'REPLICATION.DELETE_REMOTE_IMAGES' | translate}} + +
+
+ + {{'REPLICATION.REPLICATE_IMMEDIATE' | translate}} + +
+
+
+ +
+
- +
- + \ No newline at end of file diff --git a/src/ui_ng/src/i18n/lang/en-us-lang.json b/src/ui_ng/src/i18n/lang/en-us-lang.json index b23d42bcf..8f70a20db 100644 --- a/src/ui_ng/src/i18n/lang/en-us-lang.json +++ b/src/ui_ng/src/i18n/lang/en-us-lang.json @@ -367,7 +367,7 @@ "JOB_PLACEHOLDER": "We couldn't find any replication jobs!", "JOB_LOG_VIEWER": "View Replication Job Log", "NO_ENDPOINT_INFO": "Please add an endpoint first", - "NO_PROJECT_INFO": "Please add a project name first", + "NO_PROJECT_INFO": "This project is not exist", "SOURCE_IMAGES_FILTER": "Source images filter", "SCHEDULE": "Scheduled", "MANUAL": "Manual", diff --git a/src/ui_ng/src/i18n/lang/es-es-lang.json b/src/ui_ng/src/i18n/lang/es-es-lang.json index 0e816b77e..e9734c6cd 100644 --- a/src/ui_ng/src/i18n/lang/es-es-lang.json +++ b/src/ui_ng/src/i18n/lang/es-es-lang.json @@ -367,7 +367,7 @@ "JOB_PLACEHOLDER": "We couldn't find any replication jobs!", "JOB_LOG_VIEWER": "View Replication Job Log", "NO_ENDPOINT_INFO": "Please add an endpoint first", - "NO_PROJECT_INFO": "Please add a project name first", + "NO_PROJECT_INFO": "This project is not exist", "SOURCE_IMAGES_FILTER": "Source images filter", "SCHEDULE": "Scheduled", "MANUAL": "Manual", diff --git a/src/ui_ng/src/i18n/lang/fr-fr-lang.json b/src/ui_ng/src/i18n/lang/fr-fr-lang.json index 9620f807a..09a7ce89e 100644 --- a/src/ui_ng/src/i18n/lang/fr-fr-lang.json +++ b/src/ui_ng/src/i18n/lang/fr-fr-lang.json @@ -347,7 +347,7 @@ "JOB_PLACEHOLDER": "Nous n'avons trouvé aucun travail de réplication !", "JOB_LOG_VIEWER": "Afficher les logs des travaux de réplication", "NO_ENDPOINT_INFO": "Please add an endpoint first", - "NO_PROJECT_INFO": "Please add a project name first", + "NO_PROJECT_INFO": "This project is not exist", "SOURCE_IMAGES_FILTER": "Source images filter", "SCHEDULE": "Scheduled", "MANUAL": "Manual", diff --git a/src/ui_ng/src/i18n/lang/zh-cn-lang.json b/src/ui_ng/src/i18n/lang/zh-cn-lang.json index 84f631c50..15304f08a 100644 --- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json +++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json @@ -367,7 +367,7 @@ "JOB_PLACEHOLDER": "未发现任何复制任务!", "JOB_LOG_VIEWER": "查看复制任务日志", "NO_ENDPOINT_INFO": "请先添加一个目标", - "NO_PROJECT_INFO": "请先添加一个项目名称", + "NO_PROJECT_INFO": "此项目不存在", "SOURCE_IMAGES_FILTER": "源镜像过滤器", "SCHEDULE": "定时", "MANUAL": "手动",