From 135ca4526244a4d5b1a960122f3d00f2c07c5344 Mon Sep 17 00:00:00 2001
From: Andrew MacBean <macbean@apache.org>
Date: Tue, 29 Jul 2014 10:05:03 +0000
Subject: 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
---
 .../java/resources/virtualhost/bdb_ha/show.html    | 12 +++++-----
 .../java/resources/virtualhostnode/bdb/add.html    |  8 +++----
 .../java/resources/virtualhostnode/bdb/show.html   |  4 ++--
 .../java/resources/virtualhostnode/bdb_ha/add.html |  4 ++--
 .../bdb_ha/add/existinggroup/add.html              | 24 +++++++++----------
 .../virtualhostnode/bdb_ha/add/newgroup/add.html   | 24 +++++++++----------
 .../resources/virtualhostnode/bdb_ha/edit.html     | 14 +++++------
 .../resources/virtualhostnode/bdb_ha/show.html     | 28 +++++++++++-----------
 8 files changed, 59 insertions(+), 59 deletions(-)

(limited to 'qpid/java/bdbstore')

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>
-- 
cgit v1.2.1