show profiles by default as it gives a better overview of whats running

hawtio · May 20, 2013 · f8e1c6c · f8e1c6c
1 parent 039c0d4
commit f8e1c6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/hawtio-web/src/main/webapp/app/fabric/html/layoutFabric.html b/hawtio-web/src/main/webapp/app/fabric/html/layoutFabric.html
@@ -1,10 +1,10 @@
 <ul class="nav nav-tabs" ng-controller="Fabric.NavBarController">
-  <li ng-class='{active : isActive("#/fabric/container")}'>
-    <a ng-href="#/fabric/containers{{hash}}">Containers</a>
-  </li>
   <li ng-class='{active : isActive("#/fabric/profile")}'>
     <a ng-href="#/fabric/profiles{{hash}}">Profiles</a>
   </li>
+  <li ng-class='{active : isActive("#/fabric/container")}'>
+    <a ng-href="#/fabric/containers{{hash}}">Containers</a>
+  </li>
   <li ng-class='{active : isActive("#/fabric/clusters")}' ng-disabled="!Fabric.getZooKeeperFacadeMBean(workspace)">
     <a ng-href="{{clusterLink()}}">Clusters</a>
   </li>

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/fabricPlugin.ts b/hawtio-web/src/main/webapp/app/fabric/js/fabricPlugin.ts
@@ -41,26 +41,21 @@ module Fabric {
                 } catch (e) {
                     try {
                       var container = workspace.jolokia.execute(managerMBean, 'currentContainer()');
-                      if (container) {
-                        return true;
-                      } else {
-                        return false;
-                      }
-
+                      return container;
                     } catch (e) {
                       return false;
                     }
                 }
               }
               return false;
-            }
+            };
 
 
             workspace.topLevelTabs.push( {
               content: "Fabric",
               title: "Manage your containers and middleware in a fabric",
               isValid: isValid,
-              href: () => "#/fabric/containers",
+              href: () => "#/fabric/profiles",
               isActive: (workspace: Workspace) => workspace.isLinkActive("fabric")
             });