From 54eeeedad372e482924cecae444a52113e9661b9 Mon Sep 17 00:00:00 2001
From: Andrew MacBean <macbean@apache.org>
Date: Fri, 24 Oct 2014 08:25:40 +0000
Subject: QPID-6185: [Java Broker] Make the web management UI tables, tabs and
 panels more consistent in terms of style and STATE being displayed

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1634026 13f79535-47bb-0310-9956-ffa450edef68
---
 .../accesscontrolprovider/showAclFile.html         |  7 +++--
 .../groupprovider/showFileGroupManager.html        |  6 +++-
 .../java/resources/js/qpid/management/Broker.js    | 11 ++++----
 .../java/resources/js/qpid/management/KeyStore.js  |  2 ++
 .../resources/js/qpid/management/TrustStore.js     |  2 ++
 .../java/resources/showAccessControlProvider.html  | 33 ++++++++++++++--------
 .../src/main/java/resources/showAuthProvider.html  | 12 +++++---
 .../src/main/java/resources/showGroupProvider.html | 32 +++++++++++++--------
 .../src/main/java/resources/showKeyStore.html      |  8 ++++--
 .../src/main/java/resources/showPort.html          |  6 ++--
 .../java/resources/showPreferencesProvider.html    |  7 +++--
 .../src/main/java/resources/showTrustStore.html    | 16 +++++++----
 12 files changed, 95 insertions(+), 47 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html
index 182e651a51..24cef75737 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/accesscontrolprovider/showAclFile.html
@@ -19,6 +19,9 @@
  -
  -->
 <div class="AclFileProvider">
-    <span style="">Path:</span><span class="path" style="position:absolute; left:6em"></span>
-    <br/>
+    <div class="clear">
+        <div class="formLabel-labelCell">Path:</div>
+        <div class="path"></div>
+    </div>
+    <div class="clear"></div>
 </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html
index 5055cbdc47..d266971ee2 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/groupprovider/showFileGroupManager.html
@@ -19,7 +19,11 @@
  -
  -->
 <div class="FileGroupManager">
