diff options
| author | Keith Wall <kwall@apache.org> | 2014-07-21 11:08:09 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-07-21 11:08:09 +0000 |
| commit | 211a72d92881514ee10161ba56c8c62b1eb2b581 (patch) | |
| tree | 08940f816e2672dc3201dbca9079bd97fe2dfc35 /qpid/java/broker-plugins | |
| parent | 49d25b3a93209cd6a2cf9e4d2b5a32d994419a2e (diff) | |
| download | qpid-python-211a72d92881514ee10161ba56c8c62b1eb2b581.tar.gz | |
QPID-5413: [Java Broker] BDB HA VHN/VH UI
* Fix fieldset border styling and use dojo's object.keys() [IE7/8 does not support Object.keys()]
* Add support for permitted node list
Work completed by Andrew MacBean <macbean@apache.org> and me.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1612247 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
2 files changed, 20 insertions, 7 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 2291fdf816..8a0ea792f5 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 @@ -91,31 +91,41 @@ div .messages { } .formBox { - border: .1em solid lightgrey; margin: 10px 5px; - border-radius: 5px; } .formBox legend { font-weight: bold; - margin-top: -10px; margin-left: 5px; background-color: white; } .formBox fieldset { padding: 5px; + border: .1em solid lightgrey; + border-radius: 5px; } .formBox .formLabel-labelCell { margin-left: 5px; } +.formBox .addPermittedNodeList { + width: 15em; +} + +.formBox .addPermittedNodeList select { + width: 100%; +} + +.formBoxButtons { + float : right; +} + .formLabel-labelCell { font-weight: bold; } - .formLabel-controlCell { padding: 1px; } @@ -193,4 +203,6 @@ div .messages { { padding: 5px; font-style: italic; -}
\ No newline at end of file +} + + 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 1b1b2914e3..19854d92cf 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 @@ -27,6 +27,7 @@ define(["dojo/_base/xhr", "dojo/json", "dojo/parser", "dojo/store/Memory", + "dojox/lang/functional/object", "dijit/registry", "dijit/Dialog", "dijit/form/Button", @@ -39,7 +40,7 @@ define(["dojo/_base/xhr", "dojox/validate/us", "dojox/validate/web", "dojo/domReady!"], - function (xhr, event, lang, array, dom, domConstruct, json, parser, Memory, registry, Dialog, Button, FilteringSelect, properties, template) + function (xhr, event, lang, array, dom, domConstruct, json, parser, Memory, fobject, registry, Dialog, Button, FilteringSelect, properties, template) { var addVirtualHostNodeAndVirtualHost = @@ -320,7 +321,7 @@ define(["dojo/_base/xhr", } // One or more context variables were defined on form - if (Object.keys(contextMap).length > 0) + if (fobject.keys(contextMap).length > 0) { values ["context"] = contextMap; } |
