You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2012/06/04 22:15:17 UTC
svn commit: r1346142 - in
/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources:
./ css/ js/qpid/management/
Author: rgodfrey
Date: Mon Jun 4 20:15:17 2012
New Revision: 1346142
URL: http://svn.apache.org/viewvc?rev=1346142&view=rev
Log:
QPID-3999 : Wire in addQueue to single management screen
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/css/common.css
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/VirtualHost.js
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/addQueue.js
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/treeView.js
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/showVirtualHost.html
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/css/common.css
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/css/common.css?rev=1346142&r1=1346141&r2=1346142&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/css/common.css (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/css/common.css Mon Jun 4 20:15:17 2012
@@ -24,8 +24,8 @@
html, body {
height: 100%;
- width: 800px;
margin: 0;
+ margin-right: 40px;
padding: 0;
overflow: hidden;
font-family: Lucida Sans,Lucida Grande,Arial !important;
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/VirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/VirtualHost.js?rev=1346142&r1=1346141&r2=1346142&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/VirtualHost.js (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/VirtualHost.js Mon Jun 4 20:15:17 2012
@@ -27,8 +27,9 @@ define(["dojo/_base/xhr",
"qpid/common/util",
"qpid/common/formatter",
"qpid/common/UpdatableStore",
+ "qpid/management/addQueue",
"dojo/domReady!"],
- function (xhr, parser, query, connect, properties, updater, util, formatter, UpdatableStore) {
+ function (xhr, parser, query, connect, properties, updater, util, formatter, UpdatableStore, addQueue) {
function VirtualHost(name, parent, controller) {
this.name = name;
@@ -59,7 +60,11 @@ define(["dojo/_base/xhr",
updater.add( that.vhostUpdater );
that.vhostUpdater.update();
+
+ var addQueueButton = query(".addQueueButton", contentPane.containerNode)[0];
+ connect.connect(addQueueButton, "onclick", function(evt){ addQueue.show(that.name) });
}});
+
};
VirtualHost.prototype.close = function() {
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/addQueue.js
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/addQueue.js?rev=1346142&r1=1346141&r2=1346142&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/addQueue.js (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/addQueue.js Mon Jun 4 20:15:17 2012
@@ -28,6 +28,18 @@ define(["dojo/_base/xhr",
"dojo/_base/event",
'dojo/_base/json',
"dijit/form/NumberSpinner", // required by the form
+ /* dojox/ validate resources */
+ "dojox/validate/us", "dojox/validate/web",
+ /* basic dijit classes */
+ "dijit/Dialog",
+ "dijit/form/CheckBox", "dijit/form/Textarea",
+ "dijit/form/FilteringSelect", "dijit/form/TextBox",
+ "dijit/form/ValidationTextBox", "dijit/form/DateTextBox",
+ "dijit/form/TimeTextBox", "dijit/form/Button",
+ "dijit/form/RadioButton", "dijit/form/Form",
+ "dijit/form/DateTextBox",
+ /* basic dojox classes */
+ "dojox/form/BusyButton", "dojox/form/CheckedMultiSelect",
"dojo/domReady!"],
function (xhr, dom, construct, win, registry, parser, array, event, json) {
@@ -138,7 +150,6 @@ define(["dojo/_base/xhr",
addQueue.show = function(vhost) {
addQueue.vhost = vhost;
registry.byId("formAddQueue").reset();
- // hide all non-standard queue rows
registry.byId("addQueue").show();
};
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/treeView.js
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/treeView.js?rev=1346142&r1=1346141&r2=1346142&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/treeView.js (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/js/qpid/management/treeView.js Mon Jun 4 20:15:17 2012
@@ -23,9 +23,10 @@ define(["dojo/_base/xhr",
"dojo/io-query",
"dijit/Tree",
"qpid/common/util",
+ "qpid/common/updater",
"qpid/management/controller",
"dojo/domReady!"],
- function (xhr, query, ioQuery, Tree, util, controller) {
+ function (xhr, query, ioQuery, Tree, util, updater, controller) {
function TreeViewModel(queryString) {
this.query = queryString;
@@ -302,6 +303,7 @@ define(["dojo/_base/xhr",
}, true);
tree.startup();
+ updater.add( treeModel );
});
return TreeViewModel;
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/showVirtualHost.html
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/showVirtualHost.html?rev=1346142&r1=1346141&r2=1346142&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/showVirtualHost.html (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/resources/showVirtualHost.html Mon Jun 4 20:15:17 2012
@@ -46,7 +46,7 @@
<br/>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Queues'">
<div class="queues"></div>
- <button data-dojo-type="dijit.form.Button" onclick="showAddQueue();">Add Queue</button>
+ <button data-dojo-type="dijit.form.Button" class="addQueueButton">Add Queue</button>
</div>
<br/>
<div data-dojo-type="dijit.TitlePane" data-dojo-props="title: 'Connections'">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org