-    <span style="">Path:</span><span class="path" style="position:absolute; left:6em"></span>
+    <div class="clear">
+        <div class="formLabel-labelCell">Path:</div>
+        <div class="path"></div>
+    </div>
+    <div class="clear"></div>
     <br/>
     <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Groups'">
         <div class="groups"></div>
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 36eff2314a..5363882eb2 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
@@ -482,8 +482,9 @@ define(["dojo/_base/xhr",
                              that.keyStoresGrid =
                                new UpdatableStore(that.brokerData.keystores, query(".broker-key-stores")[0],
                                                [ { name: "Name",    field: "name",      width: "20%"},
-                                                 { name: "Type", field: "type", width: "20%"},
-                                                 { name: "Description", field: "description", width: "60%"}
+                                                 { name: "State",    field: "state",      width: "10%"},
+                                                 { name: "Type", field: "type", width: "10%"},
+                                                 { name: "Path", field: "path", width: "60%"}
                                                ], function(obj) {
                                                        connect.connect(obj.grid, "onRowDblClick", obj.grid,
                                                        function(evt){
@@ -497,9 +498,9 @@ define(["dojo/_base/xhr",
                              that.trustStoresGrid =
                                new UpdatableStore(that.brokerData.truststores, query(".broker-trust-stores")[0],
                                                [ { name: "Name",    field: "name",      width: "20%"},
-                                                 { name: "Path", field: "path", width: "40%"},
-                                                 { name: "Type", field: "trustStoreType", width: "5%"},
-                                                 { name: "Trust Manager Algorithm", field: "trustManagerFactoryAlgorithm", width: "25%"},
+                                                 { name: "State",    field: "state",      width: "10%"},
+                                                 { name: "Type", field: "type", width: "10%"},
+                                                 { name: "Path", field: "path", width: "50%"},
                                                  { name: "Peers only", field: "peersOnly", width: "10%",
                                                    formatter: function(val){
                                                      return "<input type='radio' disabled='disabled' "+(val ? "checked='checked'": "")+" />";
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
index ebec5bc47f..84103fdc47 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/KeyStore.js
@@ -103,6 +103,7 @@ define(["dojo/dom",
                storeNodes(["name",
                            "path",
                            "keyStoreType",
+                           "keyStoreState",
                            "keyManagerFactoryAlgorithm",
                            "certificateAlias",
                            "peersOnly"
@@ -123,6 +124,7 @@ define(["dojo/dom",
               this.name.innerHTML = entities.encode(String(this.keyStoreData[ "name" ]));
               this.path.innerHTML = entities.encode(String(this.keyStoreData[ "path" ]));
               this.keyStoreType.innerHTML = entities.encode(String(this.keyStoreData[ "keyStoreType" ]));
+              this.keyStoreState.innerHTML = entities.encode(String(this.keyStoreData[ "state" ]));
               this.keyManagerFactoryAlgorithm.innerHTML = entities.encode(String(this.keyStoreData[ "keyManagerFactoryAlgorithm" ]));
               this.certificateAlias.innerHTML = this.keyStoreData[ "certificateAlias" ] ? entities.encode(String( this.keyStoreData[ "certificateAlias" ])) : "";
            };
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
index 000a487b13..9b243ccb1f 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/TrustStore.js
@@ -104,6 +104,7 @@ define(["dojo/dom",
                storeNodes(["name",
                            "path",
                            "trustStoreType",
+                           "trustStoreState",
                            "trustManagerFactoryAlgorithm",
                            "certificateAlias",
                            "peersOnly"
@@ -124,6 +125,7 @@ define(["dojo/dom",
               this.name.innerHTML = entities.encode(String(this.keyStoreData[ "name" ]));
               this.path.innerHTML = entities.encode(String(this.keyStoreData[ "path" ]));
               this.trustStoreType.innerHTML = entities.encode(String(this.keyStoreData[ "trustStoreType" ]));
+              this.trustStoreState.innerHTML = entities.encode(String(this.keyStoreData[ "state" ]));
               this.trustManagerFactoryAlgorithm.innerHTML = entities.encode(String(this.keyStoreData[ "trustManagerFactoryAlgorithm" ]));
               this.peersOnly.innerHTML = "<input type='checkbox' disabled='disabled' "+(this.keyStoreData[ "peersOnly" ] ? "checked='checked'": "")+" />" ;
            };
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
index d017683225..b65154e83b 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showAccessControlProvider.html
@@ -18,16 +18,27 @@
  - under the License.
  -
  -->
-<div class="accessControlProvider">
-    <span style="">Name:</span><span class="name" style="position:absolute; left:6em"></span>
-    <br/>
-    <span style="">Type:</span><span class="type" style="position:absolute; left:6em"></span>
-    <br/>
-    <span style="">State:</span><span class="state" style="position:absolute; left:6em"></span>
-    <br/>
-    <div class="providerDetails"></div>
-    <div class="dijitDialogPaneActionBar">
-        <input class="deleteAccessControlProviderButton" type="button" value="Delete Access Control provider" label="Delete Access Control Provider" dojoType="dijit.form.Button" />
+<div>
+    <div class="accessControlProvider" data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Access Control Provider Attributes', open: true">
+        <div class="clear">
+            <div class="formLabel-labelCell">Name:</div>
+            <div class="name"></div>
+        </div>
+        <div class="clear">
+            <div class="formLabel-labelCell">Type:</div>
+            <div class="type"></div>
+        </div>
+        <div class="clear">
+            <div class="formLabel-labelCell">State:</div>
+            <div class="state"></div>
+        </div>
+        <div class="clear"></div>
+
+        <div class="providerDetails"></div>
+
+
+        <div class="dijitDialogPaneActionBar">
+            <input class="deleteAccessControlProviderButton" type="button" value="Delete Access Control provider" label="Delete Access Control Provider" dojoType="dijit.form.Button" />
+        </div>
     </div>
 </div>
-<br/>
\ No newline at end of file
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 0dc71cb582..ca78fc5a43 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
@@ -18,7 +18,7 @@
  - under the License.
  -
  -->
-<div class="authorizationProvider">
+<div class="authorizationProvider" data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Authentication Provider Attributes', open: true">
     <div class="clear">
         <div class="formLabel-labelCell">Name:</div>
         <div class="name"></div>
@@ -31,12 +31,16 @@
         <div class="formLabel-labelCell">State:</div>
         <div class="state"></div>
     </div>
+
     <div class="clear"></div>
-    <button data-dojo-type="dijit.form.Button" class="editAuthenticationProviderButton">Edit</button>
-    <button data-dojo-type="dijit.form.Button" class="deleteAuthenticationProviderButton">Delete</button>
+    <div class="clear dijitDialogPaneActionBar">
+        <button data-dojo-type="dijit.form.Button" class="editAuthenticationProviderButton" type="button">Edit</button>
+        <button data-dojo-type="dijit.form.Button" class="deleteAuthenticationProviderButton" type="button">Delete</button>
+    </div>
     <br/>
     <br/>
-    <div class="preferencesPanel" data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Preferences Provider',  open: true">
+    <div class="clear"></div>
+    <div class="clear preferencesPanel" data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Preferences Provider',  open: true">
       <div class="preferencesProviderDetails"></div>
       <button data-dojo-type="dijit.form.Button" class="addPreferencesProviderButton">Add</button>
     </div>
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
index 5ab5573b40..9fa6a7a612 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showGroupProvider.html
@@ -18,16 +18,26 @@
  - under the License.
  -
  -->
-<div class="groupProvider">
-    <span style="">Name:</span><span class="name" style="position:absolute; left:6em"></span>
-    <br/>
-    <span style="">Type:</span><span class="type" style="position:absolute; left:6em"></span>
-    <br/>
-    <span style="">State:</span><span class="state" style="position:absolute; left:6em"></span>
-    <br/>
-    <div class="providerDetails"></div>
-    <div class="dijitDialogPaneActionBar">
-        <input class="deleteGroupProviderButton" type="button" value="Delete Group provider" label="Delete Group Provider" dojoType="dijit.form.Button" />
+<div>
+    <div class="groupProvider" data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Group Provider Attributes', open: true">
+        <div class="clear">
+            <div class="formLabel-labelCell">Name:</div>
+            <div class="name"></div>
+        </div>
+        <div class="clear">
+            <div class="formLabel-labelCell">Type:</div>
+            <div class="type"></div>
+        </div>
+        <div class="clear">
+            <div class="formLabel-labelCell">State:</div>
+            <div class="state"></div>
+        </div>
+        <div class="clear"></div>
+
+        <div class="providerDetails"></div>
+
+        <div class="dijitDialogPaneActionBar">
+            <input class="deleteGroupProviderButton" type="button" value="Delete Group provider" label="Delete Group Provider" dojoType="dijit.form.Button" />
+        </div>
     </div>
 </div>
-<br/>
\ No newline at end of file
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 f5e116b294..33987a8397 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
@@ -19,7 +19,7 @@
  -
  -->
 <div class="keystore">
-    <div class="keyStoreContainer">
+    <div class="keyStoreContainer" data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'KeyStore Attributes', open: true">
 
        <div class="formLabel-labelCell">Name:</div>
        <div class="nameValue"></div>
@@ -27,6 +27,9 @@
        <div class="formLabel-labelCell">Type:</div>
        <div class="keyStoreTypeValue"></div>
 
+       <div class="formLabel-labelCell">State:</div>
+       <div class="keyStoreStateValue"></div>
+
        <div class="formLabel-labelCell">Key Manager Factory Algorithm:</div>
        <div class="keyManagerFactoryAlgorithmValue"></div>
 
@@ -37,8 +40,9 @@
           <div class="formLabel-labelCell">Certificate alias:</div>
           <div class="certificateAliasValue"></div>
        </div>
-
+       <div class="clear"></div>
     </div>
+
     <br/>
     <div class="dijitDialogPaneActionBar">
         <button data-dojo-type="dijit.form.Button" class="editKeyStoreButton" type="button">Edit</button>
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 1efae12bbf..32071e262d 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
@@ -19,14 +19,14 @@
  -
  -->
 <div>
-    <div class="portContainer">
+    <div class="portContainer" data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Port Attributes', open: true">
 
        <div class="clear name">
            <div class="formLabel-labelCell">Name:</div>
            <div class="nameValue"></div>
        </div>
 
-       <div class="clear name">
+       <div class="clear type">
            <div class="formLabel-labelCell">Port Type:</div>
            <div class="typeValue"></div>
        </div>
@@ -80,7 +80,7 @@
           <div class="formLabel-labelCell">Trust Stores:</div>
           <div class="trustStoresValue multiLineValue"></div>
        </div>
-
+       <div class="clear"></div>
     </div>
     <br/>
 
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 4acb12b43a..a955259d72 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
@@ -35,6 +35,9 @@
      <div class="preferencesDetails"></div>
   </div>
   <br/>
-  <button data-dojo-type="dijit.form.Button" class="deletePreferencesProviderButton">Delete</button>
-  <button data-dojo-type="dijit.form.Button" class="editPreferencesProviderButton">Edit</button>
+  <div class="clear"></div>
+  <div class="clear dijitDialogPaneActionBar">
+    <button data-dojo-type="dijit.form.Button" class="editPreferencesProviderButton">Edit</button>
+    <button data-dojo-type="dijit.form.Button" class="deletePreferencesProviderButton">Delete</button>
+  </div>
 </div>
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 eb0e385aa3..2b35efd502 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
@@ -19,26 +19,30 @@
  -
  -->
 <div class="truststore">
-    <div class="trustStoreContainer">
+    <div class="trustStoreContainer" data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'TrustStore Attributes', open: true">
 
        <div class="formLabel-labelCell">Name:</div>
-       <div class="nameValue"></div><br/>
+       <div class="nameValue"></div>
 
        <div class="formLabel-labelCell">Type:</div>
-       <div class="trustStoreTypeValue"></div><br/>
+       <div class="trustStoreTypeValue"></div>
+
+       <div class="formLabel-labelCell">State:</div>
+       <div class="trustStoreStateValue"></div>
 
        <div class="formLabel-labelCell">Trust Manager Factory Algorithm:</div>
-       <div class="trustManagerFactoryAlgorithmValue"></div><br/>
+       <div class="trustManagerFactoryAlgorithmValue"></div>
 
        <div class="formLabel-labelCell">Path:</div>
-       <div class="pathValue"></div><br/>
+       <div class="pathValue"></div>
 
        <div class="peersOnly">
           <div class="formLabel-labelCell">Peer store:</div>
           <div class="peersOnlyValue"></div>
        </div>
-
+       <div class="clear"></div>
     </div>
+
     <br/>
     <div class="dijitDialogPaneActionBar">
         <button data-dojo-type="dijit.form.Button" class="editTrustStoreButton" type="button">Edit</button>
-- 
cgit v1.2.1