diff options
Diffstat (limited to 'qpid/java/broker-plugins/management-http/src/main/java')
6 files changed, 33 insertions, 17 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/addBinding.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/addBinding.html index b57e3a1a24..a07419977b 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/addBinding.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/addBinding.html @@ -38,6 +38,7 @@ data-dojo-props=" name: 'name', placeHolder: 'Binding Key', + required: true, missingMessage: 'A binding key must be supplied', title: 'Enter binding key'" /> </div> @@ -49,8 +50,8 @@ <div class="editNoteBanner">NOTE: Only arguments with name and value will be submitted. To edit, please, click on a grid cell.</div> <div id="formAddbinding.bindingArguments"></div> <div> - <button data-dojo-type="dijit/form/Button" id="formAddbinding.addArgumentButton" type="button">Add</button> - <button data-dojo-type="dijit/form/Button" id="formAddbinding.deleteArgumentButton" type="button">Delete</button> + <button data-dojo-type="dijit/form/Button" id="formAddbinding.addArgumentButton" type="button" data-dojo-props="title:'Add new binding argument'">+</button> + <button data-dojo-type="dijit/form/Button" id="formAddbinding.deleteArgumentButton" type="button" data-dojo-props="title:'Remove selected binding argument(s)'">-</button> </div> </fieldset> </div> 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/js/qpid/management/addBinding.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js index deda3f35d5..8e70b78446 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addBinding.js @@ -14,7 +14,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -define(["dojo/_base/xhr", +define(["dojo/_base/connect", + "dojo/_base/xhr", "dojo/dom", "dojo/dom-construct", "dojo/_base/window", @@ -43,11 +44,10 @@ define(["dojo/_base/xhr", "dojox/grid/EnhancedGrid", "dojo/data/ObjectStore", "dojo/domReady!"], - function (xhr, dom, construct, win, registry, parser, array, event, json, lang, declare, Memory, FilteringSelect) { + function (connect, xhr, dom, construct, win, registry, parser, array, event, json, lang, declare, Memory, FilteringSelect) { var noLocalValues = new Memory({ data: [ - {name:"", id:null}, {name:"true", id:true}, {name:"false", id:false} ] @@ -243,7 +243,7 @@ define(["dojo/_base/xhr", store: objectStore, singleClickEdit: true, structure: layout, - height: "150px", + autoHeight: true, plugins: {indirectSelection: true} }, argumentsGridNode); grid.startup(); @@ -253,6 +253,15 @@ define(["dojo/_base/xhr", var addArgumentButton = registry.byId("formAddbinding.addArgumentButton"); var deleteArgumentButton = registry.byId("formAddbinding.deleteArgumentButton"); + var toggleGridButtons = function(index) + { + var data = grid.selection.getSelected(); + deleteArgumentButton.set("disabled", !data || data.length==0); + }; + connect.connect(grid.selection, 'onSelected', toggleGridButtons); + connect.connect(grid.selection, 'onDeselected', toggleGridButtons); + deleteArgumentButton.set("disabled", true); + addArgumentButton.on("click", function(event) { 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> |