Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
#123 simplify the nav bars so the canvas and tree views feel more con…
…nected and similar
  • Loading branch information
jstrachan committed May 22, 2013
1 parent bd0a17f commit a4ae1d8
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
5 changes: 4 additions & 1 deletion hawtio-web/src/main/webapp/app/wiki/html/layoutCamel.html
@@ -1,6 +1,10 @@
<div ng-controller="Wiki.CamelController">
<ng-include src="'app/wiki/html/camelNavBar.html'"></ng-include>

<div class="row-fluid">
<ng-include src="'app/wiki/html/camelSubLevelTabs.html'"></ng-include>
</div>

<div class="row-fluid">
<div id="tree-container" class="span3" ng-controller="Camel.TreeController">
<div hawtio-tree="camelContextTree" onselect="onNodeSelect" onDragEnter="onNodeDragEnter" onDrop="onNodeDrop"
Expand All @@ -9,7 +13,6 @@
</div>

<div class="span9">
<ng-include src="'app/wiki/html/camelSubLevelTabs.html'"></ng-include>
<div ng-view></div>
</div>
</div>
Expand Down
18 changes: 10 additions & 8 deletions hawtio-web/src/main/webapp/app/wiki/js/camel.ts
Expand Up @@ -11,23 +11,25 @@ module Wiki {

$scope.camelSubLevelTabs = [
{
content: '<i class=" icon-edit"></i> Properties',
title: "View the pattern properties",
content: '<i class="icon-picture"></i> Canvas',
title: "Edit the diagram in a draggy droppy way",
isValid: (workspace:Workspace) => true,
href: () => Wiki.startLink($scope.branch) + "/camel/canvas/" + $scope.pageId
},
{
content: '<i class=" icon-sitemap"></i> Tree',
title: "View the routes as a tree",
isValid: (workspace:Workspace) => true,
href: () => Wiki.startLink($scope.branch) + "/camel/properties/" + $scope.pageId
},
/*
{
content: '<i class="icon-sitemap"></i> Diagram',
title: "View a diagram of the route",
isValid: (workspace:Workspace) => true,
href: () => Wiki.startLink($scope.branch) + "/camel/diagram/" + $scope.pageId
},
{
content: '<i class="icon-picture"></i> Canvas',
title: "Edit the diagram in a draggy droppy way",
isValid: (workspace:Workspace) => true,
href: () => Wiki.startLink($scope.branch) + "/camel/canvas/" + $scope.pageId
}
*/
];

var routeModel = _apacheCamelModel.definitions.route;
Expand Down

0 comments on commit a4ae1d8

Please sign in to comment.