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

3 files changed, 10 insertions, 5 deletions

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'": "")+" />" ;
            };