From 5cf28b526da41a41543b6b7d1f938a9489514b93 Mon Sep 17 00:00:00 2001
From: cyuamber <xuranyjy@chinamobile.com>
Date: Mon, 17 Jun 2019 11:03:26 +0800
Subject: Dashboard-list interface Function modification

Change-Id: If70b45acc611e1f8857d4c5f013f739868f19676
Issue-ID: DCAEGEN2-1624
Signed-off-by: cyuamber <xuranyjy@chinamobile.com>
---
 .../create-dashboard/create-dashboard.component.html      |  9 +++------
 .../dashboard-list/dashboard-list.component.html          |  7 +++++--
 .../dashboard-list/dashboard-list.component.ts            |  4 ++--
 .../admin/src/src/app/sidebar/sidebar.component.ts        |  2 +-
 .../datalake-handler/admin/src/src/assets/i18n/en-us.json | 13 +++++++------
 .../admin/src/src/assets/i18n/zh-hans.json                | 15 ++++++++-------
 .../admin/src/src/assets/i18n/zh-hant.json                | 15 ++++++++-------
 7 files changed, 34 insertions(+), 31 deletions(-)

(limited to 'components')

diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.html b/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.html
index 8ce28688..8996fce9 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.html
+++ b/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/create-dashboard/create-dashboard.component.html
@@ -88,14 +88,11 @@
           <div class="col-md-3">
             <div class="input-group">
               <div class="input-group-prepend">
-                <label class="input-group-text dl-input-chk-label">
-                  <input id="chkSsl" [(ngModel)]="this.tempDb.enabled" type="checkbox" />
-                  <span class="dl-input-checkmark"></span>
+                <label class="dl-switch">
+                  <input id="switch" type="checkbox" [(ngModel)]="this.tempDb.enabled" />
+                  <span class="dl-slider round"></span>
                 </label>
               </div>
-              <label class="form-control dl-input-chk" for="chkSsl">
-                Enable
-              </label>
             </div>
           </div>
         </div>
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.html b/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.html
index 3293aa84..316dee54 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.html
+++ b/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.html
@@ -22,8 +22,11 @@
 <div class="d-flex flex-wrap">
 
   <!-- Database list -->
-  <div *ngFor="let db of this.dbs;let thisIndex=index" class="col-sm-3 db-block">
-    <div class="db-panel" style="height: 100%;cursor: pointer" (click)="this.openDashboardModal(thisIndex)">
+  <div *ngFor="let db of this.dbs;let thisIndex=index" class="col-sm-2 db-block">
+    <div class="db-panel"
+         style="height: 100%;cursor: pointer"
+         (click)="this.openDashboardModal(thisIndex)"
+    >
       <div class="d-flex flex-column align-content-center" style="margin-top: 1.5rem;">
         <div class="ml-auto dropdown db-dropdown mr-2" data-boundary="window">
           <!--<a class="badge badge-light db-dropdown" data-toggle="dropdown" style="cursor: pointer">-->
