diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2014-08-23 15:45:14 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2014-08-23 15:45:14 +0000 |
| commit | 963745a0c199240520315e4e31e34682820a5256 (patch) | |
| tree | 901bfea2309b7ebb7410ff099ed87a23d5a3fb40 /qpid/java/broker-plugins/management-http/src | |
| parent | 672f8e531132cb7780d1d09b6eb3a3d5e6ba397e (diff) | |
| download | qpid-python-963745a0c199240520315e4e31e34682820a5256.tar.gz | |
QPID-6038 : [Java Broker] display exchange type on exchange view in HTTP management
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1620037 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins/management-http/src')
2 files changed, 37 insertions, 20 deletions
diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js index cfa985f551..2ac881abc1 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Exchange.js @@ -140,6 +140,7 @@ define(["dojo/_base/xhr", } storeNodes(["name", + "type", "state", "durable", "lifetimePolicy", @@ -197,6 +198,8 @@ define(["dojo/_base/xhr", ExchangeUpdater.prototype.updateHeader = function() { this.name.innerHTML = entities.encode(String(this.exchangeData[ "name" ])); + this["type"].innerHTML = entities.encode(String(this.exchangeData[ "type" ])); + this.state.innerHTML = entities.encode(String(this.exchangeData[ "state" ])); this.durable.innerHTML = entities.encode(String(this.exchangeData[ "durable" ])); this.lifetimePolicy.innerHTML = entities.encode(String(this.exchangeData[ "lifetimePolicy" ])); diff --git a/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html b/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html index 0f9f75817f..b67ea2f590 100644 --- a/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html +++ b/qpid/java/broker-plugins/management-http/src/main/java/resources/showExchange.html @@ -25,8 +25,37 @@ <div class="name"></div> </div> <div class="clear"> - <div class="formLabel-labelCell">State:</div> - <div class="state"></div> + <div class="alignLeft"> + + <div class="clear"> + <div class="formLabel-labelCell">Type:</div> + <div class="type formValue-valueCell"></div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">State:</div> + <div class="state formValue-valueCell"></div> + </div> + </div> + <div class="alignRight"> + <div class="clear"> + <div class="formLabel-labelCell">Inbound:</div> + <div class="formValue-valueCell"> + <span class="msgInRate"></span> + <span> msg/s</span> + <span class="bytesInRate">(</span> + <span class="bytesInRateUnits">)</span> + </div> + </div> + <div class="clear"> + <div class="formLabel-labelCell">Dropped:</div> + <div class="formValue-valueCell"> + <span class="msgDropRate"></span> + <span> msg/s</span> + <span class="bytesDropRate">(</span> + <span class="bytesDropRateUnits">)</span> + </div> + </div> + </div> </div> <div class="clear"> <div class="formLabel-labelCell">Durable:</div> @@ -36,33 +65,18 @@ <div class="formLabel-labelCell">Lifespan:</div> <div class="lifetimePolicy"></div> </div> - <div class="clear"> - <div class="formLabel-labelCell">Inbound:</div> - <div> - <span class="msgInRate"></span> - <span> msg/s</span> - <span class="bytesInRate">(</span> - <span class="bytesInRateUnits">)</span> - </div> - </div> - <div class="clear"> - <div class="formLabel-labelCell">Dropped:</div> - <div> - <span class="msgDropRate"></span> - <span> msg/s</span> - <span class="bytesDropRate">(</span> - <span class="bytesDropRateUnits">)</span> - </div> - </div> + <div class="clear"></div> </div> <br/> + <div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Bindings'"> <div class="bindings"></div> <button data-dojo-type="dijit.form.Button" class="addBindingButton">Add Binding</button> <button data-dojo-type="dijit.form.Button" class="deleteBindingButton">Delete Binding</button> </div> <br/> + <div class="dijitDialogPaneActionBar"> <button data-dojo-type="dijit.form.Button" class="deleteExchangeButton" type="button">Delete Exchange</button> </div> |