From 4730a131efd27170d5bb697fe1c3451c45730102 Mon Sep 17 00:00:00 2001 From: Mia ZHOU Date: Wed, 8 Aug 2018 15:23:06 +0800 Subject: [PATCH] UI changed after harbor moved to CNCF Changes include: 1 Modify the about dialog, remove vmware copyright 2 Remove VM tag in the login page. 3 Modify "vmware harbor" to "harbor" in login page. --- .../base/navigator/navigator.component.html | 2 +- .../about-dialog/about-dialog.component.html | 37 +++++++++--------- .../about-dialog/about-dialog.component.scss | 12 ++++-- src/ui_ng/src/i18n/lang/en-us-lang.json | 4 +- src/ui_ng/src/i18n/lang/es-es-lang.json | 4 +- src/ui_ng/src/i18n/lang/fr-fr-lang.json | 4 +- src/ui_ng/src/i18n/lang/zh-cn-lang.json | 4 +- src/ui_ng/src/images/harbor-black-logo.png | Bin 0 -> 7167 bytes 8 files changed, 35 insertions(+), 32 deletions(-) create mode 100644 src/ui_ng/src/images/harbor-black-logo.png diff --git a/src/ui_ng/src/app/base/navigator/navigator.component.html b/src/ui_ng/src/app/base/navigator/navigator.component.html index 4edc68761..b258f9a0f 100644 --- a/src/ui_ng/src/app/base/navigator/navigator.component.html +++ b/src/ui_ng/src/app/base/navigator/navigator.component.html @@ -1,7 +1,7 @@
- + {{customProjectName?.projectName? customProjectName?.projectName:(appTitle | translate)}} diff --git a/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html b/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html index 064ced42c..c44b3d935 100644 --- a/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html +++ b/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.html @@ -1,24 +1,23 @@ -

{{customName?.companyName? customName?.companyName : 'vmware'}}

-
-
-

{{customName?.projectName? customName?.projectName : ('APP_TITLE.HARBOR' | translate)}}

+
+
+
-
-
- {{'ABOUT.VERSION' | translate}} {{version}} -
-
-
-

{{'ABOUT.COPYRIGHT' | translate}} http://www.vmware.com/go/patents {{'ABOUT.COPYRIGHT_SUFIX' | translate}}

-

{{'ABOUT.TRADEMARK' | translate}}

-

- {{'ABOUT.OPEN_SOURCE_LICENSE' | translate}} -

-
-
-
-

{{customIntroduction}}

+
+
{{customName?.projectName? customName?.projectName : ('APP_TITLE.HARBOR' | translate)}}
+
+ {{'ABOUT.VERSION' | translate}} {{version}} +
+
+

{{'ABOUT.COPYRIGHT' | translate}} + http://www.vmware.com/go/patents {{'ABOUT.COPYRIGHT_SUFIX' | translate}}

+

+ {{'ABOUT.OPEN_SOURCE_LICENSE' | translate}} +

+
+
+

{{customIntroduction}}

