From c747d3860b68cd9f166748a0b7c2b72e8a547e3b Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Mon, 4 Aug 2014 11:32:01 +0000
Subject: QPID-5958: [Java Broker UI] Add missing panel surrounding connection
 attributes.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1615532 13f79535-47bb-0310-9956-ffa450edef68
---
 .../resources/js/qpid/management/Connection.js     |  13 +--
 .../src/main/java/resources/showConnection.html    | 112 +++++++++++----------
 2 files changed, 64 insertions(+), 61 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
index 6c20f85dc0..34d9a9b2de 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Connection.js
@@ -109,10 +109,10 @@ define(["dojo/_base/xhr",
 
                                    that.updateHeader();
                                    that.sessionsGrid = new UpdatableStore(that.connectionData.sessions, findNode("sessions"),
-                                                            [ { name: "Name", field: "name", width: "70px"},
-                                                              { name: "Consumers", field: "consumerCount", width: "90px"},
-                                                              { name: "Unacknowledged messages", field: "unacknowledgedMessages", width: "110px"},
-                                                              { name: "Current store transaction start", field: "transactionStartTime", width: "200px",
+                                                            [ { name: "Name", field: "name", width: "20%"},
+                                                              { name: "Consumers", field: "consumerCount", width: "15%"},
+                                                              { name: "Unacknowledged messages", field: "unacknowledgedMessages", width: "15%"},
+                                                              { name: "Current store transaction start", field: "transactionStartTime", width: "25%",
                                                                 formatter: function (transactionStartTime)
                                                                 {
                                                                     if (transactionStartTime > 0)
@@ -125,7 +125,7 @@ define(["dojo/_base/xhr",
                                                                     }
                                                                 }
                                                              },
-                                                             {  name: "Current store transaction update", field: "transactionUpdateTime", width: "100%",
+                                                             {  name: "Current store transaction update", field: "transactionUpdateTime", width: "25%",
                                                                 formatter: function (transactionUpdateTime)
                                                                 {
                                                                     if (transactionUpdateTime > 0)
@@ -153,7 +153,8 @@ define(["dojo/_base/xhr",
               this.principal.innerHTML = entities.encode(String(this.connectionData[ "principal" ]));
               this.port.innerHTML = entities.encode(String(this.connectionData[ "port" ]));
               this.transport.innerHTML = entities.encode(String(this.connectionData[ "transport" ]));
-              this.remoteProcessPid.innerHTML = entities.encode(String(this.connectionData[ "remoteProcessPid" ]));
+              var remoteProcessPid = this.connectionData[ "remoteProcessPid" ];
+              this.remoteProcessPid.innerHTML = entities.encode(String(remoteProcessPid ? remoteProcessPid : "N/A"));
               this.createdTime.innerHTML = UserPreferences.formatDateTime(this.connectionData[ "createdTime" ], {addOffset: true, appendTimeZone: true});
               this.lastIoTime.innerHTML = UserPreferences.formatDateTime(this.connectionData[ "lastIoTime" ], {addOffset: true, appendTimeZone: true});
            };
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
index 7b76b42473..856ac9a75f 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showConnection.html
@@ -19,69 +19,71 @@
  -
  -->
 <div class="connection">
-    <div class="alignLeft">
-        <div style="clear:both">
-            <div class="formLabel-labelCell">Name:</div>
-            <div class="name" style="float:left;"></div>
+    <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Connection Attributes',  open: true">
+        <div class="alignLeft">
+            <div style="clear:both">
+                <div class="formLabel-labelCell">Name:</div>
+                <div class="name" style="float:left;"></div>
+            </div>
+            <div style="clear:both">
+                <div class="formLabel-labelCell">User:</div>
+                <div class="principal" style="float:left;"></div>
+            </div>
+            <div style="clear:both">
+                <div class="formLabel-labelCell">Client ID:</div>
+                <div class="clientId" style="float:left;"></div>
+            </div>
+            <div style="clear:both">
+                <div class="formLabel-labelCell">Client Version:</div>
+                <div class="clientVersion" style="float:left;"></div>
+            </div>
         </div>
-        <div style="clear:both">
-            <div class="formLabel-labelCell">User:</div>
-            <div class="principal" style="float:left;"></div>
+        <div class="alignRight">
+            <div>
+                <div class="formLabel-labelCell">Inbound:</div>
+                <div class="alignRight">
+                    <span class="msgInRate"></span>
+                    <span> msg/s</span>
+                    <span class="bytesInRate"></span>
+                    <span class="bytesInRateUnits"></span>
+                </div>
+            </div>
+            <div>
+                <div class="formLabel-labelCell">Outbound:</div>
+                <div class="alignRight">
+                    <span class="msgOutRate"></span>
+                    <span> msg/s</span>
+                    <span class="bytesOutRate"></span>
+                    <span class="bytesOutRateUnits"></span>
+                </div>
+            </div>
+            <div>
+                <div class="formLabel-labelCell">Connect Time:</div>
+                <div class="alignRight">
+                    <div class="createdTime"></div>
+                </div>
+            </div>
+            <div>
+                <div class="formLabel-labelCell">Last I/O Time:</div>
+                <div class="alignRight">
+                    <div class="lastIoTime"></div>
+                </div>
+            </div>
         </div>
+        <div style="clear:both"></div>
         <div style="clear:both">
-            <div class="formLabel-labelCell">Client ID:</div>
-            <div class="clientId" style="float:left;"></div>
+            <div class="formLabel-labelCell">Remote Process (PID):</div>
+            <div class="remoteProcessPid"></div>
         </div>
         <div style="clear:both">
-            <div class="formLabel-labelCell">Client Version:</div>
-            <div class="clientVersion" style="float:left;"></div>
-        </div>
-    </div>
-    <div class="alignRight">
-        <div>
-            <div class="formLabel-labelCell">Inbound:</div>
-            <div class="alignRight">
-                <span class="msgInRate"></span>
-                <span> msg/s</span>
-                <span class="bytesInRate"></span>
-                <span class="bytesInRateUnits"></span>
-            </div>
-        </div>
-        <div>
-            <div class="formLabel-labelCell">Outbound:</div>
-            <div class="alignRight">
-                <span class="msgOutRate"></span>
-                <span> msg/s</span>
-                <span class="bytesOutRate"></span>
-                <span class="bytesOutRateUnits"></span>
-            </div>
-        </div>
-        <div>
-            <div class="formLabel-labelCell">Connect Time:</div>
-            <div class="alignRight">
-                <div class="createdTime"></div>
-            </div>
+            <div class="formLabel-labelCell">Port:</div>
+            <div class="port"></div>
         </div>
-        <div>
-            <div class="formLabel-labelCell">Last I/O Time:</div>
-            <div class="alignRight">
-                <div class="lastIoTime"></div>
-            </div>
+        <div style="clear:both">
+            <div class="formLabel-labelCell">Transport:</div>
+            <div class="transport"></div>
         </div>
     </div>
-    <div style="clear:both"></div>
-    <div style="clear:both">
-        <div class="formLabel-labelCell">Remote Process (PID):</div>
-        <div class="remoteProcessPid" style="float:left;"></div>
-    </div>
-    <div style="clear:both">
-        <div class="formLabel-labelCell">Port:</div>
-        <div class="port" style="float:left;"></div>
-    </div>
-    <div style="clear:both">
-        <div class="formLabel-labelCell">Transport:</div>
-        <div class="transport" style="float:left;"></div>
-    </div>
     <div style="clear:both"/>
 
     <br/>
-- 
cgit v1.2.1