From 97b92c98baf4698f3bd696b243c26481bb1fe584 Mon Sep 17 00:00:00 2001 From: Yogi_Wang Date: Wed, 4 Dec 2019 17:58:27 +0800 Subject: [PATCH] Fix bug in master about 1.10 Signed-off-by: Yogi_Wang --- .../app/project/robot-account/robot-account.component.html | 6 ++++-- src/portal/src/i18n/lang/en-us-lang.json | 5 +++-- src/portal/src/i18n/lang/es-es-lang.json | 5 +++-- src/portal/src/i18n/lang/fr-fr-lang.json | 3 ++- src/portal/src/i18n/lang/pt-br-lang.json | 3 ++- src/portal/src/i18n/lang/tr-tr-lang.json | 3 ++- src/portal/src/i18n/lang/zh-cn-lang.json | 5 +++-- src/portal/src/lib/components/push-image/push-image.scss | 2 +- src/portal/src/lib/components/tag/tag.component.html | 2 +- src/portal/src/lib/components/tag/tag.component.scss | 4 ++++ 10 files changed, 25 insertions(+), 13 deletions(-) diff --git a/src/portal/src/app/project/robot-account/robot-account.component.html b/src/portal/src/app/project/robot-account/robot-account.component.html index 5ed649545..b371268de 100644 --- a/src/portal/src/app/project/robot-account/robot-account.component.html +++ b/src/portal/src/app/project/robot-account/robot-account.component.html @@ -43,16 +43,18 @@ {{'ROBOT_ACCOUNT.NAME' | translate}} {{'ROBOT_ACCOUNT.ENABLED_STATE' | translate}} - {{'ROBOT_ACCOUNT.EXPIRATION' | translate}} {{'ROBOT_ACCOUNT.DESCRIPTION' | translate}} + {{'ROBOT_ACCOUNT.CREATETION' | translate}} + {{'ROBOT_ACCOUNT.EXPIRATION' | translate}} {{r.name}} - {{r.expires_at * 1000 | date: 'short'}} {{r.description}} + {{r.creation_time | date: 'short'}} + {{r.expires_at * 1000 | date: 'short'}} {{pagination.firstItem + 1}} diff --git a/src/portal/src/i18n/lang/en-us-lang.json b/src/portal/src/i18n/lang/en-us-lang.json index d9258cdb5..d8a78eefb 100644 --- a/src/portal/src/i18n/lang/en-us-lang.json +++ b/src/portal/src/i18n/lang/en-us-lang.json @@ -323,6 +323,7 @@ "ENABLED_STATE": "Enabled state", "NUMBER_REQUIRED": "Field is required and should be an integer other than 0.", "DESCRIPTION": "Description", + "CREATETION": "Created time", "EXPIRATION": "Expiration", "TOKEN_EXPIRATION": "Robot Token Expiration (Days)", "ACTION": "Action", @@ -633,7 +634,7 @@ "DELETION_SUMMARY_REPO_SIGNED": "Repository '{{repoName}}' cannot be deleted because the following signed images existing.\n{{signedImages}} \nYou should unsign all the signed images before deleting the repository!", "DELETION_SUMMARY_REPO": "Do you want to delete repository {{repoName}}?", "DELETION_TITLE_TAG": "Confirm Tag Deletion", - "DELETION_SUMMARY_TAG": "Do you want to delete tag {{param}}?", + "DELETION_SUMMARY_TAG": "Do you want to delete tag {{param}}? If you delete this tag, all other tags referenced by the same digest will also be deleted", "DELETION_TITLE_TAG_DENIED": "Signed tag cannot be deleted", "DELETION_SUMMARY_TAG_DENIED": "The tag must be removed from the Notary before it can be deleted.\nDelete from Notary via this command:\n", "TAGS_NO_DELETE": "Delete is prohibited in read only mode.", @@ -988,7 +989,7 @@ "JOB_LOG_VIEWER": "View Scanning Job Log" }, "PUSH_IMAGE": { - "TITLE": "Push Image", + "TITLE": "Push Image Docker Command", "TOOLTIP": "Command references for pushing an image to this project.", "TAG_COMMAND": "Tag an image for this project:", "PUSH_COMMAND": "Push an image to this project:", diff --git a/src/portal/src/i18n/lang/es-es-lang.json b/src/portal/src/i18n/lang/es-es-lang.json index 6a9f765c1..53d995dfb 100644 --- a/src/portal/src/i18n/lang/es-es-lang.json +++ b/src/portal/src/i18n/lang/es-es-lang.json @@ -322,6 +322,7 @@ "TOKEN": "Token", "NEW_ROBOT_ACCOUNT": "NEW ROBOT ACCOUNT", "ENABLED_STATE": "Enabled state", + "CREATETION": "Created time", "EXPIRATION": "Expiration", "NUMBER_REQUIRED": "Field is required and should be an integer other than 0.", "TOKEN_EXPIRATION": "Robot Token Expiration (Days)", @@ -634,7 +635,7 @@ "DELETION_SUMMARY_REPO_SIGNED": "Repository '{{repoName}}' cannot be deleted because the following signed images existing.\n{{signedImages}} \nYou should unsign all the signed images before deleting the repository!", "DELETION_SUMMARY_REPO": "¿Quiere eliminar el repositorio {{repoName}}?", "DELETION_TITLE_TAG": "Confirmación de Eliminación de Etiqueta", - "DELETION_SUMMARY_TAG": "¿Quiere eliminar la etiqueta {{param}}?", + "DELETION_SUMMARY_TAG": "¿Quiere eliminar la etiqueta {{param}}? If you delete this tag, all other tags referenced by the same digest will also be deleted", "DELETION_TITLE_TAG_DENIED": "La etiqueta firmada no puede ser eliminada", "DELETION_SUMMARY_TAG_DENIED": "La etiqueta debe ser eliminada de la Notaría antes de eliminarla.\nEliminarla de la Notaría con este comando:\n", "TAGS_NO_DELETE": "Delete is prohibited in read only mode.", @@ -987,7 +988,7 @@ "JOB_LOG_VIEWER": "View Scanning Job Log" }, "PUSH_IMAGE": { - "TITLE": "Push Image", + "TITLE": "Push Image Docker Command", "TOOLTIP": "Command references for pushing an image to this project.", "TAG_COMMAND": "Tag an image for this project:", "PUSH_COMMAND": "Push an image to this project:", diff --git a/src/portal/src/i18n/lang/fr-fr-lang.json b/src/portal/src/i18n/lang/fr-fr-lang.json index 19dd92263..9252f6e04 100644 --- a/src/portal/src/i18n/lang/fr-fr-lang.json +++ b/src/portal/src/i18n/lang/fr-fr-lang.json @@ -313,6 +313,7 @@ "TOKEN": "gage ", "NEW_ROBOT_ACCOUNT": "nouveau robot compte ", "ENABLED_STATE": "état d 'activation", + "CREATETION": "Created time", "EXPIRATION": "Expiration", "NUMBER_REQUIRED": "Field is required and should be an integer other than 0.", "TOKEN_EXPIRATION": "Robot Token Expiration (Days)", @@ -623,7 +624,7 @@ "DELETION_SUMMARY_REPO_SIGNED": "Le Dépôt '{{repoName}}' ne peut pas être supprimé parce que les images suivantes signées existent. \n{{signedImages}} \nVous devez retirer la signature de toutes les images signées avant de supprimer le dépôt !", "DELETION_SUMMARY_REPO": "Voulez-vous supprimer le dépôt {{repoName}} ?", "DELETION_TITLE_TAG": "Confirmer la suppression du Tag", - "DELETION_SUMMARY_TAG": "Voulez-vous supprimer le tag {{param}}?", + "DELETION_SUMMARY_TAG": "Voulez-vous supprimer le tag {{param}}, If you delete this tag, all other tags referenced by the same digest will also be deleted?", "DELETION_TITLE_TAG_DENIED": "Un tag signé ne peut être supprimé", "DELETION_SUMMARY_TAG_DENIED": "La balise doit être supprimée du Résumé avant qu'elle ne puisse être supprimée. \nSupprimer du Résumé via cette commande: \n", "TAGS_NO_DELETE": "Upload/Delete is prohibited in read only mode.", diff --git a/src/portal/src/i18n/lang/pt-br-lang.json b/src/portal/src/i18n/lang/pt-br-lang.json index edd014fa7..0d770cfb9 100644 --- a/src/portal/src/i18n/lang/pt-br-lang.json +++ b/src/portal/src/i18n/lang/pt-br-lang.json @@ -319,6 +319,7 @@ "TOKEN": "Token", "NEW_ROBOT_ACCOUNT": "Novo robô conta", "ENABLED_STATE": "Enabled state", + "CREATETION": "Created time", "EXPIRATION": "Expiration", "NUMBER_REQUIRED": "Field is required and should be an integer other than 0.", "TOKEN_EXPIRATION": "Robot Token Expiration (Days)", @@ -633,7 +634,7 @@ "DELETION_SUMMARY_REPO_SIGNED": "Repositório '{{repoName}}' não pode ser removido pois existem as seguintes imagens assinadas.\n{{signedImages}} \nVocê deve remover a assinatura de todas as imagens assinadas antes de remover o repositório!", "DELETION_SUMMARY_REPO": "Você deseja remover o repositório {{repoName}}?", "DELETION_TITLE_TAG": "Confirmar remoção de Tag", - "DELETION_SUMMARY_TAG": "Você quer remover a Tag {{param}}?", + "DELETION_SUMMARY_TAG": "Você quer remover a Tag {{param}}? If you delete this tag, all other tags referenced by the same digest will also be deleted", "DELETION_TITLE_TAG_DENIED": "Tags assinadas não podem ser removidas", "DELETION_SUMMARY_TAG_DENIED": "A tag deve ser removida do Notary antes de ser apagada.\nRemova do Notary com o seguinte comando:\n", "TAGS_NO_DELETE": "Remover é proibido em modo somente leitura.", diff --git a/src/portal/src/i18n/lang/tr-tr-lang.json b/src/portal/src/i18n/lang/tr-tr-lang.json index 6faa8887d..51451d4dc 100644 --- a/src/portal/src/i18n/lang/tr-tr-lang.json +++ b/src/portal/src/i18n/lang/tr-tr-lang.json @@ -323,6 +323,7 @@ "ENABLED_STATE": "Etkin durum", "NUMBER_REQUIRED": "Alan zorunludur ve 0 dışında bir tam sayı olmalıdır.", "DESCRIPTION": "Açıklama", + "CREATETION": "Created time", "EXPIRATION": "Süre Sonu", "TOKEN_EXPIRATION": "Robot Token Sona Ermesi (Günler)", "ACTION": "Eylem", @@ -632,7 +633,7 @@ "DELETION_SUMMARY_REPO_SIGNED": "Depo '{{repoName}}' aşağıdaki imzalanmış görüntüler mevcut olduğu için silinemez. \n {{signedImages}} \nBir depoyu silmeden önce imzalı tüm imajları imzalamanız gerekir!", "DELETION_SUMMARY_REPO": "Depoyu silmek istiyor musunuz?{{repoName}}?", "DELETION_TITLE_TAG": "Etiket Silme İşlemini Onayla", - "DELETION_SUMMARY_TAG": "Etiketi silmek ister misiniz {{param}}?", + "DELETION_SUMMARY_TAG": "Etiketi silmek ister misiniz {{param}}? If you delete this tag, all other tags referenced by the same digest will also be deleted", "DELETION_TITLE_TAG_DENIED": "İmzalı etiket silinemez", "DELETION_SUMMARY_TAG_DENIED": "Etiket silinmeden önce Harbordan kaldırılmalıdır. \nBu komutla Harbor'den silin: \n", "TAGS_NO_DELETE": "Salt okunur modda silmek yasaktır.", diff --git a/src/portal/src/i18n/lang/zh-cn-lang.json b/src/portal/src/i18n/lang/zh-cn-lang.json index 04d1f426e..a985de820 100644 --- a/src/portal/src/i18n/lang/zh-cn-lang.json +++ b/src/portal/src/i18n/lang/zh-cn-lang.json @@ -320,6 +320,7 @@ "TOKEN": "令牌", "NEW_ROBOT_ACCOUNT": "添加机器人账户", "ENABLED_STATE": "启用状态", + "CREATETION": "创建时间", "EXPIRATION": "过期时间", "NUMBER_REQUIRED": "此项为必填项且为不为0的整数。", "TOKEN_EXPIRATION": "机器人账户令牌过期时间(天)", @@ -634,7 +635,7 @@ "DELETION_SUMMARY_REPO_SIGNED": "镜像仓库 '{{repoName}}' 不能被删除，因为存在以下签名镜像.\n{{signedImages}} \n在删除镜像仓库前需先删除所有的签名镜像", "DELETION_SUMMARY_REPO": "确认删除镜像仓库 {{repoName}}?", "DELETION_TITLE_TAG": "删除镜像标签确认", - "DELETION_SUMMARY_TAG": "确认删除镜像标签 {{param}}?", + "DELETION_SUMMARY_TAG": "确认删除镜像标签 {{param}}? 如果您删除此标签，则这个标签引用的同一个digest的所有其他标签也将被删除", "DELETION_TITLE_TAG_DENIED": "已签名的镜像不能被删除", "DELETION_SUMMARY_TAG_DENIED": "要删除此镜像标签必须首先从Notary中删除。\n请执行如下Notary命令删除:\n", "TAGS_NO_DELETE": "在只读模式下删除是被禁止的", @@ -987,7 +988,7 @@ "JOB_LOG_VIEWER": "查看扫描日志" }, "PUSH_IMAGE": { - "TITLE": "推送镜像", + "TITLE": "推送镜像的Docker命令", "TOOLTIP": "推送一个镜像到当前项目的参考命令。", "TAG_COMMAND": "在项目中标记镜像：", "PUSH_COMMAND": "推送镜像到当前项目：", diff --git a/src/portal/src/lib/components/push-image/push-image.scss b/src/portal/src/lib/components/push-image/push-image.scss index 74835d8ae..c73650edc 100644 --- a/src/portal/src/lib/components/push-image/push-image.scss +++ b/src/portal/src/lib/components/push-image/push-image.scss @@ -41,7 +41,7 @@ } .btn-font { - font-size: 14px !important; + font-size: 13px !important; } .hide{ display:none; diff --git a/src/portal/src/lib/components/tag/tag.component.html b/src/portal/src/lib/components/tag/tag.component.html index a32eefe7e..5c5c1c055 100644 --- a/src/portal/src/lib/components/tag/tag.component.html +++ b/src/portal/src/lib/components/tag/tag.component.html @@ -159,7 +159,7 @@ {{pagination.firstItem + 1}} - {{pagination.lastItem + 1}} {{'REPOSITORY.OF' | translate}} {{pagination.totalItems}} {{'REPOSITORY.ITEMS' | translate}}     - + diff --git a/src/portal/src/lib/components/tag/tag.component.scss b/src/portal/src/lib/components/tag/tag.component.scss index 9402ad9dc..852fee493 100644 --- a/src/portal/src/lib/components/tag/tag.component.scss +++ b/src/portal/src/lib/components/tag/tag.component.scss @@ -271,4 +271,8 @@ clr-datagrid { } .max-width-100 { max-width: 100%; +} + +clr-datagrid { + height: auto !important; } \ No newline at end of file