Merge pull request #80 from jpkrohling/HAWKULAR-64-TimeoutIndicator

HAWKULAR-64 - Added logout indicator
hawkular · Apr 15, 2015 · ddd04c2 · ddd04c2
2 parents b63ebf2 + 07edc23
commit ddd04c2
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 26 deletions.
diff --git a/ui/console/src/main/scripts/bower.json b/ui/console/src/main/scripts/bower.json
@@ -17,7 +17,7 @@
     "hawtio-utilities": "2.0.21",
     "hawtio-template-cache": "2.0.2",
     "patternfly": "1.1.3",
-    "hawkular-ui-components": "^0.3.1"
+    "hawkular-ui-components": "^0.3.4"
   },
   "devDependencies": {
     "hawtio-core-dts": "2.0.17"

diff --git a/ui/console/src/main/webapp/index.html b/ui/console/src/main/webapp/index.html
@@ -28,32 +28,38 @@
 
   <body style="background-color: #f5f5f5" class="ng-cloak"> <!-- FIXME: Add CSS rule -->
     <nav class="navbar navbar-default navbar-fixed-top navbar-pf" role="navigation">
-      <div class="navbar-header">
-        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-1">
-          <span class="sr-only">Toggle navigation</span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-          <span class="icon-bar"></span>
-        </button>
-        <a class="navbar-brand" href="/">
-          <img id="hawkularLogo" src="resources/img/hawkular.png" alt="RED HAT JBOSS HAWKULAR Management Console" title="Hawkular">
-        </a>
+      <div data-idle-countdown="countdown" data-ng-init="countdown=30" id="idle">
+        <strong>You'll be logged out in {{countdown}} second(s).</strong>.
       </div>
-      <div class="collapse navbar-collapse navbar-collapse-1">
-        <ul class="nav navbar-nav navbar-utility pull-right">
-          <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-              <span class="pficon pficon-user"></span>
-              {{userDetails.username}} <b class="caret"></b>
-            </a>
-            <ul class="dropdown-menu">
-              <li>
-                <a href="#" data-ng-click="userDetails.logout()">Log Out</a>
-              </li>
-            </ul>
-          </li>
-        </ul>
-        <hawkular-topbar ng-controller="Topbar.TopbarController" ng-show="!hideSidebar"></hawkular-topbar>
+
+      <div>
+        <div class="navbar-header">
+          <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse-1">
+            <span class="sr-only">Toggle navigation</span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+            <span class="icon-bar"></span>
+          </button>
+          <a class="navbar-brand" href="/">
+            <img id="hawkularLogo" src="resources/img/hawkular.png" alt="RED HAT JBOSS HAWKULAR Management Console" title="Hawkular">
+          </a>
+        </div>
+        <div class="collapse navbar-collapse navbar-collapse-1">
+          <ul class="nav navbar-nav navbar-utility pull-right">
+            <li class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                <span class="pficon pficon-user"></span>
+                {{userDetails.username}} <b class="caret"></b>
+              </a>
+              <ul class="dropdown-menu">
+                <li>
+                  <a href="#" data-ng-click="userDetails.logout()">Log Out</a>
+                </li>
+              </ul>
+            </li>
+          </ul>
+          <hawkular-topbar ng-controller="Topbar.TopbarController" ng-show="!hideSidebar"></hawkular-topbar>
+        </div>
       </div>
     </nav>