Skip to content

Commit

Permalink
Reorder container detail page a bit, also make apply icons green so t…
Browse files Browse the repository at this point in the history 
…hey're more obvious
  • Loading branch information
@gashcrumb
gashcrumb committed Sep 26, 2013
1 parent 8aee01b commit 98ddc94
Show file tree
Hide file tree
Showing 2 changed files with 74 additions and 71 deletions.
141 changes: 72 additions & 69 deletions hawtio-web/src/main/webapp/app/fabric/html/container.html
View file
Expand Up @@ -18,71 +18,22 @@ <h2><i ng-class="statusIcon()"></i>Container: {{row.id}}</h2>
</div>
</div>
<div class="row-fluid">


<div class="span4">
<dl class="dl-horizontal">
<dt>Server Status:</dt>
<dd>
<div ng-switch="row.alive">
<p style="display: inline;" ng-switch-when="true">Running</p>
<p style="display: inline;" ng-switch-default>Not Running</p>
</div>
</dd>
</dl>
<dl class="dl-horizontal">
<dt>Server Type:</dt>
<dd>{{row.type}}</dd>
</dl>
<dl class="dl-horizontal">
<dt>Type:</dt>
<dd>{{getType()}}</dd>
</dl>
<dl class="dl-horizontal">
<dt>Provision Status:</dt>
<dd>{{row.provisionStatus}}</dd>
</dl>
<dl class="dl-horizontal">
<dt>Root Container:</dt>
<dd ng-show="row.root">yes</dd>
<dd ng-hide="row.root">no</dd>
</dl>
<dl class="dl-horizontal" ng-show="row.parentId">
<dt>Parent:</dt>
<dd>
<a href="#/fabric/container/{{row.parentId}}{{hash}}">{{row.parentId}}</a>
</dd>
</dl>
<dl class="dl-horizontal" ng-show="row.childrenIds.length > 0">
<dt>Children:</dt>
<dd>
<ul class="unstyled">
<li ng-repeat="child in row.childrenIds">
<a href="#/fabric/container/{{child}}{{hash}}">{{child}}</a>
</li>
</ul>
</dd>
</dl>
<dl class="dl-horizontal" ng-show="services.length > 0">
<dt>Services:</dt>
<dd>
<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>
</ul>
</dd>
</dl>
<dl class="dl-horizontal" ng-show="row.jmxDomains.length > 0">
<dt>JMX Domains:</dt>
<dd>
<ul class="unstyled">
<li ng-repeat="domain in row.jmxDomains">{{domain}}</li>
</ul>
</dd>
</dl>
<dl class="dl-horizontal">
<div class="btn-group pull-right">
<button class="btn" ng-click="addProfileDialog.open()" title="Add new profiles to this container"><i class="icon-plus"></i> Add</button>
<button class="btn" ng-click="deleteProfileDialog.open()" ng-disabled="selectedProfiles.length == 0"
title="Removes the selected profiles from this container"><i class="icon-remove"></i> Remove</button>
</div>
</dl>
<dl class="dl-horizontal">
<div fabric-profile-selector="selectedProfiles" version-id="row.versionId" included-profiles="row.profileIds" show-links="true" expanded="true"></div>
</dl>
</div>

<div class="span4 container-settings">
<div class="span3 container-settings">
<dl class="dl-horizontal">
<dt>Version:</dt>
<dd>{{row.versionId}}</dd>
Expand Down Expand Up @@ -143,18 +94,70 @@ <h2><i ng-class="statusIcon()"></i>Container: {{row.id}}</h2>
</dl>
</div>

<div class="span4">
<div class="span3">
<dl class="dl-horizontal">
<div class="btn-group pull-right">
<button class="btn" ng-click="addProfileDialog.open()" title="Add new profiles to this container"><i class="icon-plus"></i> Add</button>
<button class="btn" ng-click="deleteProfileDialog.open()" ng-disabled="selectedProfiles.length == 0"
title="Removes the selected profiles from this container"><i class="icon-remove"></i> Remove</button>
</div>
<dt>Server Status:</dt>
<dd>
<div ng-switch="row.alive">
<p style="display: inline;" ng-switch-when="true">Running</p>
<p style="display: inline;" ng-switch-default>Not Running</p>
</div>
</dd>
</dl>
<dl class="dl-horizontal">
<div fabric-profile-selector="selectedProfiles" version-id="row.versionId" included-profiles="row.profileIds" show-links="true" expanded="true"></div>
<dt>Server Type:</dt>
<dd>{{row.type}}</dd>
</dl>
<dl class="dl-horizontal">
<dt>Type:</dt>
<dd>{{getType()}}</dd>
</dl>
<dl class="dl-horizontal">
<dt>Provision Status:</dt>
<dd>{{row.provisionStatus}}</dd>
</dl>
<dl class="dl-horizontal">
<dt>Root Container:</dt>
<dd ng-show="row.root">yes</dd>
<dd ng-hide="row.root">no</dd>
</dl>
<dl class="dl-horizontal" ng-show="row.parentId">
<dt>Parent:</dt>
<dd>
<a href="#/fabric/container/{{row.parentId}}{{hash}}">{{row.parentId}}</a>
</dd>
</dl>
<dl class="dl-horizontal" ng-show="row.childrenIds.length > 0">
<dt>Children:</dt>
<dd>
<ul class="unstyled">
<li ng-repeat="child in row.childrenIds">
<a href="#/fabric/container/{{child}}{{hash}}">{{child}}</a>
</li>
</ul>
</dd>
</dl>
<dl class="dl-horizontal" ng-show="services.length > 0">
<dt>Services:</dt>
<dd>
<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>
</ul>
</dd>
</dl>
<dl class="dl-horizontal" ng-show="row.jmxDomains.length > 0">
<dt>JMX Domains:</dt>
<dd>
<ul class="unstyled">
<li ng-repeat="domain in row.jmxDomains">{{domain}}</li>
</ul>
</dd>
</dl>
</div>

</div>

<div ng-show="row.provisionExceptionArray" class="row-fluid">
Expand Down
4 changes: 2 additions & 2 deletions hawtio-web/src/main/webapp/app/fabric/html/fabricView.html
View file
Expand Up @@ -68,7 +68,7 @@

<i class="icon-minus clickable" title="Delete this Version" ng-click="deleteVersionDialog.open()" ng-show="activeVersionId && activeVersionId != '' && versionCanBeDeleted()"></i>

<i class="icon-chevron-sign-right clickable" title="Apply to selected containers" ng-click="applyVersionToContainers()" ng-show="showMigrateButton()"></i>
<i class="icon-chevron-sign-right clickable green" title="Apply to selected containers" ng-click="applyVersionToContainers()" ng-show="showMigrateButton()"></i>


</div>
Expand Down Expand Up @@ -97,7 +97,7 @@
title="View, edit or create configuration files for the profiles in this version"><i class="icon-edit"></i>
</a>-->
<i class="icon-minus clickable" title="Delete selected Profiles" ng-click="deleteProfileDialog.open()" ng-show="selectedProfiles.length > 0 && profilesCanBeDeleted()"></i>
<i class="icon-chevron-sign-right clickable" title="Apply to selected containers" ng-click="addProfilesToContainers()" ng-show="showProfileAddButton()"></i>
<i class="icon-chevron-sign-right clickable green" title="Apply to selected containers" ng-click="addProfilesToContainers()" ng-show="showProfileAddButton()"></i>

</div>
<div class="section-filter">
Expand Down

0 comments on commit 98ddc94

Please sign in to comment.