Merge pull request #517 from ammendonca/HWK-FIX-SUBTAB

Fix URLs SubTab not showing and pages not working
hawkular · Oct 2, 2015 · 9049668 · 9049668
2 parents 173e3a7 + 22ca04f
commit 9049668
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/console/src/main/scripts/plugins/directives/subtab/ts/subtabGlobals.ts b/console/src/main/scripts/plugins/directives/subtab/ts/subtabGlobals.ts
@@ -18,7 +18,7 @@
 /// <reference path='../../includes.ts'/>
 module Subtab {
 
-  export var pluginName = 'subdtab';
+  export var pluginName = 'subtab';
 
   export var log:Logging.Logger = Logger.get(pluginName);
 

diff --git a/console/src/main/scripts/plugins/directives/topbar/ts/topbarDirective.ts b/console/src/main/scripts/plugins/directives/topbar/ts/topbarDirective.ts
@@ -29,8 +29,8 @@ module Topbar {
   }
 
   export var TopbarController = _module.controller('Topbar.TopbarController',
-    ['$scope', '$rootScope', '$location',
-      ($scope, $rootScope, $location) => {
+    ['$scope', '$rootScope', '$location', 'HawkularNav',
+      ($scope, $rootScope, $location, HawkularNav /* keep HawkularNav! */) => {
 
         $scope.getClass = function (path) {
           return $location.path().indexOf(path) === 0 ? 'active' : '';

diff --git a/console/src/main/scripts/plugins/metrics/html/url-alerts.html b/console/src/main/scripts/plugins/metrics/html/url-alerts.html
@@ -1,13 +1,13 @@
 <div class="hk-screen-content" ng-controller="MetricsAlertController as mac">
-  <hawkular-sidebar ng-controller="Subtab.SubtabController">
+  <hawkular-subtab ng-controller="Subtab.SubtabController">
     <div class="hk-nav-tabs-container">
       <ul class="nav nav-tabs nav-tabs-pf">
         <li class="active"><a href="/hawkular-ui/url/alerts/{{mac.$routeParams.resourceId}}/{{mac.$routeParams.timeOffset}}" class="hk-alerts">All Alerts</a></li>
         <li><a href="/hawkular-ui/url/availability/{{mac.$routeParams.resourceId}}/{{mac.$routeParams.timeOffset}}" class="hk-availability">Availability</a></li>
         <li><a href="/hawkular-ui/url/response-time/{{mac.$routeParams.resourceId}}/{{mac.$routeParams.timeOffset}}" class="hk-response-time">Response Time</a></li>
       </ul>
     </div>
-  </hawkular-sidebar>
+  </hawkular-subtab>
 
   <section id="hk-alerts" class="hk-tab-content">
     <div class="hk-info-top clearfix">

diff --git a/console/src/main/scripts/plugins/metrics/html/url-availability.html b/console/src/main/scripts/plugins/metrics/html/url-availability.html
@@ -1,5 +1,5 @@
 <div class="hk-screen-content" ng-controller="MetricsAvailabilityController as vm">
-  <hawkular-sidebar ng-controller="Subtab.SubtabController">
+  <hawkular-subtab ng-controller="Subtab.SubtabController">
     <div class="hk-nav-tabs-container">
       <ul class="nav nav-tabs nav-tabs-pf">
         <li><a href="/hawkular-ui/url/alerts/{{vm.$routeParams.resourceId}}/{{vm.$routeParams.timeOffset}}"
@@ -11,7 +11,7 @@
                class="hk-response-time">Response Time</a></li>
       </ul>
     </div>
-  </hawkular-sidebar>
+  </hawkular-subtab>
 
   <section id="hk-availability" class="hk-tab-content">
 

diff --git a/console/src/main/scripts/plugins/metrics/html/url-response-time.html b/console/src/main/scripts/plugins/metrics/html/url-response-time.html
@@ -1,14 +1,14 @@
 <div class="hk-screen-content" ng-controller="MetricsViewController as vm">
 
-  <hawkular-sidebar ng-controller="Subtab.SubtabController">
+  <hawkular-subtab ng-controller="Subtab.SubtabController">
     <div class="hk-nav-tabs-container">
       <ul class="nav nav-tabs nav-tabs-pf">
         <li><a href="/hawkular-ui/url/alerts/{{vm.$routeParams.resourceId}}/{{vm.$routeParams.timeOffset}}" class="hk-alerts">All Alerts</a></li>
         <li><a href="/hawkular-ui/url/availability/{{vm.$routeParams.resourceId}}/{{vm.$routeParams.timeOffset}}" class="hk-availability">Availability</a></li>
         <li class="active"><a href="/hawkular-ui/url/response-time/{{vm.$routeParams.resourceId}}/{{vm.$routeParams.timeOffset}}" class="hk-response-time">Response Time</a></li>
       </ul>
     </div>
-  </hawkular-sidebar>
+  </hawkular-subtab>
 
   <section class="hk-tab-content" id="hk-response-time">