OSM Version will be shown in the NG-UI Header && Design Changes

Change-Id: Ib2939ac61d42808a3b2e7bd945ed59ed4449a313
Signed-off-by: Barath Kumar R <barath.r@tataelxsi.co.in>

diff --git a/src/app/layouts/header/HeaderComponent.html b/src/app/layouts/header/HeaderComponent.html
index c7b3bae..4725920 100644 (file)
--- a/src/app/layouts/header/HeaderComponent.html
+++ b/src/app/layouts/header/HeaderComponent.html
@@ -27,6 +27,9 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
         <img routerLink="/" src="assets/images/logo.png" class="osm-logo" alt="OPEN SOURCE MANO" draggable="false">
     </a>
     <div class="nav navbar-nav nav-flex-icons ml-auto">
+        <h5>
+            <span class="badge badge-primary mt-2">{{'OSMVERSION' | translate}} {{sharedService.osmVersion}}</span>
+        </h5>
         <ul class="navbar-nav cursor-pointer" ngbDropdown display="dynamic" placement="bottom-right">
             <li class="nav-item dropdown">
                 <a class="nav-link dropdown-toggle" id="navbarDropdownProject" ngbDropdownToggle>
@@ -63,11 +66,6 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
                         <span>{{'PAGE.DASHBOARD.LOGOUT' | translate}}</span>
                         <i class="fas fa-sign-out-alt"></i>
                     </a>
-                    <div class="custom-divider"></div>
-                    <a *ngIf="sharedService.osmVersion" ngbDropdownItem class="dropdown-item project-item osm-version"
-                        href="javascript:void(0);">
-                        <span>{{'OSMVERSION' | translate}} {{sharedService.osmVersion}}</span>
-                    </a>
                 </div>
             </li>
         </ul>

diff --git a/src/app/utilities/loader/LoaderComponent.html b/src/app/utilities/loader/LoaderComponent.html
index 30ce264..132f54d 100644 (file)
--- a/src/app/utilities/loader/LoaderComponent.html
+++ b/src/app/utilities/loader/LoaderComponent.html
@@ -17,7 +17,7 @@ Author: KUMARAN M (kumaran.m@tataelxsi.co.in), RAJESH S (rajesh.s@tataelxsi.co.i
 -->
 <div class="loader-overlay">
   <div class="loader-content loader-center text-center">
-    <div class="loader">{{'LOADING' | translate}}...</div>
+    <div class="loader"></div>
     <p class="loader-text">
       <strong>{{getMessage | translate}}
         <span class="loader__dot" *ngFor="let index of [0,1,2]">.</span>

diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json
index 6fdbfaa..c57a06b 100644 (file)
--- a/src/assets/i18n/de.json
+++ b/src/assets/i18n/de.json
@@ -81,7 +81,6 @@
     "RECENTLY": "Vor kurzem",
     "TOPOLOGY": "Topologie",
     "PLEASEWAIT": "Warten Sie mal",
-    "LOADING": "Wird geladen",
     "RESOURCEORCHESTRATOR": "Ressource Orchestrator",
     "VIEW": "Aussicht",
     "DROP": "Fallen",

diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json
index f06d326..1698772 100644 (file)
--- a/src/assets/i18n/en.json
+++ b/src/assets/i18n/en.json
@@ -81,7 +81,6 @@
     "RECENTLY": "Recently",
     "TOPOLOGY": "Topology",
     "PLEASEWAIT": "Please Wait",
-    "LOADING": "Loading",
     "RESOURCEORCHESTRATOR": "Resource Orchestrator",
     "VIEW": "View",
     "DROP": "Drop",

diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json
index 9c5f4cd..e080ea8 100644 (file)
--- a/src/assets/i18n/es.json
+++ b/src/assets/i18n/es.json
@@ -81,7 +81,6 @@
     "RECENTLY": "Recientemente",
     "TOPOLOGY": "Topología",
     "PLEASEWAIT": "Por favor, espere",
-    "LOADING": "Cargando",
     "RESOURCEORCHESTRATOR": "Orquestador de recursos",
     "VIEW": "Ver",
     "DROP": "soltar",

diff --git a/src/assets/i18n/pt.json b/src/assets/i18n/pt.json
index 9274cb0..24b5300 100644 (file)
--- a/src/assets/i18n/pt.json
+++ b/src/assets/i18n/pt.json
@@ -81,7 +81,6 @@
     "RECENTLY": "Recentemente",
     "TOPOLOGY": "Topologia",
     "PLEASEWAIT": "Por favor, espere",
-    "LOADING": "Carregando",
     "RESOURCEORCHESTRATOR": "Orquestrador de Recursos",
     "VIEW": "Visão",
     "DROP": "Solta",