Fix #367

hawtio · Aug 6, 2013 · 8d4d68a · 8d4d68a
1 parent 495b9c9
commit 8d4d68a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 50 deletions.
diff --git a/hawtio-web/src/main/webapp/app/karaf/html/layoutKaraf.html b/hawtio-web/src/main/webapp/app/karaf/html/layoutKaraf.html
diff --git a/hawtio-web/src/main/webapp/app/karaf/js/karafPlugin.ts b/hawtio-web/src/main/webapp/app/karaf/js/karafPlugin.ts
@@ -2,38 +2,13 @@ module Karaf {
   var pluginName = 'karaf';
   angular.module(pluginName, ['bootstrap', 'ngResource', 'hawtioCore']).config(($routeProvider) => {
     $routeProvider.
-            when('/karaf/server', {templateUrl: 'app/karaf/html/server.html'}).
-            when('/karaf/features', {templateUrl: 'app/karaf/html/features.html'}).
-            when('/karaf/scr', {templateUrl: 'app/karaf/html/scr.html'}).
-            when('/karaf/feature/:name/:version', {templateUrl: 'app/karaf/html/feature.html'})
+            when('/osgi/server', {templateUrl: 'app/karaf/html/server.html'}).
+            when('/osgi/features', {templateUrl: 'app/karaf/html/features.html'}).
+            when('/osgi/scr', {templateUrl: 'app/karaf/html/scr.html'}).
+            when('/osgi/feature/:name/:version', {templateUrl: 'app/karaf/html/feature.html'})
   }).
       run((workspace:Workspace, viewRegistry) => {
 
-          viewRegistry['karaf'] = "app/karaf/html/layoutKaraf.html";
-
-            workspace.topLevelTabs.push( {
-              content: "Karaf",
-              title: "Visualise and manage the bundles and services in this OSGi container",
-              isValid: (workspace: Workspace) => workspace.treeContainsDomainAndProperties("org.apache.karaf"),
-              href: () => "#/karaf/server?tab=karafTab",
-              isActive: (workspace: Workspace) => workspace.isTopTabActive("karafTab")
-            });
-
-/*
-            workspace.subLevelTabs.push( {
-              content: '<i class="icon-list"></i> Server',
-              title: "View information about this OSGi container",
-              isValid: (workspace: Workspace) => workspace.isKarafFolder(),
-              href: () => "#/karaf/server"
-            });
-
-            workspace.subLevelTabs.push( {
-              content: '<i class="icon-list"></i> Features',
-              title: "View the available bundles in this OSGi container",
-              isValid: (workspace: Workspace) => getSelectionFeaturesMBean(workspace),
-              href: () => "#/karaf/features"
-            });
-*/
       });
 
   hawtioPluginLoader.addModule(pluginName);

diff --git a/hawtio-web/src/main/webapp/app/karaf/js/navbar.ts b/hawtio-web/src/main/webapp/app/karaf/js/navbar.ts
@@ -1,7 +1,8 @@
 module Karaf {
 
-  export function NavBarController($scope, $location, workspace:Workspace, jolokia) {
+  export function NavBarController($scope, workspace:Workspace) {
 
+    $scope.isKarafEnabled = workspace.treeContainsDomainAndProperties("org.apache.karaf")
     $scope.isFeaturesEnabled = Karaf.getSelectionFeaturesMBean(workspace);
     $scope.isScrEnabled = Karaf.getSelectionScrMBean(workspace);
 
@@ -10,4 +11,4 @@ module Karaf {
       return workspace.isLinkActive(nav);
     };
   }
-}
+}
diff --git a/hawtio-web/src/main/webapp/app/osgi/html/layoutOsgi.html b/hawtio-web/src/main/webapp/app/osgi/html/layoutOsgi.html
@@ -1,4 +1,7 @@
-<ul class="nav nav-tabs" ng-controller="Core.NavBarController">
+<ul class="nav nav-tabs" ng-controller="Karaf.NavBarController">
+    <li ng-class='{active : isActive("#/osgi/server")}'>
+      <a ng-href="#/osgi/server{{hash}}">Server</a>
+    </li>
     <li ng-class='{active : isActive("#/osgi/bundle")}'>
         <a ng-href="#/osgi/bundle-list{{hash}}">Bundles</a>
     </li>
@@ -8,9 +11,15 @@
     <li ng-class='{active : isActive("#/osgi/service")}'>
         <a ng-href="#/osgi/services{{hash}}">Services</a>
     </li>
+    <li ng-class='{active : isActive("#/osgi/features")}' ng-show="isFeaturesEnabled">
+      <a ng-href="#/osgi/features{{hash}}">Features</a>
+    </li>
     <li ng-class='{active : isActive("#/osgi/configuration")}'>
         <a ng-href="#/osgi/configurations{{hash}}">Configuration</a>
     </li>
+    <li ng-class='{active : isActive("#/osgi/scr")}' ng-show="isScrEnabled">
+      <a ng-href="#/osgi/scr{{hash}}">Declarative Services</a>
+    </li>
     <li ng-class='{active : isActive("#/osgi/fwk")}'>
         <a ng-href="#/osgi/fwk{{hash}}">Framework</a>
     </li>