From ee8a2fdda3553ca8f28c08f22227466c854a93c1 Mon Sep 17 00:00:00 2001
From: Sejun Ra <sejun@nflabs.com>
Date: Wed, 13 Jan 2016 11:42:30 +0900
Subject: [PATCH] Restore Navbar connection status for websocket only

---
 zeppelin-web/src/app/home/home.css                      | 2 +-
 zeppelin-web/src/components/navbar/navbar.controller.js | 3 ---
 zeppelin-web/src/components/navbar/navbar.html          | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/zeppelin-web/src/app/home/home.css b/zeppelin-web/src/app/home/home.css
index 6130c2e0e89..02021424415 100644
--- a/zeppelin-web/src/app/home/home.css
+++ b/zeppelin-web/src/app/home/home.css
@@ -184,7 +184,7 @@ a.navbar-brand:hover {
 
 .server-status {
   font-size: 12px;
-  margin-top: 6px;
+  margin-top: 8px;
 }
 
 .server-connected {
diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js
index 2f03e1a7b46..30e6ac27892 100644
--- a/zeppelin-web/src/components/navbar/navbar.controller.js
+++ b/zeppelin-web/src/components/navbar/navbar.controller.js
@@ -23,7 +23,6 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco
   vm.connected = websocketMsgSrv.isConnected();
   vm.websocketMsgSrv = websocketMsgSrv;
   vm.arrayOrderingSrv = arrayOrderingSrv;
-  vm.authenticated = $rootScope.ticket.principal !== 'anonymous';
 
   angular.element('#notebook-list').perfectScrollbar({suppressScrollX: true});
 
@@ -52,8 +51,6 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco
     websocketMsgSrv.getNotebookList();
   }
 
-  vm.authenticated = $rootScope.ticket.principal !== 'anonymous';
-
   function isActive(noteId) {
     return ($routeParams.noteId === noteId);
   }
diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html
index 20ee0241c90..86a85122add 100644
--- a/zeppelin-web/src/components/navbar/navbar.html
+++ b/zeppelin-web/src/components/navbar/navbar.html
@@ -73,8 +73,8 @@
         </li>
         <li class="server-status">
           <i class="fa fa-circle" ng-class="{'server-connected':navbar.connected, 'server-disconnected':!navbar.connected}"></i>
-          <span ng-show="navbar.authenticated">{{ticket.principal}} connected</span>
-          <span ng-show="!navbar.authenticated">Disconnected</span>
+          <span ng-show="navbar.connected">Connected</span>
+          <span ng-show="!navbar.connected">Disconnected</span>
         </li>
       </ul>
     </div>