kick off some pages for working with fabric containers

hawtio · May 8, 2013 · 893be4e · 893be4e
1 parent 53a7861
commit 893be4e
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 22 deletions.
diff --git a/hawtio-web/src/main/webapp/app/fabric/html/assignProfiles.html b/hawtio-web/src/main/webapp/app/fabric/html/assignProfiles.html
@@ -0,0 +1,11 @@
+<div>
+
+  <div class="row-fluid">
+    <div class="pull-left">
+      <a class='btn' ng-href="#/fabric/containers"><i class='icon-remove'></i> Cancel</a>
+    </div>
+    <div class="pull-right">
+    </div>
+  </div>
+
+</div>
diff --git a/hawtio-web/src/main/webapp/app/fabric/html/containers.html b/hawtio-web/src/main/webapp/app/fabric/html/containers.html
@@ -10,18 +10,12 @@
               <button ng-disabled="selectedContainers.length == 0" class="btn" ng-click="delete()"><i class="icon-remove"></i> Delete</button>
             </div>
           </div>
-          <!--
-          &nbsp;
           <div class="control-group inline-block">
-            <label for="versions">Versions: </label>
-            <select id="versions" ng-model="version" ng-options="v.id for v in versions"></select>
+            <a class="btn" ng-href="#/fabric/containers/createContainer">Create Container</a>
+            <a class="btn" ng-href="#/fabric/containers/assignProfiles">Assign Profiles</a>
+            <a class="btn" ng-href="#/fabric/containers/migrateVersions">Migrate Containers</a>
           </div>
-          &nbsp;
-          <div class="control-group inline-block">
-            <label for="profiles">Profiles: </label>
-            <select id="profiles" ng-model="profile" ng-options="p.id for p in profiles"></select>
-          </div>
-          -->
+
         </fieldset>
       </form>
     </div>

diff --git a/hawtio-web/src/main/webapp/app/fabric/html/createContainer.html b/hawtio-web/src/main/webapp/app/fabric/html/createContainer.html
@@ -1,21 +1,26 @@
 <div ng-controller="Fabric.CreateContainerController">
 
+  <div class="row-fluid">
+    <div class="pull-left">
+      <a class='btn' ng-href="#/fabric/containers"><i class='icon-remove'></i> Cancel</a>
+    </div>
+    <div class="pull-right" ng-switch="activeTab">
+      <button ng-switch-when='org_fusesource_fabric_api_CreateContainerChildOptions' class='btn pull-right' ng-href="" hawtio-submit='create-child-container'><i class="icon-ok"></i> Create Child Container</button>
+      <button ng-switch-when='org_fusesource_fabric_api_CreateSshContainerOptions' class='btn pull-right' ng-href="" hawtio-submit='create-ssh-container'><i class="icon-ok"></i> Create SSH Container</button>
+      <button ng-switch-when='org_fusesource_fabric_api_CreateJCloudsContainerOptions' class='btn pull-right' ng-href="" hawtio-submit='create-cloud-container'><i class="icon-ok"></i> Create JCloud Container</button>
+    </div>
+  </div>
+
   <div class="row-fluid">
     <div class="tabbable hawtio-form-tabs" ng-model=activeTab>
       <div class="tab-pane" title="Child Container" value='org_fusesource_fabric_api_CreateContainerChildOptions'>
         <div simple-form name='create-child-container' data='schema' entity='entity'></div>
-        <button class='btn pull-right' ng-href="" hawtio-submit='create-child-container'><i class="icon-ok"></i> Create</button>
-        <button class='btn pull-right' ng-href="#/fabric/containers"><i class='icon-remove'></i> Cancel</button>
       </div>
       <div class="tab-pane" title="SSH Container" value='org_fusesource_fabric_api_CreateSshContainerOptions'>
         <div simple-form name='create-ssh-container' data='schema' entity='entity'></div>
-        <button class='btn pull-right' ng-href="" hawtio-submit='create-ssh-container'><i class="icon-ok"></i> Create</button>
-        <button class='btn pull-right' ng-href="#/fabric/containers"><i class='icon-remove'></i> Cancel</button>
       </div>
       <div class="tab-pane" title="Cloud Container" value='org_fusesource_fabric_api_CreateJCloudsContainerOptions'>
         <div simple-form name='create-cloud-container' data='schema' entity='entity'></div>
