From e83b652cfe588fcb4861fa2243bfdbfdfebdbe8f Mon Sep 17 00:00:00 2001
From: crusader <crusader@atgame.net>
Date: Tue, 23 Oct 2018 14:17:01 +0900
Subject: [PATCH] ing

---
 .../infra/detail/service.component.html       | 24 ++++++++++++++-----
 src/assets/i18n/en.json                       |  1 +
 src/assets/i18n/ko.json                       |  1 +
 .../logo/{logo_maria.svg => logo_mariadb.svg} |  0
 4 files changed, 20 insertions(+), 6 deletions(-)
 rename src/assets/image/node/logo/{logo_maria.svg => logo_mariadb.svg} (100%)

diff --git a/src/app/component/infra/detail/service.component.html b/src/app/component/infra/detail/service.component.html
index 3bd0325..e0bb17d 100644
--- a/src/app/component/infra/detail/service.component.html
+++ b/src/app/component/infra/detail/service.component.html
@@ -27,9 +27,25 @@
         <perfect-scrollbar>
 
           <ul class="key-value">
-            <li *ngIf="service.key">
+            <li *ngIf="service.serviceType">
+              {{ 'infra.detail.general.type' | translate }}
+              <span class="meta-value">{{service.serviceType}}</span>
+            </li>
+            <li *ngIf="service.serviceVendor">
+              {{ 'infra.detail.general.vendor' | translate }}
+              <span class="meta-value">{{service.serviceVendor}}</span>
+            </li>
+            <li *ngIf="service.name">
               {{ 'infra.detail.general.name' | translate }}
-              <span class="meta-value">{{service.key}}</span>
+              <span class="meta-value">{{service.name}}</span>
+            </li>
+            <li *ngIf="service.serviceVersion">
+              {{ 'infra.detail.general.version' | translate }}
+              <span class="meta-value">{{service.serviceVersion}}</span>
+            </li>
+            <li *ngIf="service.metaCryptoType && service.metaCryptoType.key !== 'NONE'">
+              {{ 'infra.detail.general.crypto_type' | translate }}
+              <span class="meta-value">{{service.metaCryptoType.name}}</span>
             </li>
             <li *ngIf="service.port">
               {{ 'infra.detail.general.port' | translate }}
@@ -43,10 +59,6 @@
               {{ 'infra.detail.general.description' | translate }}
               <span class="meta-value">{{service.description}}</span>
             </li>
-            <li *ngIf="service.metaCryptoType && service.metaCryptoType.key !== 'NONE'">
-              {{ 'infra.detail.general.crypto_type' | translate }}
-              <span class="meta-value">{{service.metaCryptoType.name}}</span>
-            </li>
           </ul>
         </perfect-scrollbar>
       </div>
diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index 2ebaeca..5519a86 100644
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -58,6 +58,7 @@
         "type": "Type",
         "vendor": "Vendor",
         "model": "Model",
+        "version": "Version",
         "os": "OS",
         "mac_address": "Mac Address",
         "name": "Name",
diff --git a/src/assets/i18n/ko.json b/src/assets/i18n/ko.json
index 16a3f78..1848480 100644
--- a/src/assets/i18n/ko.json
+++ b/src/assets/i18n/ko.json
@@ -58,6 +58,7 @@
         "type": "유형",
         "vendor": "벤더",
         "model": "모델",
+        "version": "버전",
         "os": "운영체제",
         "mac_address": "Mac 주소",
         "name": "이름",
diff --git a/src/assets/image/node/logo/logo_maria.svg b/src/assets/image/node/logo/logo_mariadb.svg
similarity index 100%
rename from src/assets/image/node/logo/logo_maria.svg
rename to src/assets/image/node/logo/logo_mariadb.svg