polishing the workspace breadcrumbs / sub nav

defs.d.ts

@@ -1,14 +1,9 @@
-/// <reference path="d.ts/includes.d.ts"/>
-/// <reference path="d.ts/developer/ts/developerHelpers.d.ts"/>
 /// <reference path="d.ts/developer/ts/developerPlugin.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/kubernetesInterfaces.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/kubernetesHelpers.d.ts"/>
 /// <reference path="d.ts/developer/ts/projects.d.ts"/>
 /// <reference path="d.ts/developer/ts/workspace.d.ts"/>
 /// <reference path="d.ts/developer/ts/workspaces.d.ts"/>
-/// <reference path="d.ts/project/ts/projectHelpers.d.ts"/>
-/// <reference path="d.ts/project/ts/projectPlugin.d.ts"/>
-/// <reference path="d.ts/project/ts/project.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/kubernetesPlugin.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/apps.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/build.d.ts"/>
@@ -47,3 +42,6 @@
 /// <reference path="d.ts/kubernetes/ts/sharedControllers.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/templates.d.ts"/>
 /// <reference path="d.ts/kubernetes/ts/watcher.d.ts"/>
+/// <reference path="d.ts/project/ts/projectHelpers.d.ts"/>
+/// <reference path="d.ts/project/ts/projectPlugin.d.ts"/>
+/// <reference path="d.ts/project/ts/project.d.ts"/>

plugins/developer/html/projects.html

@@ -59,10 +59,15 @@
       </span>
     </div>
   </script>
+
   <div class="row">
     <ng-include src="'breadcrumbsTemplate.html'"/>
   </div>
 
+  <div class="row">
+    <ng-include src="'subTabsTemplate.html'"/>
+  </div>
+
   <div class="row filter-header">
     <div class="col-md-12">
       <span>

plugins/developer/html/workspace.html

@@ -3,6 +3,10 @@
     <ng-include src="'breadcrumbsTemplate.html'"/>
   </div>
 
+  <div class="row">
+    <ng-include src="'subTabsTemplate.html'"/>
+  </div>
+
   <div class="row">
     <div class="col-md-12">
       <a class="btn btn-default pull-right"

plugins/developer/ts/developerHelpers.ts

@@ -32,7 +32,7 @@ module Developer {
         build.$creationDate = d;
       }
       if (name) {
-        build.$viewLink = UrlHelpers.join("workspaces", name, "projects");
+        build.$viewLink = UrlHelpers.join("workspaces", name);
       }
     }
     return build;
@@ -64,15 +64,15 @@ module Developer {
     var answer = createWorkspaceBreadcrumbs();
     var workspaceName = Kubernetes.currentKubernetesNamespace();
     if (workspaceName) {
-      answer.push(
-        {
-          href: UrlHelpers.join("/workspaces", workspaceName, "projects"),
-          label: "Projects",
-          title: "View all the projects"
-        }
-      );
-
       if (projectName) {
+        answer.push(
+          {
+            href: UrlHelpers.join("/workspaces", workspaceName, "projects"),
+            label: "Projects",
+            title: "View all the projects"
+          }
+        );
+
         answer.push(
           {
             href: UrlHelpers.join("/workspaces", workspaceName, "projects", projectName),
@@ -86,6 +86,27 @@ module Developer {
     return answer;
   }
 
+  export function createWorkspaceSubNavBars() {
+    var workspaceName = Kubernetes.currentKubernetesNamespace();
+    return activateCurrent([
+      {
+        href: UrlHelpers.join("/workspaces", workspaceName),
+        label: "Projects",
+        title: "View the projects for this workspace"
+      },
+      {
+        href: UrlHelpers.join("/workspaces", workspaceName, "runtime/apps"),
+        label: "Runtime",
+        title: "View the runtime environment for this workspace"
+      },
+      {
+        href: UrlHelpers.join("/workspaces", workspaceName, "detail"),
+        label: "Detail",
+        title: "View the workspace detail"
+      }
+    ]);
+  }
+
   export function createProjectSubNavBars(projectName) {
     var workspaceName = Kubernetes.currentKubernetesNamespace();
     return activateCurrent([

plugins/developer/ts/projects.ts

@@ -83,7 +83,7 @@ module Developer {
 
       Kubernetes.initShared($scope, $location, $http, $timeout, $routeParams, KubernetesModel, KubernetesState, KubernetesApiURL);
       $scope.breadcrumbConfig = createProjectBreadcrumbs();
-
+      $scope.subTabConfig = Developer.createWorkspaceSubNavBars();
 
       $scope.isLoggedIntoGogs = Forge.isLoggedIntoGogs;
 

plugins/developer/ts/workspace.ts

@@ -16,10 +16,8 @@ module Developer {
         $scope.config = KubernetesSchema.definitions.kubernetes_Namespace;
 
         Kubernetes.initShared($scope, $location, $http, $timeout, $routeParams, KubernetesModel, KubernetesState, KubernetesApiURL);
-        $scope.breadcrumbConfig = createWorkspaceBreadcrumbs([{
-          label: "Detail",
-          title: "View the workspace detail"
-        }]);
+        $scope.breadcrumbConfig = createWorkspaceBreadcrumbs();
+        $scope.subTabConfig = Developer.createWorkspaceSubNavBars();
 
         $scope.$on('kubernetesModelUpdated', function () {
           updateData();