diff --git a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.ts b/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.ts
index 206ae739..f0eac009 100644
--- a/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.ts
+++ b/components/datalake-handler/admin/src/src/app/dashboard-setting/dashboard-list/dashboard-list.component.ts
@@ -43,7 +43,7 @@ export class DashboardListComponent implements OnInit {
   loading: Boolean = true;
 
   tempDbDetail: Dashboard;
-  selectedLangs = sessionStorage.getItem("selectedLang");
+  selectedLangs = sessionStorage.getItem("selectedLang") || "en-us";
   dashboardDeteleModelShow = true;
 
   // nameArr = [];
@@ -107,7 +107,7 @@ export class DashboardListComponent implements OnInit {
 
   openDashboardModal(thisIndex: number) {
     var modalRef, index;
-    this.selectedLangs = sessionStorage.getItem("selectedLang");
+    this.selectedLangs = sessionStorage.getItem("selectedLang") || "en-us";
     let tips = "";
     index = thisIndex;
     console.log(index, "index,add or edit");
diff --git a/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.ts b/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.ts
index 11065d3d..0973d4d0 100644
--- a/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.ts
+++ b/components/datalake-handler/admin/src/src/app/sidebar/sidebar.component.ts
@@ -36,5 +36,5 @@ export class SidebarComponent implements OnInit {
 
   ngOnInit() {}
 
-  dashboard = true;
+  dashboard = false;
 }
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 b9a26f6a..d9645cea 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
@@ -4,7 +4,7 @@
     "TOPICS": "Topics",
     "DATABASE": "Database",
     "DASHBOARD":"Dashboard Setting",
-    "DASHBOARDLIST":"Dashboard List",
+    "DASHBOARDLIST":"Dashboard",
     "TEMPLATE":"Template",
     "ABOUT": "About"
   },
@@ -46,16 +46,17 @@
   "Cancel":"Cancel",
   "NewDashboard":"New dashboard",
   "DestinationType":"Destination type",
-  "InputValue":"input value",
+  "InputValue":"Default",
   "Username":"Username",
   "Password":"Password",
+  "Enabled":"Enabled",
 
 
   "No":"No",
-  "TEMPLATE_NAME":"Template name",
-  "TEMPLATE_TYPE":"Template type",
-  "TOPICS_NAME":"Topics name",
-  "DEPLOY_TO_DASHBOARD":"Deploy to dashboard",
+  "TEMPLATE_NAME":"Name",
+  "TEMPLATE_TYPE":"Type",
+  "TOPICS_NAME":"Topic",
+  "DEPLOY_TO_DASHBOARD":"Deploy",
   "DEPLOY":"Deploy",
   "NEW_TEMPLATE":"New template",
   "TEMPLATE_BODY":"Template Body"
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 0319443b..7fb095a4 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
@@ -4,7 +4,7 @@
     "TOPICS": "Topics",
     "DATABASE": "Database",
     "DASHBOARD":"仪表板设置",
-    "DASHBOARDLIST":"仪表板列表",
+    "DASHBOARDLIST":"仪表板",
     "TEMPLATE":"模板",
     "ABOUT": "About"
   },
@@ -46,15 +46,16 @@
   "Cancel":"取消",
   "NewDashboard":"新建仪表板",
   "DestinationType":"目标类型",
-  "InputValue":"输入值",
+  "InputValue":"默认",
   "Username":"用户名",
   "Password":"密码",
-  
+  "Enabled":"启用",
+
     "No":"No",
-  "TEMPLATE_NAME":"模板名称",
-  "TEMPLATE_TYPE":"模板类型",
-  "TOPICS_NAME":"Topics名称",
-  "DEPLOY_TO_DASHBOARD":"部署到仪表盘",
+  "TEMPLATE_NAME":"名称",
+  "TEMPLATE_TYPE":"类型",
+  "TOPICS_NAME":"主题",
+  "DEPLOY_TO_DASHBOARD":"部署",
   "DEPLOY":"部署",
   "NEW_TEMPLATE":"新建模板",
   "TEMPLATE_BODY":"模板体"
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 a52739ff..7c935f40 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
@@ -4,7 +4,7 @@
     "TOPICS": "Topics",
     "DATABASE": "Database",
     "DASHBOARD":"儀表板設置",
-    "DASHBOARDLIST":"儀表板列表",
+    "DASHBOARDLIST":"儀表板",
     "TEMPLATE":"模板",
     "ABOUT": "About"
   },
@@ -47,15 +47,16 @@
   "Cancel":"取消",
   "NewDashboard":"新建儀表板",
   "DestinationType":"目標類型",
-  "InputValue":"輸入值",
+  "InputValue":"默認",
   "Username":"用戶名",
   "Password":"密碼",
-  
+  "Enabled":"啟用",
+
     "No":"No",
-  "TEMPLATE_NAME":"模板名稱",
-  "TEMPLATE_TYPE":"模板類型",
-  "TOPICS_NAME":"Topics名稱",
-  "DEPLOY_TO_DASHBOARD":"部署到儀表板",
+  "TEMPLATE_NAME":"名稱",
+  "TEMPLATE_TYPE":"類型",
+  "TOPICS_NAME":"主題",
+  "DEPLOY_TO_DASHBOARD":"部署",
   "DEPLOY":"部署",
   "NEW_TEMPLATE":"新建模板",
   "TEMPLATE_BODY":"模板體"
-- 
cgit