-        <button class='btn pull-right' ng-href="" hawtio-submit='create-cloud-container'><i class="icon-ok"></i> Create</button>
-        <button class='btn pull-right' ng-href="#/fabric/containers"><i class='icon-remove'></i> Cancel</button>
       </div>
     </div>
   </div>

diff --git a/hawtio-web/src/main/webapp/app/fabric/html/layoutFabric.html b/hawtio-web/src/main/webapp/app/fabric/html/layoutFabric.html
@@ -11,9 +11,6 @@
   <li ng-class='{active : isActive("#/fabric/map")}'>
     <a ng-href="#/fabric/map{{hash}}">Map</a>
   </li>
-  <li class="pull-right" ng-class='{active : isActive("#/fabric/createContainer")}'>
-    <a ng-href="#/fabric/createContainer">Create Container</a>
-  </li>
 </ul>
 <div class="row-fluid">
   <div ng-view></div>

diff --git a/hawtio-web/src/main/webapp/app/fabric/html/migrateVersions.html b/hawtio-web/src/main/webapp/app/fabric/html/migrateVersions.html
@@ -0,0 +1,11 @@
+<div>
+
+  <div class="row-fluid">
+    <div class="pull-left">
+      <a class='btn' ng-href="#/fabric/containers"><i class='icon-remove'></i> Cancel</a>
+    </div>
+    <div class="pull-right">
+    </div>
+  </div>
+
+</div>
diff --git a/hawtio-web/src/main/webapp/app/fabric/js/containers.ts b/hawtio-web/src/main/webapp/app/fabric/js/containers.ts
@@ -181,7 +181,7 @@ module Fabric {
         filterText: ''
       },
       selectedItems: $scope.selectedContainers,
-      rowHeight: 42,
+      rowHeight: 32,
       showSelectionCheckbox: true,
       selectWithCheckboxOnly: true,
       keepLastSelected: false,
@@ -198,7 +198,7 @@ module Fabric {
           field: 'jolokiaUrl',
           displayName: 'Connect',
           headerCellTemplate: '<div ng-click="col.sort()" class="ngHeaderSortColumn {{col.headerClass}}" ng-style="{\'cursor\': col.cursor}" ng-class="{ \'ngSorted\': !noSortVisible }"><div class="ngHeaderText colt{{$index}} pagination-centered" title="Connect to container"><i class="icon-cloud"></i></div><div class="ngSortButtonDown" ng-show="col.showSortButtonDown()"></div><div class="ngSortButtonUp" ng-show="col.showSortButtonUp()"></div></div>',
-          cellTemplate: '<div class="ngCellText centered"><button class="btn" ng-disabled="!row.entity.jolokiaUrl" title="Open a new window and connect to this container" ng-click="connect(row.entity)"><i class="icon-signin"></i></button></div>',
+          cellTemplate: '<div class="ngCellText pagination-centered"><a href="" ng-disabled="!row.entity.jolokiaUrl" title="Open a new window and connect to this container" ng-click="connect(row.entity)"><i class="icon-signin"></i></a></div>',
           width: 48
         },
         {

diff --git a/hawtio-web/src/main/webapp/app/fabric/js/fabricPlugin.ts b/hawtio-web/src/main/webapp/app/fabric/js/fabricPlugin.ts
@@ -4,7 +4,9 @@ module Fabric {
   angular.module('fabric', ['bootstrap', 'ui.bootstrap', 'ui.bootstrap.dialog', 'ngResource', 'ngGrid', 'hawtio-forms', 'hawtioCore']).config(($routeProvider) => {
     $routeProvider.
             when('/fabric/containers', {templateUrl: 'app/fabric/html/containers.html'}).
-            when('/fabric/createContainer', {templateUrl: 'app/fabric/html/createContainer.html'}).
+            when('/fabric/containers/createContainer', {templateUrl: 'app/fabric/html/createContainer.html'}).
+            when('/fabric/containers/assignProfiles', {templateUrl: 'app/fabric/html/assignProfiles.html'}).
+            when('/fabric/containers/migrateVersions', {templateUrl: 'app/fabric/html/migrateVersions.html'}).
             when('/fabric/map', {templateUrl: 'app/fabric/html/map.html'}).
             when('/fabric/clusters/*page', {templateUrl: 'app/fabric/html/clusters.html'}).
             when('/fabric/container/:containerId', {templateUrl: 'app/fabric/html/container.html'}).