From 5621e8341def5afd7b72e134c054f74e6e6ee895 Mon Sep 17 00:00:00 2001
From: César Calvo <ccalvo@curisit.net>
Date: Tue, 14 Mar 2017 18:17:42 +0000
Subject: [PATCH] #3527 - Main menu

---
 securis/src/main/webapp/src/app/home.component.html |   33 +++++++++++-----
 securis/src/main/webapp/src/app/home.component.ts   |   18 +++++----
 securis/src/main/webapp/src/lang/messages_en.json   |   10 +++++
 3 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/securis/src/main/webapp/src/app/home.component.html b/securis/src/main/webapp/src/app/home.component.html
index a4f8ee9..47a8ace 100644
--- a/securis/src/main/webapp/src/app/home.component.html
+++ b/securis/src/main/webapp/src/app/home.component.html
@@ -1,32 +1,32 @@
-<td-layout>
+<td-layout *ngIf="isLoggedIn">
   <td-navigation-drawer #mainMenu sidenavTitle="SeCuris">
   </td-navigation-drawer>
 
   <md-nav-list td-sidenav-content>
     <a routerLink="/packs" md-list-item (click)="closeMenu()">
       <md-icon md-list-avatar>view_compact</md-icon>
-      <h3 md-line> Packs </h3>
-      <p md-line> Packs to manage licenses </p>
+      <h3 md-line i18n="menu.packs">  </h3>
+      <p md-line i18n="menu.packs.description"> </p>
     </a>
     <a routerLink="/packs" md-list-item (click)="closeMenu()">
       <md-icon md-list-avatar>view_compact</md-icon>
-      <h3 md-line>Applications </h3>
-      <p md-line>Applications </p>
+      <h3 md-line i18n="menu.applications">  </h3>
+      <p md-line i18n="menu.applications.description"> </p>
     </a>
     <a routerLink="/packs" md-list-item (click)="closeMenu()">
       <md-icon md-list-avatar>view_compact</md-icon>
-      <h3 md-line>License types</h3>
-      <p md-line>License types</p>
+      <h3 md-line i18n="menu.license_types">  </h3>
+      <p md-line i18n="menu.license_types.description"> </p>
     </a>
     <a routerLink="/packs" md-list-item (click)="closeMenu()">
       <md-icon md-list-avatar>view_compact</md-icon>
-      <h3 md-line> Organizations </h3>
-      <p md-line> Organizations </p>
+      <h3 md-line i18n="menu.organizations">  </h3>
+      <p md-line i18n="menu.organizations.description"> </p>
     </a>
     <a routerLink="/packs" md-list-item (click)="closeMenu()">
       <md-icon md-list-avatar>view_compact</md-icon>
-      <h3 md-line> Users </h3>
-      <p md-line> Users </p>
+      <h3 md-line i18n="menu.users">  </h3>
+      <p md-line i18n="menu.users.description"> </p>
     </a>                
   </md-nav-list>
 
@@ -41,3 +41,14 @@
   </td-layout-footer>
 </td-layout-nav>
 </td-layout>
+
+<td-layout-nav *ngIf="!isLoggedIn" toolbarTitle="SeCuris" logo="assets:logo-white">
+	<router-outlet></router-outlet>
+  <td-layout-footer>
+	<div layout="row" layout-align="start center" flex>
+		<div flex layout="row" layout-align="start center">v. {{securisVersion}}</div>
+		<div flex layout="row" layout-align="center center"><a href="http://www.curistec.com/" target="_blank">CurisTec</a>&nbsp;©2017</div>
+		<div flex></div>
+	</div>
+  </td-layout-footer>
+</td-layout-nav>
diff --git a/securis/src/main/webapp/src/app/home.component.ts b/securis/src/main/webapp/src/app/home.component.ts
index e74963c..d905c50 100644
--- a/securis/src/main/webapp/src/app/home.component.ts
+++ b/securis/src/main/webapp/src/app/home.component.ts
@@ -22,7 +22,7 @@
   @ViewChild('mainMenu') mainMenu: TdNavigationDrawerComponent;
 
   securisVersion : string;
-  showMenu : boolean = false;
+  isLoggedIn : boolean = false;
 
   constructor(private userService: UserService,
               toaster: ToastsManager,
@@ -60,13 +60,15 @@
     this.mainMenu.close();
   }
 
-  ngAfterViewInit(): void {
-     // this.showMenu = true;    
-      this.media.broadcast();
+  ngOnInit(): void {
       this.userService.isLoggedIn().subscribe(authOk => {
-        //this.showMenu = authOk.valueOf();
-        this.router.navigateByUrl(authOk ? 'packs' : 'login');
-      }, 
-      err => /* Show message */ this.router.navigateByUrl('login'));
+        this.isLoggedIn = true//authOk.valueOf();
+        this.router.navigateByUrl(this.isLoggedIn ? 'packs' : 'login');
+      }  , 
+      err => /* Show message */ this.router.navigateByUrl('login'));  
+  }
+
+  ngAfterViewInit(): void {
+      this.media.broadcast();
   }
 }
diff --git a/securis/src/main/webapp/src/lang/messages_en.json b/securis/src/main/webapp/src/lang/messages_en.json
index eea7aca..6e275b0 100644
--- a/securis/src/main/webapp/src/lang/messages_en.json
+++ b/securis/src/main/webapp/src/lang/messages_en.json
@@ -30,6 +30,16 @@
 	"license.status.EX": "Expired",
 	"license.status.BL": "Blocked",
 	"license.status.CA": "Cancelled",
+	"menu.packs": "Packs",
+	"menu.packs.description": "Packs to manage licenses",
+	"menu.applications": "Applications",
+	"menu.applications.description": "Applications",
+	"menu.license_types": "License types",
+	"menu.license_types.description": "License types",
+	"menu.organizations": "Organizations",
+	"menu.organizations.description": "Organizations",
+	"menu.users": "Users",
+	"menu.users.description": "Users",
 	"": ""
 }
 

--
Gitblit v1.3.2