Navigation Menu

Skip to content

Commit

Permalink
Few more container detail page tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@gashcrumb
gashcrumb committed Sep 26, 2013
1 parent 98ddc94 commit 0c0d060
Show file tree
Hide file tree
Showing 2 changed files with 129 additions and 124 deletions.
250 changes: 128 additions & 122 deletions hawtio-web/src/main/webapp/app/fabric/html/container.html
View file
Expand Up @@ -33,130 +33,136 @@ <h2><i ng-class="statusIcon()"></i>Container: {{row.id}}</h2>
</dl>
</div>

<div class="span3 container-settings">
<dl class="dl-horizontal">
<dt>Version:</dt>
<dd>{{row.versionId}}</dd>
</dl>
<dl class="dl-horizontal">
<dt>Location:</dt>
<dd>
<editable-property ng-model="row" property="location" on-save="updateContainerProperty('location', row)"></editable-property>
</dd>
</dl>
<dl class="dl-horizontal" title="Advertise services using the local IP address">
<dt>Local IP:</dt>
<dd>
<editable-property ng-model="row" property="localIp" on-save="updateContainerProperty('localIp', row)"></editable-property>
<input class="pull-right" type="radio" name="resolver" ng-model="row.resolver" value="localip">
</dd>
</dl>
<dl class="dl-horizontal" title="Advertise services using the local hostname">
<dt>Local Hostname:</dt>
<dd>
<editable-property ng-model="row" property="localHostname" on-save="updateContainerProperty('localHostname', row)"></editable-property>
<input class="pull-right" type="radio" name="resolver" ng-model="row.resolver" value="localhostname">
</dd>
</dl>
<dl class="dl-horizontal" title="Advertise services using the public IP address">
<dt>Public IP:</dt>
<dd>
<editable-property ng-model="row" property="publicIp" on-save="updateContainerProperty('publicIp', row)"></editable-property>
<input class="pull-right" type="radio" name="resolver" ng-model="row.resolver" value="publicip">
</dd>
</dl>
<dl class="dl-horizontal" title="Advertise services using the public hostname">
<dt>Public Hostname:</dt>
<dd>
<editable-property ng-model="row" property="publicHostname" on-save="updateContainerProperty('publicHostname', row)"></editable-property>
<input class="pull-right" type="radio" name="resolver" ng-model="row.resolver" value="publichostname">
</dd>
</dl>
<dl class="dl-horizontal" title="Advertise services using a custom IP address or hostname">
<dt>Manual IP:</dt>
<dd>
<editable-property ng-model="row" property="manualIp" on-save="updateContainerProperty('manualIp', row)"></editable-property>
<input class="pull-right" type="radio" name="resolver" ng-model="row.resolver" value="manualip">
</dd>
</dl>
<dl class="dl-horizontal">
<dt>Minimum Port:</dt>
<dd>
<editable-property ng-model="row" property="minimumPort" on-save="updateContainerProperty('minimumPort', row)"></editable-property>
</dd>
</dl>
<dl class="dl-horizontal">
<dt>Maximum Port:</dt>
<dd>
<editable-property ng-model="row" property="maximumPort" on-save="updateContainerProperty('maximumPort', row)"></editable-property>
<div class="span5 container-settings">
<div class="tabbable hawtio-form-tabs">

</dd>
</dl>
</div>
<div class="tab-pane" title="Status">
<dl class="dl-horizontal">
<dt>Version:</dt>
<dd>{{row.versionId}}</dd>
</dl>
<dl class="dl-horizontal">
<dt>Server Status:</dt>
<dd>
<div ng-switch="row.alive">
<p style="display: inline;" ng-switch-when="true" class="green">Running</p>
<p style="display: inline;" ng-switch-default class="red">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>
</div>

<div class="tab-pane" title="Settings">
<dl class="dl-horizontal">
<dt>Location:</dt>
<dd>
<editable-property ng-model="row" property="location" on-save="updateContainerProperty('location', row)"></editable-property>
</dd>
</dl>
<dl class="dl-horizontal" title="Advertise services using the local IP address">
<dt>Local IP:</dt>
<dd>
<editable-property ng-model="row" property="localIp" on-save="updateContainerProperty('localIp', row)"></editable-property>
<input class="pull-right" type="radio" name="resolver" ng-model="row.resolver" value="localip">
</dd>
</dl>
<dl class="dl-horizontal" title="Advertise services using the local hostname">
<dt>Local Hostname:</dt>
<dd>
<editable-property ng-model="row" property="localHostname" on-save="updateContainerProperty('localHostname', row)"></editable-property>
<input class="pull-right" type="radio" name="resolver" ng-model="row.resolver" value="localhostname">
</dd>
</dl>
<dl class="dl-horizontal" title="Advertise services using the public IP address">
<dt>Public IP:</dt>
<dd>
<editable-property ng-model="row" property="publicIp" on-save="updateContainerProperty('publicIp', row)"></editable-property>
<input class="pull-right" type="radio" name="resolver" ng-model="row.resolver" value="publicip">
</dd>
</dl>
<dl class="dl-horizontal" title="Advertise services using the public hostname">
<dt>Public Hostname:</dt>
<dd>
<editable-property ng-model="row" property="publicHostname" on-save="updateContainerProperty('publicHostname', row)"></editable-property>
<input class="pull-right" type="radio" name="resolver" ng-model="row.resolver" value="publichostname">
</dd>
</dl>
<dl class="dl-horizontal" title="Advertise services using a custom IP address or hostname">
<dt>Manual IP:</dt>
<dd>
<editable-property ng-model="row" property="manualIp" on-save="updateContainerProperty('manualIp', row)"></editable-property>
<input class="pull-right" type="radio" name="resolver" ng-model="row.resolver" value="manualip">
</dd>
</dl>
<dl class="dl-horizontal">
<dt>Minimum Port:</dt>
<dd>
<editable-property ng-model="row" property="minimumPort" on-save="updateContainerProperty('minimumPort', row)"></editable-property>
</dd>
</dl>
<dl class="dl-horizontal">
<dt>Maximum Port:</dt>
<dd>
<editable-property ng-model="row" property="maximumPort" on-save="updateContainerProperty('maximumPort', row)"></editable-property>

</dd>
</dl>
</div>

</div>

<div class="span3">
<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>
</div>

</div>

Expand Down
3 changes: 1 addition & 2 deletions hawtio-web/src/main/webapp/css/site-base.css
View file
Expand Up @@ -1491,8 +1491,7 @@ input[type="checkbox"].ng-invalid {
box-shadow: 0 0 12px #e5e971;
}
.container-settings {
border-right: 1px solid #d4d4d4;
padding-right: 30px;

}
.container-settings dd .ep {
display: inline-block;
Expand Down

0 comments on commit 0c0d060

Please sign in to comment.