Skip to content

Commit

Permalink
Fix #612
Browse files Browse the repository at this point in the history
  • Loading branch information
@gashcrumb
gashcrumb committed Oct 3, 2013
1 parent ad353ec commit c8c4656
Showing 1 changed file with 49 additions and 43 deletions.
92 changes: 49 additions & 43 deletions hawtio-web/src/main/webapp/app/fabric/html/container.html
View file
@@ -1,9 +1,54 @@
<div class="ng-cloak" ng-controller="Fabric.ContainerController">

<div ng-show="inDashboard">
<div class="controller-section-widget">
<div class="row-fluid container-dashboard-controls">
<div class="pull-left">
<!--
<a ng-href="#/fabric/container/{{containerId}}">{{row.id}}</a>
-->
</div>
<div class="pull-right">
<button class="btn" ng-show="row.jolokiaUrl" title="Connect" ng-click="doConnect(container)"><i class="icon-signin"></i></button>
<button class="btn" ng-show="row.alive" ng-click="stop()" title="Stop"><i class="icon-off"></i></button>
<button class="btn" ng-hide="row.alive" ng-click="start()" title="Start"><i class="icon-play-circle"></i></button>
</div>
</div>
<div class="row-fluid container-dashboard-status-table">
<div class="container-status-dashboard" ng-click="gotoDetails()">
<a class="status-icon" ng-href="#/fabric/container/{{containerId}}">
<i ng-class="statusIcon()"></i>
</a>
</div>
<div class="dashboard-service-list">
<ul class="inline">
<li ng-repeat="service in services" ng-switch="service.type">
<i ng-switch-when="icon" class="{{service.src}}" title="{{service.title}}"></i>
<img ng-switch-when="img" ng-src="{{service.src}}" title="{{service.title}}">
</li>
<li ng-show="row.ensembleServer"><i class="icon-cloud" title="Fabric Ensemble Server"></i></li>
</ul>
</div>
</div>
<div class="row-fluid">
<div class="btn-group container-dashboard-profile-controls">
<button class="btn" ng-click="addProfileDialog.open()" title="Add new profiles to this container"><i class="icon-plus"></i></button>
<button class="btn" ng-click="deleteProfileDialog.open()" ng-disabled="selectedProfiles.length == 0"
title="Removes the selected profiles from this container"><i class="icon-minus"></i></button>
</div>
<div fabric-profile-selector="selectedProfiles" version-id="row.versionId" included-profiles="row.profileIds" show-links="true" expanded="true"></div>
</div>
</div>
</div>

<div class="controller-section" ng-hide="inDashboard">

<div ng-show="loading">
Please wait, loading container details...
</div>

<div ng-hide="loading">

<div class="fabric-page-header row-fluid">
<div class="span4">
<h2><i ng-class="statusIcon()"></i>Container: {{row.id}}</h2>
Expand All @@ -17,9 +62,10 @@ <h2><i ng-class="statusIcon()"></i>Container: {{row.id}}</h2>
<i class="icon-share"></i></a>
</div>
</div>
<div class="row-fluid">


<div class="row-fluid">

<div class="span5 container-profile-settings">
<dl class="dl-horizontal container-detail-profiles">
<div class="btn-group pull-right container-detail-profile-buttons">
Expand Down Expand Up @@ -194,8 +240,8 @@ <h2><i ng-class="statusIcon()"></i>Container: {{row.id}}</h2>
</dl>
</div>


</div>
</div>
</div>

<div ng-show="row.provisionExceptionArray" class="row-fluid">
Expand All @@ -212,47 +258,6 @@ <h2><i ng-class="statusIcon()"></i>Container: {{row.id}}</h2>
</div>
</div>

<div ng-show="inDashboard">
<div class="controller-section-widget">
<div class="row-fluid container-dashboard-controls">
<div class="pull-left">
<!--
<a ng-href="#/fabric/container/{{containerId}}">{{row.id}}</a>
-->
</div>
<div class="pull-right">
<button class="btn" ng-show="row.jolokiaUrl" title="Connect" ng-click="doConnect(container)"><i class="icon-signin"></i></button>
<button class="btn" ng-show="row.alive" ng-click="stop()" title="Stop"><i class="icon-off"></i></button>
<button class="btn" ng-hide="row.alive" ng-click="start()" title="Start"><i class="icon-play-circle"></i></button>
</div>
</div>
<div class="row-fluid container-dashboard-status-table">
<div class="container-status-dashboard" ng-click="gotoDetails()">
<a class="status-icon" ng-href="#/fabric/container/{{containerId}}">
<i ng-class="statusIcon()"></i>
</a>
</div>
<div class="dashboard-service-list">
<ul class="inline">
<li ng-repeat="service in services" ng-switch="service.type">
<i ng-switch-when="icon" class="{{service.src}}" title="{{service.title}}"></i>
<img ng-switch-when="img" ng-src="{{service.src}}" title="{{service.title}}">
</li>
<li ng-show="row.ensembleServer"><i class="icon-cloud" title="Fabric Ensemble Server"></i></li>
</ul>
</div>
</div>
<div class="row-fluid">
<div class="btn-group container-dashboard-profile-controls">
<button class="btn" ng-click="addProfileDialog.open()" title="Add new profiles to this container"><i class="icon-plus"></i></button>
<button class="btn" ng-click="deleteProfileDialog.open()" ng-disabled="selectedProfiles.length == 0"
title="Removes the selected profiles from this container"><i class="icon-minus"></i></button>
</div>
<div fabric-profile-selector="selectedProfiles" version-id="row.versionId" included-profiles="row.profileIds" show-links="true" expanded="true"></div>
</div>
</div>
</div>

<div hawtio-confirm-dialog="connectToContainerDialog.show" title="Connect to {{targetContainer.id}}?" ok-button-text="Connect" on-ok="connect()">
<div class="dialog-body">
<p>Please enter the JMX user name and password for {{targetContainer.id}}:</p>
Expand All @@ -278,6 +283,7 @@ <h2><i ng-class="statusIcon()"></i>Container: {{row.id}}</h2>
<div>
</div>
</div>
</div>

<div hawtio-confirm-dialog="deleteProfileDialog.show"
ok-button-text="Delete"
Expand Down

0 comments on commit c8c4656

Please sign in to comment.