From b36b024668c03b8943eaea3f3da1f1f1fa81c4cf Mon Sep 17 00:00:00 2001
From: Andrew MacBean <macbean@apache.org>
Date: Mon, 11 Aug 2014 13:25:17 +0000
Subject: QPID-5986: [Java Broker] right aligned attributes on queue,
 connection and virtualhost tabs not correct in IE

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1617275 13f79535-47bb-0310-9956-ffa450edef68
---
 .../management-http/src/main/java/resources/css/common.css     |  6 ++++++
 .../src/main/java/resources/showConnection.html                |  8 ++++----
 .../management-http/src/main/java/resources/showQueue.html     | 10 +++++-----
 .../src/main/java/resources/showVirtualHost.html               |  4 ++--
 4 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'qpid/java')

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 9df7305782..bfe0839cbc 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
@@ -223,13 +223,18 @@ div .messages {
 
 .alignLeft {
     float: left;
+    display: inline-block;
 }
+
 .alignRight {
     float: right;
+    display: inline-block;
 }
+
 .multiLineValue {
     display: inline-block;
 }
+
 .haOptionLabel {
     font-weight: bold;
     margin-left: 5px;
@@ -238,3 +243,4 @@ div .messages {
     font-style: italic;
     margin: 0px 0px 10px 5px;
 }
+
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 1ac09ff8f1..cd04b962ce 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
@@ -39,7 +39,7 @@
             </div>
         </div>
         <div class="alignRight">
-            <div>
+            <div class="clear">
                 <div class="formLabel-labelCell">Inbound:</div>
                 <div class="formValue-valueCell">
                     <span class="msgInRate"></span>
@@ -48,7 +48,7 @@
                     <span class="bytesInRateUnits"></span>
                 </div>
             </div>
-            <div>
+            <div class="clear">
                 <div class="formLabel-labelCell">Outbound:</div>
                 <div class="formValue-valueCell">
                     <span class="msgOutRate"></span>
@@ -57,13 +57,13 @@
                     <span class="bytesOutRateUnits"></span>
                 </div>
             </div>
-            <div>
+            <div class="clear">
                 <div class="formLabel-labelCell">Connect Time:</div>
                 <div class="formValue-valueCell">
                     <div class="createdTime"></div>
                 </div>
             </div>
-            <div>
+            <div class="clear">
                 <div class="formLabel-labelCell">Last I/O Time:</div>
                 <div class="formValue-valueCell">
                     <div class="lastIoTime"></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 961f60e214..e5b9699c64 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
@@ -50,7 +50,7 @@
             </div>
         </div>
         <div class="alignRight">
-            <div>
+            <div class="clear">
                 <div class="formLabel-labelCell">Inbound:</div>
                 <div class="formValue-valueCell">
                     <span class="msgInRate"></span>
@@ -59,7 +59,7 @@
                     <span class="bytesInRateUnits"></span>
                 </div>
             </div>
-            <div>
+            <div class="clear">
                 <div class="formLabel-labelCell">Outbound:</div>
                 <div class="formValue-valueCell">
                     <span class="msgOutRate"></span>
@@ -68,7 +68,7 @@
                     <span class="bytesOutRateUnits"></span>
                 </div>
             </div>
-            <div>
+            <div class="clear">
                 <div class="formLabel-labelCell">Size:</div>
                 <div class="formValue-valueCell">
                     <span class="queueDepthMessages"></span>
@@ -77,7 +77,7 @@
                     <span class="queueDepthBytesUnits">)</span>
                 </div>
             </div>
-            <div>
+            <div class="clear">
                 <div class="formLabel-labelCell">Pre-fetched:</div>
                 <div class="formValue-valueCell">
                     <span class="unacknowledgedMessages"></span>
@@ -86,7 +86,7 @@
                     <span class="unacknowledgedBytesUnits">)</span>
                 </div>
             </div>
-            <div>
+            <div class="clear">
                 <div class="formLabel-labelCell">Oldest Message Age:</div>
                 <div class="formValue-valueCell">
                     <span class="oldestMessageAge"></span>
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 f031d84458..a99c73fbf9 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
@@ -33,7 +33,7 @@
             </div>
         </div>
         <div class="alignRight">
-            <div>
+            <div class="clear">
                 <div class="formLabel-labelCell">Inbound:</div>
                 <div class="formValue-valueCell">
                     <span class="msgInRate"></span>
@@ -42,7 +42,7 @@
                     <span class="bytesInRateUnits"></span>
                 </div>
             </div>
-            <div>
+            <div class="clear">
                 <div class="formLabel-labelCell">Outbound:</div>
                 <div class="formValue-valueCell">
                     <span class="msgOutRate"></span>
-- 
cgit v1.2.1