Merge pull request #5556 from zhoumeina/pr/remove_vmware_ui_change

UI changed after harbor moved to CNCF
2024-11-29 21:54:13 +01:00 · 2018-08-10 13:52:19 +08:00 · 2018-08-10 13:52:19 +08:00 · 63b64527b5
commit 63b64527b5
parent 4dcea7dd8d 4730a131ef
8 changed files with 35 additions and 32 deletions
--- 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 @@
 <clr-header class="header-5 header"  [ngStyle]='{"background-color": customStyle?.headerBgColor?customStyle?.headerBgColor:"#004a70" }'>
    <div class="branding">
        <a href="javascript:void(0)" class="nav-link" (click)="homeAction()">
-            <clr-icon shape="vm-bug"  *ngIf="!customStyle?.headerLogo"></clr-icon>
+            <!-- <clr-icon shape="vm-bug"  *ngIf="!customStyle?.headerLogo"></clr-icon> -->
            <img [attr.src]="'static/images/'+customStyle?.headerLogo" *ngIf="customStyle?.headerLogo" style="width: 36px;height: 36px; object-fit: fill;">
            <span class="title">{{customProjectName?.projectName? customProjectName?.projectName:(appTitle | translate)}}</span>
        </a>
--- 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,26 +1,25 @@
 <clr-modal [(clrModalOpen)]="opened" [clrModalClosable]="false" [clrModalStaticBackdrop]="false">
-    <h3 class="modal-title margin-left-override">{{customName?.companyName? customName?.companyName : 'vmware'}}</h3>
-    <div class="modal-body margin-left-override">
-        <div>
-            <h2>{{customName?.projectName? customName?.projectName : ('APP_TITLE.HARBOR' | translate)}}</h2>
+    <div class="modal-body dialog-body">
+        <div class="harbor-logo-black">
+            <img [src]="'/static/images/harbor-black-logo.png'" onError="this.src='images/harbor-black-logo.png'">
        </div>
-        <div style="height: 12px;"></div>
+        <div class="content">
+            <div>{{customName?.projectName? customName?.projectName : ('APP_TITLE.HARBOR' | translate)}}</div>
            <div>
                <span class="p5 about-version">{{'ABOUT.VERSION' | translate}} {{version}}</span>
            </div>
-        <div style="height: 12px;"></div>
            <div *ngIf="!customIntroduction">
-            <p class="p5">{{'ABOUT.COPYRIGHT' | translate}} <a href="http://www.vmware.com/go/patents" target="_blank" class="about-text-link">http://www.vmware.com/go/patents</a> {{'ABOUT.COPYRIGHT_SUFIX' | translate}}</p>
-            <p class="p5">{{'ABOUT.TRADEMARK' | translate}}</p>
+                <p class="p5">{{'ABOUT.COPYRIGHT' | translate}}
+                    <a href="http://www.vmware.com/go/patents" target="_blank" class="about-text-link">http://www.vmware.com/go/patents</a> {{'ABOUT.COPYRIGHT_SUFIX' | translate}}</p>
                <p class="p5">
                    <a href="https://raw.githubusercontent.com/vmware/harbor/master/LICENSE" target="_blank">{{'ABOUT.OPEN_SOURCE_LICENSE' | translate}}</a>
                </p>
-            <div style="height: 24px;"></div>
            </div>
            <div *ngIf="customIntroduction">
                <p class="p5">{{customIntroduction}}</p>
            </div>
        </div>
+    </div>
    <div class="modal-footer margin-left-override">
        <button type="button" class="btn btn-primary" (click)="close()">{{'BUTTON.CLOSE' | translate}}</button>
    </div>
--- 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;
@ -12,3 +8,11 @@
    font-size: 14px;
    color: #565656;
 }
+
+.dialog-body {
+    display:flex;
+}
+
+.content {
+    margin:0 10px 10px 10px;
+}
--- 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",
@ -647,7 +647,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",
--- 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",
@ -645,7 +645,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)",
--- 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",
@ -609,7 +609,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",
--- 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",
@ -645,7 +645,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": "终端用户许可协议",
--- a/src/ui_ng/src/images/harbor-black-logo.png
+++ b/src/ui_ng/src/images/harbor-black-logo.png