Author: orudyy
Date: Fri May 16 13:13:21 2014
New Revision: 1595188
URL: http://svn.apache.org/r1595188
Log:
QPID-5413: Improve virtual host node and virtual host UI
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNode.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNode.js
Modified:
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html?rev=1595188&r1=1595187&r2=1595188&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html
(original)
+++
qpid/trunk/qpid/java/bdbstore/src/main/java/resources/virtualhostnode/bdb_ha/add.html
Fri May 16 13:13:21 2014
@@ -31,30 +31,30 @@
</div>
</div>
<div style="clear:both">
- <div class="formLabel-labelCell tableContainer-labelCell"
style="float:left; width: 300px;">Virtual Host Name*:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell"
style="float:left; width: 300px;">Node Name*:</div>
<div class="formLabel-controlCell tableContainer-valueCell"
style="float:left;">
- <input type="text" id="addVirtualHostNode.groupName"
+ <input type="text" id="addVirtualHostNode.nodeName"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
- name: 'groupName',
- placeHolder: 'virtual host name',
+ name: 'name',
+ placeHolder: 'unique node name per broker',
required: true,
- missingMessage: 'A virtual host name must be
supplied',
- title: 'Enter virtual host name',
+ missingMessage: 'A node name must be supplied',
+ title: 'Enter a unique node name per broker',
pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
</div>
</div>
<div style="clear:both">
- <div class="formLabel-labelCell tableContainer-labelCell"
style="float:left; width: 300px;">Node Name*:</div>
+ <div class="formLabel-labelCell tableContainer-labelCell"
style="float:left; width: 300px;">Virtual Host Name*:</div>
<div class="formLabel-controlCell tableContainer-valueCell"
style="float:left;">
- <input type="text" id="addVirtualHostNode.nodeName"
+ <input type="text" id="addVirtualHostNode.groupName"
data-dojo-type="dijit/form/ValidationTextBox"
data-dojo-props="
- name: 'name',
- placeHolder: 'node name',
+ name: 'groupName',
+ placeHolder: 'virtual host name',
required: true,
- missingMessage: 'A node name must be supplied',
- title: 'Enter node name',
+ missingMessage: 'A virtual host name must be
supplied',
+ title: 'Enter virtual host name',
pattern: '^[\x20-\x2e\x30-\x7F]{1,255}$'" />
</div>
</div>
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNode.html
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNode.html?rev=1595188&r1=1595187&r2=1595188&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNode.html
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNode.html
Fri May 16 13:13:21 2014
@@ -30,6 +30,7 @@
name: 'type',
required: true,
disabled: true,
+ placeHolder: 'select node type',
title: 'Select virtual host node type',
searchAttr: 'name'">
</select>
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js?rev=1595188&r1=1595187&r2=1595188&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/Broker.js
Fri May 16 13:13:21 2014
@@ -344,18 +344,24 @@ define(["dojo/_base/xhr",
that.vhostsGrid =
new
UpdatableStore(that.brokerData.virtualhostnodes,
query(".broker-virtualhosts")[0],
[
- { name: "Node Name", field:
"name", width: "20%"},
- { name: "Node State", field:
"state", width: "15%"},
- { name: "Virtual Host Path",
field: "_item", width: "20%",
+ { name: "Node Name", field:
"name", width: "15%"},
+ { name: "Node State", field:
"state", width: "10%"},
+ { name: "Node Type", field:
"type", width: "10%"},
+ { name: "Host Name", field:
"_item", width: "15%",
formatter: function(item){
- return item &&
item.virtualhosts? item.virtualhosts[0].name: (item?item.name: "N/A");
+ return item &&
item.virtualhosts? item.virtualhosts[0].name: "N/A";
}
},
- { name: "Virtual Host
State", field: "_item", width: "15%",
+ { name: "Host State", field:
"_item", width: "10%",
formatter: function(item){
- return item &&
item.virtualhosts? item.virtualhosts[0].state: (item?item.state: "N/A");
+ return item &&
item.virtualhosts? item.virtualhosts[0].state: "N/A";
}
},
+ { name: "Host Type", field:
"_item", width: "10%",
+ formatter:
function(item){
+ return item &&
item.virtualhosts? item.virtualhosts[0].type: "N/A";
+ }
+ },
{ name: "Connections",
field: "_item", width: "10%",
formatter: function(item){
return item &&
item.virtualhosts? item.virtualhosts[0].statistics.connectionCount: 0;
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNode.js
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNode.js?rev=1595188&r1=1595187&r2=1595188&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNode.js
(original)
+++
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNode.js
Fri May 16 13:13:21 2014
@@ -80,6 +80,7 @@ define(["dojo/_base/xhr",
show: function()
{
this.form.reset();
+ this.type.set("value", null);
this.dialog.show();
},
destroy: function()
@@ -98,12 +99,12 @@ define(["dojo/_base/xhr",
},
_typeChanged: function(type)
{
+ var widgets = registry.findWidgets(this.typeFieldsContainer);
+ array.forEach(widgets, function(item) { item.destroyRecursive();});
+ domConstruct.empty(this.typeFieldsContainer);
+
if (type)
{
- var widgets = registry.findWidgets(this.typeFieldsContainer);
- array.forEach(widgets, function(item) { item.destroyRecursive();});
- domConstruct.empty(this.typeFieldsContainer);
-
var that = this;
require(["qpid/management/virtualhostnode/" + type.toLowerCase() +
"/add"],
function(TypeUI)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