+
diff --git a/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.scss b/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.scss index cb14978a2..54aeb8374 100644 --- a/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.scss +++ b/src/ui_ng/src/app/shared/about-dialog/about-dialog.component.scss @@ -1,7 +1,3 @@ -.margin-left-override { - margin-left: 24px !important; -} - .about-version { font-size: 14px; color: #565656; @@ -11,4 +7,12 @@ .about-build { font-size: 14px; color: #565656; +} + +.dialog-body { + display:flex; +} + +.content { + margin:0 10px 10px 10px; } \ 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 844d7f2bb..1c485f941 100644 --- a/src/ui_ng/src/i18n/lang/en-us-lang.json +++ b/src/ui_ng/src/i18n/lang/en-us-lang.json @@ -1,6 +1,6 @@ { "APP_TITLE": { - "VMW_HARBOR": "VMware Harbor", + "VMW_HARBOR": "Harbor", "HARBOR": "Harbor", "VIC": "vSphere Integrated Containers", "MGMT": "Management", @@ -646,7 +646,7 @@ "ABOUT": { "VERSION": "Version", "BUILD": "Build", - "COPYRIGHT": "Copyright 1998-2018 VMware, Inc. All rights reserved. This product is protected by U.S. and international property laws. VMware products are covered by one or more patents listed at", + "COPYRIGHT": "Project Harbor is an an open source trusted cloud native registry project that stores, signs, and scans content. Harbor extends the open source Docker Distribution by adding the functionalities usually required by users such as security, identity and management. Harbor supports advanced features such as user management, access control, activity monitoring, and replication between instances. Having a registry closer to the build and run environment can also improve image transfer efficiency.", "COPYRIGHT_SUFIX": ".", "TRADEMARK": "VMware is a registered trademark or trademark of VMware, Inc. in the United States and other jurisdictions. All other marks and names mentioned herein may be trademark of their respective companies.", "END_USER_LICENSE": "End User License Agreement", 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 0f4ba2a9e..f8f040ea1 100644 --- a/src/ui_ng/src/i18n/lang/es-es-lang.json +++ b/src/ui_ng/src/i18n/lang/es-es-lang.json @@ -1,6 +1,6 @@ { "APP_TITLE": { - "VMW_HARBOR": "VMware Harbor", + "VMW_HARBOR": "Harbor", "HARBOR": "Harbor", "VIC": "Contenedores Integrados vSphere", "MGMT": "Administración", @@ -644,7 +644,7 @@ "ABOUT": { "VERSION": "Versión", "BUILD": "Construir", - "COPYRIGHT": "Copyright 1998-2018 VMware, Inc. Todos los derechos reservados. Este producto está protegido por E.U. y las leyes de propiedad internacionales. Los productos de VMware estan cubiertos por una o más patentes listadas en", + "COPYRIGHT": "Project Harbor is an an open source trusted cloud native registry project that stores, signs, and scans content. Harbor extends the open source Docker Distribution by adding the functionalities usually required by users such as security, identity and management. Harbor supports advanced features such as user management, access control, activity monitoring, and replication between instances. Having a registry closer to the build and run environment can also improve image transfer efficiency.", "COPYRIGHT_SUFIX": ".", "TRADEMARK": "VMware es una marca registrada o marca de VMware, Inc. en los Estados Unidos y otras jurisdicciones. Todas las demás marcas y nombres mencionados son marcas de sus respectivas compañías.", "END_USER_LICENSE": "Contrato de Usuario Final (EULA)", 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 8683bd2cc..2a7979682 100644 --- a/src/ui_ng/src/i18n/lang/fr-fr-lang.json +++ b/src/ui_ng/src/i18n/lang/fr-fr-lang.json @@ -1,6 +1,6 @@ { "APP_TITLE": { - "VMW_HARBOR": "VMware Harbor", + "VMW_HARBOR": "Harbor", "HARBOR": "Harbor", "VIC": "vSphere Integrated Containers", "MGMT": "Management", @@ -608,7 +608,7 @@ "ABOUT": { "VERSION": "Version", "BUILD": "Build", - "COPYRIGHT": "Copyright 1998-2017 VMware, Inc. Tous droits réservés. Ce produit est protégé par les lois américaines et internationales sur la propriété intellectuelle. Les produits VMware sont couverts par un ou plusieurs brevets répertoriés à l'adresse suivante", + "COPYRIGHT": "Project Harbor is an an open source trusted cloud native registry project that stores, signs, and scans content. Harbor extends the open source Docker Distribution by adding the functionalities usually required by users such as security, identity and management. Harbor supports advanced features such as user management, access control, activity monitoring, and replication between instances. Having a registry closer to the build and run environment can also improve image transfer efficiency.", "COPYRIGHT_SUFIX": ".", "TRADEMARK": "VMware est une marque déposée ou une marque déposée de VMware, Inc. aux États-Unis et dans d'autres juridictions. Toutes les autres marques et noms mentionnés dans le présent document peuvent être des marques de commerce de leurs sociétés respectives.", "END_USER_LICENSE": "Contrat de licence utilisateur final", 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 efa056850..d305db1de 100644 --- a/src/ui_ng/src/i18n/lang/zh-cn-lang.json +++ b/src/ui_ng/src/i18n/lang/zh-cn-lang.json @@ -1,6 +1,6 @@ { "APP_TITLE": { - "VMW_HARBOR": "VMware Harbor", + "VMW_HARBOR": "Harbor", "HARBOR": "Harbor", "VIC": "vSphere Integrated Containers", "MGMT": "Management", @@ -644,7 +644,7 @@ "ABOUT": { "VERSION": "版本", "BUILD": "构建", - "COPYRIGHT": "版权所有 © 1998-2018 VMware, Inc. 保留所有权利。此产品受美国及其他国家/地区的版权和知识产权以及国际条约保护。VMware产品受", + "COPYRIGHT": "Harbor是一个用于存储和分发Docker镜像的企业级Registry服务器，通过添加一些企业必需的功能特性，例如安全、标识和管理等，扩展了开源Docker Distribution。作为一个企业级私有Registry服务器，Harbor提供了更好的性能和安全。提升用户使用Registry构建和运行环境传输镜像的效率。", "COPYRIGHT_SUFIX": "上列出的一项或多项专利保护。", "TRADEMARK": "VMware徽标及设计都是VMware, Inc.在美国和/或其他法律辖区的注册商标或者商标。此处提到的其他所有商标和名称分别是其各自公司的商标。", "END_USER_LICENSE": "终端用户许可协议", diff --git a/src/ui_ng/src/images/harbor-black-logo.png b/src/ui_ng/src/images/harbor-black-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..58d58d276d2530926bb61b87e645cc8d35794612 GIT binary patch literal 7167 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 literal 0 HcmV?d00001