QPID-6276: [Java Broker] Disable upload feature (with tooltip to indicate why) in browsers that do not support HTML5

* Also used file icon (rather than tick) to symbolise the fact that file file is loaded client side. The tick gave the
impression that the file was valid.

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1647307 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 12 insertions, 8 deletions

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 e6a0ce467f..3c9b28e34d 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
@@ -218,16 +218,18 @@ div .messages {
 .loadingIcon
 {
     background: url("../dojo/dojox/image/resources/images/loading.gif") no-repeat;
-    width: 25px;
-    height: 25px;
+    width: 16px;
+    height: 16px;
+    background-size: contain;
     display: inline-block;
 }
 
 .loadedIcon
 {
-    background: url("../dojo/dojox/mobile/themes/common/domButtons/compat/mblDomButtonDarkBlueCheck.png") no-repeat;
-    width: 25px;
-    height: 25px;
+    background: url("../dojo/dijit/icons/images/commonIconsObjActEnabled_rtl.png") no-repeat;
+    background-position: -352px -0px;
+    width: 16px;
+    height: 16px;
     display: inline-block;
 }
 
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
index aa515fbe19..b54d7bb778 100644
--- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
+++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
@@ -112,15 +112,17 @@ define(["dojo/_base/xhr",
 
         if (this.reader)
         {
-          this.reader.onload = function(e) {that._vhnUploadFileComplete(e);};
+          this.reader.onload = function(evt) {that._vhnUploadFileComplete(evt);};
+          this.reader.onerror = function(ex) {console.error("Failed to load JSON file", ex);};
           this.virtualHostNodeFile.on("change",  function(selected){that._vhnFileChanged(selected)});
           this.virtualHostNodeFileCheck.on("change",  function(selected){that._vhnFileFlagChanged(selected)});
         }
         else
         {
           // Fall back for IE8/9 which do not support FileReader
-          this.virtualHostNodeFile.set("disabled", true);
-          this.virtualHostNodeFileCheck.set("disabled", true);
+          this.virtualHostNodeFileCheck.set("disabled", "disabled");
+          this.virtualHostNodeFileCheck.set("title", "Requires a more recent browser with HTML5 support");
+          this.virtualHostNodeFileFields.style.display = "none";
         }
 
         this.virtualHostNodeUploadFields.style.display = "none";