diff options
| author | Andrew MacBean <macbean@apache.org> | 2014-07-29 10:05:03 +0000 |
|---|---|---|
| committer | Andrew MacBean <macbean@apache.org> | 2014-07-29 10:05:03 +0000 |
| commit | 135ca4526244a4d5b1a960122f3d00f2c07c5344 (patch) | |
| tree | 9d2bd7e4014439e82c5a34ac16f9ffa007841390 /qpid/java | |
| parent | fbb5f1bab02e79ee56c4695798a5ae276b9e6449 (diff) | |
| download | qpid-python-135ca4526244a4d5b1a960122f3d00f2c07c5344.tar.gz | |
QPID-5935: [Java Broker] Web Management UI style refactor to remove html inline styles and standardise via css
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1614299 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
44 files changed, 267 insertions, 259 deletions
diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html index 97738fbb92..42e1617f38 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhost/bdb_ha/show.html @@ -19,16 +19,16 @@ <div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Store Overfull Limit:</div> - <div style="float:left;"><span class="storeOverfullSize" ></span> bytes</div> + <div class="formLabel-labelCell">Store Overfull Limit:</div> + <div><span class="storeOverfullSize" ></span> bytes</div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Store Underfull Limit:</div> - <div style="float:left;"><span class="storeUnderfullSize"></span> bytes</div> + <div class="formLabel-labelCell">Store Underfull Limit:</div> + <div><span class="storeUnderfullSize"></span> bytes</div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Permitted Nodes:</div> - <div class="permittedNodes" style="float:left;"></div> + <div class="formLabel-labelCell">Permitted Nodes:</div> + <div class="permittedNodes"></div> </div> <div style="clear:both"></div> <br/> diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html index 7eaca0be8a..b47a0b0cf2 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/add.html @@ -20,8 +20,8 @@ --> <div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Name*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.name" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -34,8 +34,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store path*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html index b1e4a34d96..29efa712e7 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb/show.html @@ -16,8 +16,8 @@ --> <div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Store Path:</div> - <div class="storePath" style="float:left;"></div> + <div class="formLabel-labelCell">Store Path:</div> + <div class="storePath"></div> </div> <div style="clear:both"></div> </div> diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html index 3f888405b0..a3bfa9459d 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html @@ -20,8 +20,8 @@ --> <div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Create new group or join existing group*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Create new group or join existing group*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <div> <div data-dojo-type="dojo/store/Memory" diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html index a7889eb225..fc1b979d70 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/existinggroup/add.html @@ -22,8 +22,8 @@ <fieldset> <legend>Existing details</legend> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Group name*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Group name*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.groupName" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -36,8 +36,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Node name from group*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Node name from group*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.helperNodeName" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -50,8 +50,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Node address of same node*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Node address of same node*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.helperAddress" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -71,8 +71,8 @@ <fieldset> <legend>New node details</legend> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Node Name*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Node Name*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.nodeName" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -85,8 +85,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Address*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Address*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.address" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -99,8 +99,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store path*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html index d43ebbd064..4517675835 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add/newgroup/add.html @@ -18,8 +18,8 @@ --> <div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Node name*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Node name*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.nodeName" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -32,8 +32,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Group name*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Group name*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.groupName" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -46,8 +46,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Address*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Address*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.address" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -60,8 +60,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store path*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -76,8 +76,8 @@ <fieldset> <legend>Permitted group nodes</legend> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Permitted addresses*:</div> - <div class="formLabel-controlCell tableContainer-valueCell addPermittedNodeList" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Permitted addresses*:</div> + <div class="formLabel-controlCell tableContainer-valueCell addPermittedNodeList"> <select type="text" id="addVirtualHostNode.permittedNodesList" data-dojo-type="dijit/form/MultiSelect" data-dojo-props=" @@ -93,8 +93,8 @@ <div style="clear:both"></div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Address:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Address:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.permittedNode" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html index 355a9ef62a..94b9451057 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/edit.html @@ -19,7 +19,7 @@ <form id="editBDBHANodeForm" method="post" data-dojo-type="dijit/form/Form"> <table class="tableContainer-table tableContainer-table-horiz"> <tr> - <td class="tableContainer-labelCell" style="width: 200px;"><strong>Path to store location*: </strong></td> + <td class="tableContainer-labelCell"><strong>Path to store location*: </strong></td> <td class="tableContainer-valueCell"> <input type="text" id="editBDBHANode.storePath" data-dojo-type="dijit/form/ValidationTextBox" @@ -33,7 +33,7 @@ </td> </tr> <tr> - <td class="tableContainer-labelCell" style="width: 200px;"><strong>Node Name*: </strong></td> + <td class="tableContainer-labelCell"><strong>Node Name*: </strong></td> <td class="tableContainer-valueCell"> <input type="text" id="editBDBHANode.name" data-dojo-type="dijit/form/ValidationTextBox" @@ -48,7 +48,7 @@ </td> </tr> <tr> - <td class="tableContainer-labelCell" style="width: 200px;"><strong>Replication Group*: </strong></td> + <td class="tableContainer-labelCell"><strong>Replication Group*: </strong></td> <td class="tableContainer-valueCell"> <input type="text" id="editBDBHANode.groupName" data-dojo-type="dijit/form/ValidationTextBox" @@ -63,7 +63,7 @@ </td> </tr> <tr> - <td class="tableContainer-labelCell" style="width: 200px;"><strong>Address*: </strong></td> + <td class="tableContainer-labelCell"><strong>Address*: </strong></td> <td class="tableContainer-valueCell"> <input type="text" id="editBDBHANode.address" data-dojo-type="dijit/form/ValidationTextBox" @@ -79,7 +79,7 @@ </td> </tr> <tr> - <td class="tableContainer-labelCell" style="width: 200px;"><strong>Allow this node to operate solo: </strong></td> + <td class="tableContainer-labelCell"><strong>Allow this node to operate solo: </strong></td> <td class="tableContainer-valueCell"> <input type="checkbox" id="editBDBHANode.designatedPrimary" checked="checked" data-dojo-type="dijit/form/CheckBox" @@ -90,7 +90,7 @@ </td> </tr> <tr> - <td class="tableContainer-labelCell" style="width: 200px;"><strong>Election priority of this node: </strong></td> + <td class="tableContainer-labelCell"><strong>Election priority of this node: </strong></td> <td class="tableContainer-valueCell"> <div data-dojo-type="dojo/store/Memory" data-dojo-id="nodePriorityStore" data-dojo-props="data: [ @@ -109,7 +109,7 @@ </td> </tr> <tr> - <td class="tableContainer-labelCell" style="width: 200px;"><strong>Required minimum number of nodes: </strong></td> + <td class="tableContainer-labelCell"><strong>Required minimum number of nodes: </strong></td> <td class="tableContainer-valueCell"> <div data-dojo-type="dojo/store/Memory" data-dojo-id="nodeQuorumOverrideStore" data-dojo-props="data: [{id: '0', name: 'Majority', selected: '1'}]"></div> diff --git a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html index 46894bdfd3..cfd5804c01 100644 --- a/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html +++ b/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/show.html @@ -20,32 +20,32 @@ --> <div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Group Name:</div> - <div class="groupName" style="float:left;"></div> + <div class="formLabel-labelCell">Group Name:</div> + <div class="groupName"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px">Store Path:</div> - <div class="storePath" style="float:left;"></div> + <div class="formLabel-labelCell">Store Path:</div> + <div class="storePath"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Role:</div> - <div class="role" style="float:left;">N/A</div> + <div class="formLabel-labelCell">Role:</div> + <div class="role">N/A</div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Address:</div> - <div class="address" style="float:left;">N/A</div> + <div class="formLabel-labelCell">Address:</div> + <div class="address">N/A</div> </div> <div style="clear:both" class="designatedPrimaryContainer"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Allow this node to operate solo:</div> - <div class="designatedPrimary" style="float:left;">N/A</div> + <div class="formLabel-labelCell">Allow this node to operate solo:</div> + <div class="designatedPrimary">N/A</div> </div> <div style="clear:both" class="priorityContainer"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Election priority:</div> - <div class="priority" style="float:left;">Never</div> + <div class="formLabel-labelCell">Election priority:</div> + <div class="priority">Never</div> </div> <div style="clear:both" class="quorumOverrideContainer"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Required minimum number of nodes:</div> - <div style="float:left;"> + <div class="formLabel-labelCell">Required minimum number of nodes:</div> + <div> <span class="quorumOverride" >N/A</span> </div> </div> diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html index 452005d144..0d24fa0c9e 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html +++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/add.html @@ -20,8 +20,8 @@ --> <div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Name*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.name" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -34,8 +34,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store path*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" diff --git a/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/show.html b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/show.html index 2bdbc761e6..a90ae74aaa 100644 --- a/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/show.html +++ b/qpid/java/broker-plugins/derby-store/src/main/java/resources/virtualhostnode/derby/show.html @@ -16,6 +16,6 @@ --> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Store Path:</div> - <div class="storePath" style="float:left;"></div> + <div class="formLabel-labelCell">Store Path:</div> + <div class="storePath"></div> </div> diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/store/pool/bonecp/show.html b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/store/pool/bonecp/show.html index 8d282b47a0..8453b0618b 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/store/pool/bonecp/show.html +++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/store/pool/bonecp/show.html @@ -20,16 +20,16 @@ <br/> <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Bone Connection Pool Settings', open: false"> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Partition Count:</div> - <div class="partitionCount" style="float:left;"></div> + <div class="formLabel-labelCell">Partition Count:</div> + <div class="partitionCount"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Minimum connections per Partition:</div> - <div class="minConnectionsPerPartition" style="float:left;"></div> + <div class="formLabel-labelCell">Minimum connections per Partition:</div> + <div class="minConnectionsPerPartition"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Maximum connections per Partition:</div> - <div class="maxConnectionsPerPartition" style="float:left;"></div> + <div class="formLabel-labelCell">Maximum connections per Partition:</div> + <div class="maxConnectionsPerPartition"></div> </div> <div style="clear:both"></div> </div> diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html index c9405991a6..39fc3f617f 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html +++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhost/store/pool/bonecp/add.html @@ -17,7 +17,7 @@ <table class="tableContainer-table tableContainer-table-horiz"> <tr> - <td class="tableContainer-labelCell" style="width: 300px;"><strong>Partition Count: </strong></td> + <td class="tableContainer-labelCell"><strong>Partition Count: </strong></td> <td class="tableContainer-valueCell"> <input data-dojo-type="dijit/form/NumberSpinner" id="formAddVirtualHost.qpid.jdbcstore.bonecp.partitionCount" @@ -29,7 +29,7 @@ </td> </tr> <tr> - <td class="tableContainer-labelCell" style="width: 300px;"><strong>Minimum connections per Partition:</strong></td> + <td class="tableContainer-labelCell"><strong>Minimum connections per Partition:</strong></td> <td class="tableContainer-valueCell"> <input dojoType="dijit/form/NumberSpinner" id="formAddVirtualHost.qpid.jdbcstore.bonecp.minConnectionsPerPartition" @@ -41,7 +41,7 @@ </td> </tr> <tr> - <td class="tableContainer-labelCell" style="width: 300px;"><strong>Maximum connections per Partition: </strong></td> + <td class="tableContainer-labelCell"><strong>Maximum connections per Partition: </strong></td> <td class="tableContainer-valueCell"> <input dojoType="dijit/form/NumberSpinner" id="formAddVirtualHost.qpid.jdbcstore.bonecp.maxConnectionsPerPartition" diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html index 5958af5e6c..dbaf8ea4ee 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html +++ b/qpid/java/broker-plugins/jdbc-provider-bone/src/main/java/resources/virtualhostnode/store/pool/bonecp/add.html @@ -17,7 +17,7 @@ <table class="tableContainer-table tableContainer-table-horiz"> <tr> - <td class="tableContainer-labelCell" style="width: 300px;"><strong>Partition Count: </strong></td> + <td class="tableContainer-labelCell"><strong>Partition Count: </strong></td> <td class="tableContainer-valueCell"> <input data-dojo-type="dijit/form/NumberSpinner" id="formAddVirtualHostNode.qpid.jdbcstore.bonecp.partitionCount" @@ -29,7 +29,7 @@ </td> </tr> <tr> - <td class="tableContainer-labelCell" style="width: 300px;"><strong>Minimum connections per Partition:</strong></td> + <td class="tableContainer-labelCell"><strong>Minimum connections per Partition:</strong></td> <td class="tableContainer-valueCell"> <input dojoType="dijit/form/NumberSpinner" id="formAddVirtualHostNode.qpid.jdbcstore.bonecp.minConnectionsPerPartition" @@ -41,7 +41,7 @@ </td> </tr> <tr> - <td class="tableContainer-labelCell" style="width: 300px;"><strong>Maximum connections per Partition: </strong></td> + <td class="tableContainer-labelCell"><strong>Maximum connections per Partition: </strong></td> <td class="tableContainer-valueCell"> <input dojoType="dijit/form/NumberSpinner" id="formAddVirtualHostNode.qpid.jdbcstore.bonecp.maxConnectionsPerPartition" diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html index 6555faf2f9..cb4ae1fb04 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhost/jdbc/add.html @@ -18,8 +18,8 @@ --> <div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">JDBC Url*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">JDBC Url*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHost.connectionUrl" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -32,8 +32,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Username*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Username*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHost.username" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -45,8 +45,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Password*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Password*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="password" id="addVirtualHost.password" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -58,8 +58,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Connection Pool*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Connection Pool*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHost.connectionPoolType" data-dojo-type="dijit/form/FilteringSelect" data-dojo-props=" diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html index b2b8de862e..eefc0071d3 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/add.html @@ -20,8 +20,8 @@ --> <div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Name*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.name" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -34,8 +34,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">JDBC Url*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">JDBC Url*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.connectionUrl" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -48,8 +48,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Username*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Username*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.username" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -61,8 +61,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Password*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Password*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="password" id="addVirtualHostNode.password" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -74,8 +74,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Connection Pool*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Connection Pool*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.connectionPoolType" data-dojo-type="dijit/form/FilteringSelect" data-dojo-props=" diff --git a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/show.html b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/show.html index 7ba60f2f6b..e8640aabbd 100644 --- a/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/show.html +++ b/qpid/java/broker-plugins/jdbc-store/src/main/java/resources/virtualhostnode/jdbc/show.html @@ -16,16 +16,16 @@ --> <div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Connection URL:</div> - <div class="connectionUrl" style="float:left;"></div> + <div class="formLabel-labelCell">Connection URL:</div> + <div class="connectionUrl"></div> </div> <div class="usernameAttributeContainer" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Username:</div> - <div class="username" style="float:left;"></div> + <div class="formLabel-labelCell">Username:</div> + <div class="username"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Connection Pool Type:</div> - <div class="connectionPoolType" style="float:left;"></div> + <div class="formLabel-labelCell">Connection Pool Type:</div> + <div class="connectionPoolType"></div> </div> <div class="connectionPoolTypeAttributeContainer" style="clear:both"/> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html index 8e2e068b93..13960715a6 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addAuthenticationProvider.html @@ -20,11 +20,11 @@ <div style="width:420px; overflow: auto"> <table class="tableContainer-table tableContainer-table-horiz" width="100%" cellspacing="1"> <tr> - <td class="tableContainer-labelCell" style="width: 200px;">Type*:</td> + <td class="tableContainer-labelCell">Type*:</td> <td class="tableContainer-valueCell"><div id="addAuthenticationProvider.selectAuthenticationProviderDiv"></div></td> </tr> <tr> - <td class="tableContainer-labelCell" style="width: 200px;">Name*:</td> + <td class="tableContainer-labelCell">Name*:</td> <td class="tableContainer-valueCell"><input type="text" required="true" name="name" id="formAddAuthenticationProvider.name" placeholder="Name" regexp="^[\x20-\x2e\x30-\x7F]{1,255}$" dojoType="dijit.form.ValidationTextBox" missingMessage="A name must be supplied" /></div></td> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html index 3e65076a4e..c616ab0ac8 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html @@ -28,8 +28,8 @@ <fieldset> <legend>Virtual Host Node</legend> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Type*:</div> - <div style="float:left;" class="tableContainer-valueCell formLabel-controlCell"> + <div class="formLabel-labelCell tableContainer-labelCell">Type*:</div> + <div class="tableContainer-valueCell formLabel-controlCell"> <select id="addVirtualHostNode.type" data-dojo-type="dijit/form/FilteringSelect" data-dojo-props=" name: 'type', @@ -54,8 +54,8 @@ <fieldset> <legend>Virtual Host</legend> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Type*:</div> - <div style="float:left;" class="tableContainer-valueCell formLabel-controlCell"> + <div class="formLabel-labelCell tableContainer-labelCell">Type*:</div> + <div class="tableContainer-valueCell formLabel-controlCell"> <select id="addVirtualHost.type" data-dojo-type="dijit/form/FilteringSelect" data-dojo-props=" name: 'type', diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/add.html index 7196493e7c..48e9c19748 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/add.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/add.html @@ -16,7 +16,7 @@ --> <table class="tableContainer-table tableContainer-table-horiz" style="margin:0; width:100%" cellspacing="1"> <tr> - <td class="tableContainer-labelCell" style="width: 200px;"><strong>Path*: </strong></td> + <td class="tableContainer-labelCell"><strong>Path*: </strong></td> <td class="tableContainer-valueCell" > <input type="text" name="preferencesProviderPath" id="preferencesProvider.path" diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html index aca9f5d309..f315ee3450 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/authenticationprovider/preferences/filesystempreferences/show.html @@ -16,6 +16,6 @@ --> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Path:</div> + <div class="formLabel-labelCell">Path:</div> <div class="fileSystemPreferencesProviderPath" style="float:left;"></div> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css b/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css index 8be41ce793..de22b164a2 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/css/common.css @@ -106,8 +106,18 @@ div .messages { border-radius: 5px; } -.formBox .formLabel-labelCell { +.formLabel-labelCell, .tableContainer-labelCell { + width: 300px; + font-weight: bold; +} + +.tableContainer-labelCell { + float: none; +} + +.formLabel-labelCell { margin-left: 5px; + float: left; } .formBox .addPermittedNodeList { @@ -122,13 +132,11 @@ div .messages { float : right; } -.formLabel-labelCell { - font-weight: bold; -} - .formLabel-controlCell { padding: 1px; + float: left; } + .columnDefDialogButtonIcon { background: url("../dojo/dojox/grid/enhanced/resources/images/sprite_icons.png") no-repeat; background-position: -260px 2px; diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html index 04d6a803a2..eac16d0acf 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html @@ -23,8 +23,8 @@ <div id="editVirtualHost.typeFields"></div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Dead letter queue enabled:</div> - <div style="float:left;" class="tableContainer-valueCell formLabel-controlCell"> + <div class="formLabel-labelCell tableContainer-labelCell">Dead letter queue enabled:</div> + <div class="tableContainer-valueCell formLabel-controlCell"> <input type="checkbox" id="editVirtualHost.queue.deadLetterQueueEnabled" data-dojo-type="dijit/form/CheckBox" data-dojo-props="name: 'queue.deadLetterQueueEnabled'"> @@ -33,8 +33,8 @@ </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store Transaction Idle Timeout Warn:</div> - <div style="float:left;" class="tableContainer-valueCell formLabel-controlCell"> + <div class="formLabel-labelCell tableContainer-labelCell">Store Transaction Idle Timeout Warn:</div> + <div class="tableContainer-valueCell formLabel-controlCell"> <input data-dojo-type="dijit/form/NumberSpinner" id="editVirtualHost.storeTransactionIdleTimeoutWarn" name="storeTransactionIdleTimeoutWarn" @@ -45,8 +45,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store Transaction Idle Timeout Close:</div> - <div style="float:left;" class="tableContainer-valueCell formLabel-controlCell"> + <div class="formLabel-labelCell tableContainer-labelCell">Store Transaction Idle Timeout Close:</div> + <div class="tableContainer-valueCell formLabel-controlCell"> <input data-dojo-type="dijit/form/NumberSpinner" id="editVirtualHost.storeTransactionIdleTimeoutClose" name="storeTransactionIdleTimeoutClose" @@ -57,8 +57,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store Transaction Open Timeout Warn:</div> - <div style="float:left;" class="tableContainer-valueCell formLabel-controlCell"> + <div class="formLabel-labelCell tableContainer-labelCell">Store Transaction Open Timeout Warn:</div> + <div class="tableContainer-valueCell formLabel-controlCell"> <input data-dojo-type="dijit/form/NumberSpinner" id="editVirtualHost.storeTransactionOpenTimeoutWarn" name="storeTransactionOpenTimeoutWarn" @@ -69,8 +69,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store Transaction Open Timeout Close:</div> - <div style="float:left;" class="tableContainer-valueCell formLabel-controlCell"> + <div class="formLabel-labelCell tableContainer-labelCell">Store Transaction Open Timeout Close:</div> + <div class="tableContainer-valueCell formLabel-controlCell"> <input data-dojo-type="dijit/form/NumberSpinner" id="editVirtualHost.storeTransactionOpenTimeoutClose" name="storeTransactionOpenTimeoutClose" @@ -82,8 +82,8 @@ </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">House keeping check period (ms):</div> - <div style="float:left;" class="tableContainer-valueCell formLabel-controlCell"> + <div class="formLabel-labelCell tableContainer-labelCell">House keeping check period (ms):</div> + <div class="tableContainer-valueCell formLabel-controlCell"> <input data-dojo-type="dijit/form/NumberSpinner" id="editVirtualHost.housekeepingCheckPeriod" name="housekeepingCheckPeriod" @@ -95,8 +95,8 @@ </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">House keeping thread count:</div> - <div style="float:left;" class="tableContainer-valueCell formLabel-controlCell"> + <div class="formLabel-labelCell tableContainer-labelCell">House keeping thread count:</div> + <div class="tableContainer-valueCell formLabel-controlCell"> <input data-dojo-type="dijit/form/NumberSpinner" id="editVirtualHost.housekeepingThreadCount" name="housekeepingThreadCount" diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js index ccedcdd108..ff33d8e7c6 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js @@ -498,13 +498,13 @@ define(["dojo/_base/xhr", that.portsGrid = new UpdatableStore(that.brokerData.ports, query(".broker-ports")[0], - [ { name: "Name", field: "name", width: "150px"}, - { name: "State", field: "state", width: "60px"}, - { name: "Auth Provider", field: "authenticationProvider", width: "100px"}, - { name: "Address", field: "bindingAddress", width: "70px"}, - { name: "Port", field: "port", width: "50px"}, - { name: "Transports", field: "transports", width: "100px"}, - { name: "Protocols", field: "protocols", width: "100%"} + [ { name: "Name", field: "name", width: "15%"}, + { name: "State", field: "state", width: "15%"}, + { name: "Auth Provider", field: "authenticationProvider", width: "15%"}, + { name: "Address", field: "bindingAddress", width: "15%"}, + { name: "Port", field: "port", width: "10%"}, + { name: "Transports", field: "transports", width: "15%"}, + { name: "Protocols", field: "protocols", width: "15%"} ], function(obj) { connect.connect(obj.grid, "onRowDblClick", obj.grid, function(evt){ diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html index ea4bfc93f8..31cc245cbf 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementHttp.html @@ -21,23 +21,23 @@ <div> <div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 260px;">Basic Authentication for HTTP enabled:</div> + <div class="formLabel-labelCell">Basic Authentication for HTTP enabled:</div> <div class="httpBasicAuthenticationEnabled" style="float:left;"></div><br/> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 260px;">Basic Authentication for HTTPS enabled:</div> + <div class="formLabel-labelCell">Basic Authentication for HTTPS enabled:</div> <div class="httpsBasicAuthenticationEnabled" style="float:left;"></div><br/> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 260px;">SASL Authentication for HTTP enabled:</div> + <div class="formLabel-labelCell">SASL Authentication for HTTP enabled:</div> <div class="httpSaslAuthenticationEnabled" style="float:left;"></div><br/> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 260px;">SASL Authentication for HTTPS enabled:</div> + <div class="formLabel-labelCell">SASL Authentication for HTTPS enabled:</div> <div class="httpsSaslAuthenticationEnabled" style="float:left;"></div><br/> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 260px;">Session timeout (s):</div> + <div class="formLabel-labelCell">Session timeout (s):</div> <div class="sessionTimeout" style="float:left;"></div><br/> </div> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html index d8f139e692..f5b0d7c9b0 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html @@ -21,7 +21,7 @@ <div> <div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 260px;">Use Platform MBean Server:</div> + <div class="formLabel-labelCell">Use Platform MBean Server:</div> <div class="usePlatformMBeanServer" style="float:left;"></div><br/> </div> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html index a60a7d5ff7..8abab4cfe2 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAuthProvider.html @@ -20,15 +20,15 @@ --> <div class="authorizationProvider"> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Name:</div> + <div class="formLabel-labelCell">Name:</div> <div class="name" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Type:</div> + <div class="formLabel-labelCell">Type:</div> <div class="type" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">State:</div> + <div class="formLabel-labelCell">State:</div> <div class="state" style="float:left;"></div> </div> <div style="clear:both"></div> @@ -41,4 +41,4 @@ <button data-dojo-type="dijit.form.Button" class="addPreferencesProviderButton">Add</button> </div> <br/> -</div>
\ No newline at end of file +</div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html index 92661ea288..ecf456a9f9 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showBroker.html @@ -22,46 +22,46 @@ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Broker Attributes', open: false"> <div id="brokerAttributes" style="clear:both"> <div id="brokerAttribute.name.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker name:</div> + <div class="formLabel-labelCell">Broker name:</div> <div id="brokerAttribute.name" style="float:left;"></div> </div> <div id="brokerAttribute.operatingSystem.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Operation system:</div> + <div class="formLabel-labelCell">Operation system:</div> <div id="brokerAttribute.operatingSystem" style="float:left;"></div> </div> <div id="brokerAttribute.platform.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Platform:</div> + <div class="formLabel-labelCell">Platform:</div> <div id="brokerAttribute.platform" style="float:left;"></div> </div> <div id="brokerAttribute.productVersion.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker version:</div> + <div class="formLabel-labelCell">Broker version:</div> <div id="brokerAttribute.productVersion" style="float:left;"></div> </div> <div id="brokerAttribute.modelVersion.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Broker model version:</div> + <div class="formLabel-labelCell">Broker model version:</div> <div id="brokerAttribute.modelVersion" style="float:left;"></div> </div> <div id="brokerAttribute.defaultVirtualHost.container" style="display: none; clear:both; clear:both;"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Default virtual host:</div> + <div class="formLabel-labelCell">Default virtual host:</div> <div id="brokerAttribute.defaultVirtualHost" style="float:left;"></div> </div> <div id="brokerAttribute.statisticsReportingPeriod.container" style="display: none; clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Statistics reporting period:</div> + <div class="formLabel-labelCell">Statistics reporting period:</div> <div id="brokerAttribute.statisticsReportingPeriod" style="float:left;"></div> </div> <div id="brokerAttribute.statisticsReportingResetEnabled.container" style="display: none; clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Statistics reporting period enabled:</div> + <div class="formLabel-labelCell">Statistics reporting period enabled:</div> <div id="brokerAttribute.statisticsReportingResetEnabled" style="float:left;"></div> </div> <div style="clear:both"></div> <br/> <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Global Connection Defaults', open: true"> <div id="brokerAttribute.connection.sessionCountLimit.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Maximum number of sessions:</div> + <div class="formLabel-labelCell">Maximum number of sessions:</div> <div id="brokerAttribute.connection.sessionCountLimit" style="float:left;"></div> </div> <div id="brokerAttribute.connection.heartBeatDelay.container" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 240px;">Heart beat delay:</div> + <div class="formLabel-labelCell">Heart beat delay:</div> <div id="brokerAttribute.connection.heartBeatDelay" style="float:left;"></div> ms </div> <div style="clear:both"></div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html index cdc88ece6a..1b6518d55e 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html @@ -21,23 +21,23 @@ <div class="exchange"> <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Exchange Attributes', open: true"> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Name:</div> + <div class="formLabel-labelCell">Name:</div> <div class="name" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">State:</div> + <div class="formLabel-labelCell">State:</div> <div class="state" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Durable:</div> + <div class="formLabel-labelCell">Durable:</div> <div class="durable" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Lifespan:</div> + <div class="formLabel-labelCell">Lifespan:</div> <div class="lifetimePolicy" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Inbound:</div> + <div class="formLabel-labelCell">Inbound:</div> <div style="float:left;"> <span class="msgInRate"></span> <span> msg/s</span> @@ -46,7 +46,7 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Dropped:</div> + <div class="formLabel-labelCell">Dropped:</div> <div style="float:left;"> <span class="msgDropRate"></span> <span> msg/s</span> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html index 41b877c058..48e811af0f 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showKeyStore.html @@ -21,20 +21,20 @@ <div class="keystore"> <div class="keyStoreContainer"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Name:</div> + <div class="formLabel-labelCell">Name:</div> <div class="nameValue" style="float:left;"></div><br/> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Type:</div> + <div class="formLabel-labelCell">Type:</div> <div class="keyStoreTypeValue" style="float:left;"></div><br/> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Key Manager Factory Algorithm:</div> + <div class="formLabel-labelCell">Key Manager Factory Algorithm:</div> <div class="keyManagerFactoryAlgorithmValue" style="float:left;"></div><br/> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Path:</div> + <div class="formLabel-labelCell">Path:</div> <div class="pathValue" style="float:left;"></div><br/> <div class="certificateAlias"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Certificate alias:</div> + <div class="formLabel-labelCell">Certificate alias:</div> <div class="certificateAliasValue" style="float:left;"></div><br> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html index f2f3134037..633b15b542 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPlugin.html @@ -21,11 +21,11 @@ <div class="plugin"> <div> <div style="both:clear"> - <div class="formLabel-labelCell" style="float:left; width: 260px;">Name:</div> + <div class="formLabel-labelCell">Name:</div> <div class="name" style="float:left;"></div><br/> </div> <div style="both:clear"> - <div class="formLabel-labelCell" style="float:left; width: 260px;">Type:</div> + <div class="formLabel-labelCell">Type:</div> <div class="type" style="float:left;"></div><br/> </div> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html index 4f460b85c1..10c1e220f0 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPort.html @@ -22,57 +22,57 @@ <div class="portContainer"> <div class="name" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Name:</div> + <div class="formLabel-labelCell">Name:</div> <div class="nameValue" style="float:left;"></div><br/> </div> <div class="state" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">State:</div> + <div class="formLabel-labelCell">State:</div> <div class="stateValue" style="float:left;"></div><br/> </div> <div class="port" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Port Number:</div> + <div class="formLabel-labelCell">Port Number:</div> <div class="portValue" style="float:left;"></div><br/> </div> <div class="authenticationProvider" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Authentication Provider:</div> + <div class="formLabel-labelCell">Authentication Provider:</div> <div class="authenticationProviderValue" style="float:left;"></div><br/> </div> <div class="protocols" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Protocols:</div> + <div class="formLabel-labelCell">Protocols:</div> <div class="protocolsValue" style="float:left;"></div><br/> </div> <div class="transports" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Transports:</div> + <div class="formLabel-labelCell">Transports:</div> <div class="transportsValue" style="float:left;"></div><br/> </div> <div class="bindingAddress" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Binding address:</div> + <div class="formLabel-labelCell">Binding address:</div> <div class="bindingAddressValue" style="float:left;"></div><br> </div> <div class="keyStore" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Key Store:</div> + <div class="formLabel-labelCell">Key Store:</div> <div class="keyStoreValue" style="float:left;"></div><br> </div> <div class="needClientAuth" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Need SSL Client Certificate:</div> + <div class="formLabel-labelCell">Need SSL Client Certificate:</div> <div class="needClientAuthValue" style="float:left;"></div><br> </div> <div class="wantClientAuth" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Want SSL Client Certificate:</div> + <div class="formLabel-labelCell">Want SSL Client Certificate:</div> <div class="wantClientAuthValue" style="float:left;"></div><br> </div> <div class="trustStores" style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Trust Stores:</div> + <div class="formLabel-labelCell">Trust Stores:</div> <div class="trustStoresValue" style="float:left;"></div><br> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html index a1885acddf..65ad711388 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProvider.html @@ -21,15 +21,15 @@ <div class="preferencesProvider"> <div class="preferencesProviderAttributes"> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Type:</div> + <div class="formLabel-labelCell">Type:</div> <div class="preferencesProviderType" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Name:</div> + <div class="formLabel-labelCell">Name:</div> <div class="preferencesProviderName" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">State:</div> + <div class="formLabel-labelCell">State:</div> <div class="preferencesProviderState" style="float:left;"></div> </div> <div class="preferencesDetails"></div> @@ -37,4 +37,4 @@ <br/> <button data-dojo-type="dijit.form.Button" class="deletePreferencesProviderButton">Delete</button> <button data-dojo-type="dijit.form.Button" class="editPreferencesProviderButton">Edit</button> -</div>
\ No newline at end of file +</div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html index 0da104821b..5c5bdaefef 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showPreferencesProviderFields.html @@ -21,7 +21,7 @@ <div data-dojo-type="dijit/layout/ContentPane" class="preferencesProviderContainer"> <table class="tableContainer-table tableContainer-table-horiz" width="100%" cellspacing="1"> <tr> - <td class="tableContainer-labelCell" style="width: 200px;"><strong>Type*:</strong></td> + <td class="tableContainer-labelCell"><strong>Type*:</strong></td> <td class="tableContainer-valueCell"> <select class="preferencesProviderType" data-dojo-type="dijit/form/FilteringSelect" data-dojo-props="name:'preferencesProviderType',label:'Type:', searchAttr: 'name', placeHolder: 'Select Provider Type', required: true"> @@ -30,7 +30,7 @@ </td> </tr> <tr> - <td class="tableContainer-labelCell" style="width: 200px;"><strong>Name*:</strong></td> + <td class="tableContainer-labelCell"><strong>Name*:</strong></td> <td class="tableContainer-valueCell"><input type="text" name="preferencesProviderName" class="preferencesProviderName" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props="placeHolder: 'Name', required: true, missingMessage: 'A name must be supplied', title: 'Enter name', pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" /></td> @@ -38,4 +38,4 @@ </table> <div class="preferencesProviderFieldsContainer"></div> <input type="hidden" name="preferencesProviderId"/> -</div>
\ No newline at end of file +</div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html index 3a978f4fb5..48a85d68a0 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showQueue.html @@ -21,50 +21,50 @@ <div class="queue"> <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Queue Attributes', open: true"> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Name:</div> + <div class="formLabel-labelCell">Name:</div> <div class="name" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">State:</div> + <div class="formLabel-labelCell">State:</div> <div class="state" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Durable:</div> + <div class="formLabel-labelCell">Durable:</div> <div class="durable" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Persist Messages:</div> + <div class="formLabel-labelCell">Persist Messages:</div> <div class="messageDurability" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Enforced Max. Ttl(ms):</div> + <div class="formLabel-labelCell">Enforced Max. Ttl(ms):</div> <div class="maximumMessageTtl" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Enforced Min. Ttl(ms):</div> + <div class="formLabel-labelCell">Enforced Min. Ttl(ms):</div> <div class="minimumMessageTtl" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Exclusive:</div> + <div class="formLabel-labelCell">Exclusive:</div> <div class="exclusive" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Owner:</div> + <div class="formLabel-labelCell">Owner:</div> <div class="owner" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Lifespan:</div> + <div class="formLabel-labelCell">Lifespan:</div> <div class="lifetimePolicy" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Type:</div> + <div class="formLabel-labelCell">Type:</div> <div style="float:left;"> <span class="type"></span> <span class="typeQualifier"></span> </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Size:</div> + <div class="formLabel-labelCell">Size:</div> <div style="float:left;"> <span class="queueDepthMessages"></span> <span> msgs</span> @@ -73,7 +73,7 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Pre-fetched:</div> + <div class="formLabel-labelCell">Pre-fetched:</div> <div style="float:left;"> <span class="unacknowledgedMessages"></span> <span> msgs</span> @@ -82,7 +82,7 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Inbound:</div> + <div class="formLabel-labelCell">Inbound:</div> <div style="float:left;"> <span class="msgInRate"></span> <span> msg/s</span> @@ -91,7 +91,7 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Outbound:</div> + <div class="formLabel-labelCell">Outbound:</div> <div style="float:left;"> <span class="msgOutRate"></span> <span> msg/s</span> @@ -100,16 +100,16 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">AlternateExchange:</div> + <div class="formLabel-labelCell">AlternateExchange:</div> <div class="alternateExchange" style="float:left;"></div> </div> <div class="messageGroups" style="clear:both"> <div style="clear:both"> - <div style="float:left; width: 150px;" class="messageGroupKeyLabel formLabel-labelCell ">Message Group Key:</div> + <div class="messageGroupKeyLabel formLabel-labelCell ">Message Group Key:</div> <div style="float:left;" class="messageGroupKey"></div> </div> <div style="clear:both"> - <div style="float:left; width: 150px;" class="messageGroupSharedGroupsLabel formLabel-labelCell">Shared Message Groups:</div> + <div class="messageGroupSharedGroupsLabel formLabel-labelCell">Shared Message Groups:</div> <div style="float:left;" class="messageGroupSharedGroups"></div> </div> </div> @@ -134,35 +134,35 @@ <br/> <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Alerting Thresholds', open: false"> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Queue Depth:</div> + <div class="formLabel-labelCell">Queue Depth:</div> <div style="float:left;"> <span class="alertThresholdQueueDepthMessages"></span> <span>msgs</span> </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Queue Depth:</div> + <div class="formLabel-labelCell">Queue Depth:</div> <div style="float:left;"> <span class="alertThresholdQueueDepthBytes"></span> <span class="alertThresholdQueueDepthBytesUnits"></span> </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Message Age:</div> + <div class="formLabel-labelCell">Message Age:</div> <div style="float:left;"> <span class="alertThresholdMessageAge"></span> <span class="alertThresholdMessageAgeUnits"></span> </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Message Size:</div> + <div class="formLabel-labelCell">Message Size:</div> <div style="float:left;"> <span class="alertThresholdMessageSize"></span> <span class="alertThresholdMessageSizeUnits"></span> </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 150px;">Alert frequency:</div> + <div class="formLabel-labelCell">Alert frequency:</div> <div style="float:left;"> <span class="alertRepeatGap"></span> <span class="alertRepeatGapUnits"></span> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html index 09f5e2037a..264170ebfb 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showTrustStore.html @@ -21,20 +21,20 @@ <div class="truststore"> <div class="trustStoreContainer"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Name:</div> + <div class="formLabel-labelCell">Name:</div> <div class="nameValue" style="float:left;"></div><br/> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Type:</div> + <div class="formLabel-labelCell">Type:</div> <div class="trustStoreTypeValue" style="float:left;"></div><br/> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Trust Manager Factory Algorithm:</div> + <div class="formLabel-labelCell">Trust Manager Factory Algorithm:</div> <div class="trustManagerFactoryAlgorithmValue" style="float:left;"></div><br/> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Path:</div> + <div class="formLabel-labelCell">Path:</div> <div class="pathValue" style="float:left;"></div><br/> <div class="peersOnly"> - <div class="formLabel-labelCell" style="float:left; width: 250px;">Peer store:</div> + <div class="formLabel-labelCell">Peer store:</div> <div class="peersOnlyValue" style="float:left;"></div> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html index 8957639dae..185daa40f0 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHost.html @@ -23,27 +23,27 @@ <div class="virtualhost"> <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Virtual Host Attributes', open: true"> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Name:</div> + <div class="formLabel-labelCell">Name:</div> <div class="name" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Type:</div> + <div class="formLabel-labelCell">Type:</div> <div class="type" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">State:</div> + <div class="formLabel-labelCell">State:</div> <div class="state" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Durable:</div> + <div class="formLabel-labelCell">Durable:</div> <div class="durable" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Lifespan:</div> + <div class="formLabel-labelCell">Lifespan:</div> <div class="lifetimePolicy" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 300px;">Dead letter queue enabled:</div> + <div class="formLabel-labelCell">Dead letter queue enabled:</div> <div class="deadLetterQueueEnabled" style="float:left;"></div> </div> <div style="clear:both" class="virtualHostDetailsContainer"></div> @@ -53,22 +53,22 @@ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Store Transaction Settings', open: false"> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 300px;">Idle timeout before a warning (ms) :</div> + <div class="formLabel-labelCell">Idle timeout before a warning (ms) :</div> <div class="storeTransactionIdleTimeoutWarn" style="float:left;"></div> <div class="formLabel-description">The time a transaction can be idle for after which a warning alert will be issued</div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 300px;">Idle timeout before closing (ms) :</div> + <div class="formLabel-labelCell">Idle timeout before closing (ms) :</div> <div class="storeTransactionIdleTimeoutClose" style="float:left;"></div> <div class="formLabel-description">The time a transaction can be idle for before the connection it is on is closed</div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 300px;" >Open timeout before warning (ms) :</div> + <div class="formLabel-labelCell" >Open timeout before warning (ms) :</div> <div class="storeTransactionOpenTimeoutWarn" style="float:left;"></div> <div class="formLabel-description">The time a transaction can be open for after which a warning alert will be issued</div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 300px;">Open timeout before closing (ms) :</div> + <div class="formLabel-labelCell">Open timeout before closing (ms) :</div> <div class="storeTransactionOpenTimeoutClose" style="float:left;"></div> <div class="formLabel-description">The time a transaction can be open for before the connection it is on is closed</div> </div> @@ -79,11 +79,11 @@ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'House Keeping Settings', open: false"> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 300px;">House keeping check period (ms):</div> + <div class="formLabel-labelCell">House keeping check period (ms):</div> <div class="housekeepingCheckPeriod" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 300px;">House keeping thread count:</div> + <div class="formLabel-labelCell">House keeping thread count:</div> <div class="housekeepingThreadCount" style="float:left;"></div> </div> <div style="clear:both"></div> @@ -102,7 +102,7 @@ <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Statistics', open: true"> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Inbound:</div> + <div class="formLabel-labelCell">Inbound:</div> <div style="float:left;"> <span class="msgInRate"></span> <span> msg/s</span> @@ -111,7 +111,7 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Outbound:</div> + <div class="formLabel-labelCell">Outbound:</div> <div style="float:left;"> <span class="msgOutRate"></span> <span> msg/s</span> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html index d6c0bcb549..45a8447cda 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showVirtualHostNode.html @@ -23,15 +23,15 @@ <div class="virtualhostnode"> <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Virtual Host Node Attributes', open: true"> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Name:</div> + <div class="formLabel-labelCell">Name:</div> <div class="name" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Type:</div> + <div class="formLabel-labelCell">Type:</div> <div class="type" style="float:left;"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">State:</div> + <div class="formLabel-labelCell">State:</div> <div class="state" style="float:left;"></div> </div> <div class="virtualhostnodedetails" style="clear:both"> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html index 18cab14bca..8886bf9adf 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/add.html @@ -19,8 +19,8 @@ <div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store overfull size:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Store overfull size:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHost.storeOverfullSize" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props=" @@ -32,8 +32,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store underfull size:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Store underfull size:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHost.storeUnderfullSize" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props=" diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/show.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/show.html index a81511495b..b3785d6801 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/show.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/providedstore/show.html @@ -19,12 +19,12 @@ <div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Store Overfull Limit:</div> - <div style="float:left;"><span class="storeOverfullSize" ></span> bytes</div> + <div class="formLabel-labelCell">Store Overfull Limit:</div> + <div ></span> bytes</div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Store Underfull Limit:</div> - <div style="float:left;"><span class="storeUnderfullSize"></span> bytes</div> + <div class="formLabel-labelCell">Store Underfull Limit:</div> + <div></span> bytes</div> </div> <div style="clear:both"></div> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html index 92bf4556d9..fe45fde389 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/add.html @@ -19,8 +19,8 @@ <div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Message store path*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Message store path*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHost.storePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -32,8 +32,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store overfull size:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Store overfull size:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHost.storeOverfullSize" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props=" @@ -45,8 +45,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store underfull size:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Store underfull size:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHost.storeUnderfullSize" data-dojo-type="dijit/form/NumberTextBox" data-dojo-props=" diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/show.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/show.html index 23f9069ce2..245635b333 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/show.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhost/sizemonitoring/show.html @@ -19,16 +19,16 @@ <div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Store Path:</div> - <div class="storePath" style="float:left;"></div> + <div class="formLabel-labelCell">Store Path:</div> + <div class="storePath"></div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Store Overfull Limit:</div> - <div style="float:left;"><span class="storeOverfullSize" ></span> bytes</div> + <div class="formLabel-labelCell">Store Overfull Limit:</div> + <div ></span> bytes</div> </div> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 100px;">Store Underfull Limit:</div> - <div style="float:left;"><span class="storeUnderfullSize"></span> bytes</div> + <div class="formLabel-labelCell">Store Underfull Limit:</div> + <div></span> bytes</div> </div> <div style="clear:both"></div> </div> diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html index ebdb3b9c0b..fbe26745dd 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/add.html @@ -20,8 +20,8 @@ --> <div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Name*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.jsonNodeName" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" @@ -34,8 +34,8 @@ </div> </div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Store path*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Store path*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.jsonStorePath" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/show.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/show.html index 9cf5dadae8..05a85daf6e 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/show.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/virtualhostnode/json/show.html @@ -16,6 +16,6 @@ --> <div style="clear:both"> - <div class="formLabel-labelCell" style="float:left; width: 200px;">Store Path:</div> - <div class="storePath" style="float:left;"></div> -</div>
\ No newline at end of file + <div class="formLabel-labelCell">Store Path:</div> + <div class="storePath"></div> +</div> diff --git a/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html index bd1d320902..89f842cfc7 100644 --- a/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html +++ b/qpid/java/broker-plugins/memory-store/src/main/java/resources/virtualhostnode/memory/add.html @@ -20,8 +20,8 @@ --> <div> <div style="clear:both"> - <div class="formLabel-labelCell tableContainer-labelCell" style="float:left; width: 300px;">Name*:</div> - <div class="formLabel-controlCell tableContainer-valueCell" style="float:left;"> + <div class="formLabel-labelCell tableContainer-labelCell">Name*:</div> + <div class="formLabel-controlCell tableContainer-valueCell"> <input type="text" id="addVirtualHostNode.name" data-dojo-type="dijit/form/ValidationTextBox" data-dojo-props=" |