From b913ac72b16b7203406435e4f21d5844dc45e0e2 Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Thu, 20 Jun 2019 18:13:16 +0800
Subject: Menu bar function modification

Change-Id: I3c03f9ff655cce1ff1709b091899550e00a74be7
Issue-ID: DCAEGEN2-1624
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
 .../src/src/app/sidebar/sidebar.component.html     | 40 ++++++++--------------
 .../admin/src/src/assets/i18n/en-us.json           | 11 +++---
 .../admin/src/src/assets/i18n/zh-hans.json         |  1 +
 .../admin/src/src/assets/i18n/zh-hant.json         |  1 +
 4 files changed, 22 insertions(+), 31 deletions(-)

(limited to 'components/datalake-handler')

diff --git a/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.html b/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.html
index 658d005d..cf0a24e6 100644
--- a/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.html
+++ b/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.html
@@ -50,36 +50,24 @@ limitations under the License.
         </a>
       </li>
 
-      <li class="nav-item " >
-        <a  (click)="this.dashboard = !this.dashboard"
-            class="nav-link"
-            style="color: #ffffff!important;background: transparent!important;cursor: pointer"
-            [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}"
-            routerLink="{{dashboard==true?'/dashboard-setting/dashboard-list':'javascript:void(0)'}}"
+      <li class="nav-item">
+        <a class="nav-link" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}"
+           routerLink="/dashboard-setting/dashboard-list"
+        >
+          <i class="fas fa-external-link-alt" aria-hidden="true">&nbsp;</i>
+          {{"SIDEBAR.DASHBOARDLIST" | translate}}
+        </a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}"
+           routerLink="dashboard-setting/template"
         >
-          <i class="fas fa-chart-line" aria-hidden="true">&nbsp;</i>
-          {{"SIDEBAR.DASHBOARD" | translate}}
+          <i class="far fa-file-image" aria-hidden="true">&nbsp;</i>
+          {{"SIDEBAR.TEMPLATE" | translate}}
         </a>
-        <ul class="navbar-nav flex-column navbar-nav-nohover"  [ngbCollapse]="this.dashboard">
-          <li class="nav-item">
-            <a class="nav-link" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}"
-               routerLink="/dashboard-setting/dashboard-list"
-               style="padding-left: 23px;"
-            >
-              {{"SIDEBAR.DASHBOARDLIST" | translate}}
-            </a>
-          </li>
-          <li class="nav-item">
-            <a class="nav-link" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}"
-               routerLink="dashboard-setting/template"
-               style="padding-left: 23px;"
-            >
-              {{"SIDEBAR.TEMPLATE" | translate}}
-            </a>
-          </li>
-        </ul>
       </li>
 
+
       <li class="nav-item">
         <a class="nav-link" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}"
           routerLink="/about">
diff --git a/components/datalake-handler/admin/src/src/assets/i18n/en-us.json b/components/datalake-handler/admin/src/src/assets/i18n/en-us.json
index f149216c..8675df7d 100644
--- a/components/datalake-handler/admin/src/src/assets/i18n/en-us.json
+++ b/components/datalake-handler/admin/src/src/assets/i18n/en-us.json
@@ -3,9 +3,9 @@
     "FEDDFER": "DataLake Feeder",
     "TOPICS": "Topics",
     "DATABASE": "Database",
-    "DASHBOARD":"Dashboard Setting",
-    "DASHBOARDLIST":"portal",
-    "TEMPLATE":"design",
+    "DASHBOARD":"Portal Setting",
+    "DASHBOARDLIST":"Portal",
+    "TEMPLATE":"Design",
     "ABOUT": "About"
   },
 
@@ -39,12 +39,12 @@
   "TOPIC_DEFAULT_CONF_NOTICE": "Notice: This topic uses the default topics settings.",
 
   "HOME":"Home",
-  "ConfigDashboard":"Config Dashboard",
+  "ConfigDashboard":"Config Portal",
   "EDIT":"Edit",
   "OK":"OK",
   "Save":"Save",
   "Cancel":"Cancel",
-  "NewDashboard":"New dashboard",
+  "NewDashboard":"New Portal",
   "DestinationType":"Destination type",
   "InputValue":"Default",
   "Username":"Username",
@@ -60,6 +60,7 @@
   "DEPLOY":"Deploy",
   "NEW_TEMPLATE":"New design",
   "TEMPLATE_BODY":"Body",
+  "FIELUPLOAD":"fileUpload",
 
   "SUCCESSFULLY_CREARED":"Successfully created.",
   "FAILED_CREARED":"Failed updated.",
diff --git a/components/datalake-handler/admin/src/src/assets/i18n/zh-hans.json b/components/datalake-handler/admin/src/src/assets/i18n/zh-hans.json
index df90615b..df171b59 100644
--- a/components/datalake-handler/admin/src/src/assets/i18n/zh-hans.json
+++ b/components/datalake-handler/admin/src/src/assets/i18n/zh-hans.json
@@ -59,6 +59,7 @@
   "DEPLOY":"部署",
   "NEW_TEMPLATE":"新建模板",
   "TEMPLATE_BODY":"模板体",
+  "FIELUPLOAD":"文件上传",
 
   "SUCCESSFULLY_CREARED":"创建成功",
   "FAILED_CREARED":"创建失败",
diff --git a/components/datalake-handler/admin/src/src/assets/i18n/zh-hant.json b/components/datalake-handler/admin/src/src/assets/i18n/zh-hant.json
index 2e6d280a..48e370b0 100644
--- a/components/datalake-handler/admin/src/src/assets/i18n/zh-hant.json
+++ b/components/datalake-handler/admin/src/src/assets/i18n/zh-hant.json
@@ -60,6 +60,7 @@
   "DEPLOY":"部署",
   "NEW_TEMPLATE":"新建模板",
   "TEMPLATE_BODY":"模板體",
+  "FIELUPLOAD":"文件上傳",
 
   "SUCCESSFULLY_CREARED":"創建成功",
   "FAILED_CREARED":"創建失败",
-- 
cgit