You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2014/09/17 18:47:06 UTC
svn commit: r1625650 - in
/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources:
./ js/qpid/common/ js/qpid/management/
Author: orudyy
Date: Wed Sep 17 16:47:06 2014
New Revision: 1625650
URL: http://svn.apache.org/r1625650
Log:
QPID-6093: Address code review comments:
1) Display promptMessages in edit broker dialog
2) Fix issue with button disaperaing on dialog resize on editing VH/VHN and broker
3) Fix context name/value pair editing in Safari
4) Stop posting form data on pressing Cancel button in dialogs for editing VH/VHN and broker
Modified:
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editBroker.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html?rev=1625650&r1=1625649&r2=1625650&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/addVirtualHostNodeAndVirtualHost.html Wed Sep 17 16:47:06 2014
@@ -20,7 +20,7 @@
-->
<div class="dijitHidden">
<div data-dojo-type="dijit.Dialog" style="width:600px;" data-dojo-props="title:'Add'" id="addVirtualHostNodeAndVirtualHost">
-
+ <div id="addVirtualHostNodeAndVirtualHost.contentPane">
<!-- VHN Form -->
<form id="addVirtualHostNode.form" method="post" data-dojo-type="dijit/form/Form">
@@ -99,10 +99,10 @@
</fieldset>
</div>
</form>
-
- <div class="dijitDialogPaneActionBar">
+ </div>
+ <div class="dijitDialogPaneActionBar">
<button data-dojo-type="dijit/form/Button" id="addVirtualHostNodeAndVirtualHost.addButton" data-dojo-props="label: 'Add'" type="submit"></button>
<button data-dojo-type="dijit/form/Button" id="addVirtualHostNodeAndVirtualHost.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
- </div>
+ </div>
</div>
</div>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editBroker.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editBroker.html?rev=1625650&r1=1625649&r2=1625650&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editBroker.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editBroker.html Wed Sep 17 16:47:06 2014
@@ -20,6 +20,7 @@
<div data-dojo-type="dijit/Dialog" data-dojo-props="title:'Edit Broker'" id="editBrokerDialog">
<form id="editBrokerForm" method="post" data-dojo-type="dijit/form/Form">
<div id="editBroker.allFields">
+ <div id="editBroker.contentPane">
<div class="clear">
<div class="formLabel-labelCell tableContainer-labelCell">Name*:</div>
<div class="formLabel-controlCell tableContainer-valueCell">
@@ -107,11 +108,11 @@
</div>
<div class="clear"></div>
-
- <div class="dijitDialogPaneActionBar">
+ </div>
+ <div class="dijitDialogPaneActionBar">
<button data-dojo-type="dijit/form/Button" id="editBroker.saveButton" data-dojo-props="label: 'Save'">Save</button>
<button data-dojo-type="dijit/form/Button" id="editBroker.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
- </div>
+ </div>
</div>
</form>
</div>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html?rev=1625650&r1=1625649&r2=1625650&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHost.html Wed Sep 17 16:47:06 2014
@@ -20,6 +20,7 @@
<div data-dojo-type="dijit/Dialog" data-dojo-props="title:'Edit Virtual Host'" id="editVirtualHostDialog">
<form id="editVirtualHostForm" method="post" data-dojo-type="dijit/form/Form">
<div id="editVirtualHost.allFields">
+ <div id="editVirtualHost.contentPane">
<div class="editNoteBanner">NOTE: All changes will only take effect after Virtual Host restart.</div>
<div class="clear">
<div class="formLabel-labelCell tableContainer-labelCell">Name*:</div>
@@ -125,11 +126,11 @@
<div data-dojo-type="dijit/TitlePane" data-dojo-props="title: 'Context variables', open: false">
<div id="editVirtualHost.context" ></div>
</div>
-
- <div class="dijitDialogPaneActionBar">
+ </div>
+ <div class="dijitDialogPaneActionBar">
<button data-dojo-type="dijit/form/Button" id="editVirtualHost.saveButton" data-dojo-props="label: 'Save'">Save</button>
<button data-dojo-type="dijit/form/Button" id="editVirtualHost.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
- </div>
+ </div>
</div>
</form>
</div>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html?rev=1625650&r1=1625649&r2=1625650&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/editVirtualHostNode.html Wed Sep 17 16:47:06 2014
@@ -19,6 +19,7 @@
<div class="dijitHidden">
<div data-dojo-type="dijit/Dialog" data-dojo-props="title:'Edit Virtual Host'" id="editVirtualHostNodeDialog">
<form id="editVirtualHostNodeForm" method="post" data-dojo-type="dijit/form/Form">
+ <div id="editVirtualHostNode.contentPane">
<div class="editNoteBanner">NOTE: All changes will only take effect after Virtual Host Node restart.</div>
<div class="clear">
<div class="formLabel-labelCell tableContainer-labelCell">Name*:</div>
@@ -42,11 +43,11 @@
<div data-dojo-type="dijit/TitlePane" data-dojo-props="title: 'Context variables', open: false">
<div id="editVirtualHostNode.context" ></div>
</div>
-
- <div class="dijitDialogPaneActionBar">
+ </div>
+ <div class="dijitDialogPaneActionBar">
<button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.saveButton" data-dojo-props="label: 'Save'">Save</button>
<button data-dojo-type="dijit/form/Button" id="editVirtualHostNode.cancelButton" data-dojo-props="label: 'Cancel'" ></button>
- </div>
+ </div>
</form>
</div>
</div>
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js?rev=1625650&r1=1625649&r2=1625650&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ContextVariablesEditor.js Wed Sep 17 16:47:06 2014
@@ -77,8 +77,8 @@ function (util, xhr, declare, array, con
var addButton = registry.byNode(addButtonNode);
var deleteButton = registry.byNode(deleteButtonNode);
var layout = [[
- { name: "Name", field: "name", width: "40%", editable: true },
- { name: 'Actual Value', field: 'actualValue', width: '30%', editable: true},
+ { name: "Name", field: "name", width: "40%", editable: true, selectOnClick: false, type: dojox.grid.cells._Widget, widgetClass: dijit.form.TextBox },
+ { name: 'Actual Value', field: 'actualValue', width: '30%', editable: true, selectOnClick: false, type: dojox.grid.cells._Widget, widgetClass: dijit.form.TextBox},
{ name: 'Effective Value', field: 'effectiveValue', width: '30%', editable: false}
]];
var data = [];
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1625650&r1=1625649&r2=1625650&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js Wed Sep 17 16:47:06 2014
@@ -30,6 +30,8 @@ define(["dojo/_base/xhr",
"dojo/query",
"dojo/parser",
"dojo/store/Memory",
+ "dojo/window",
+ "dojo/on",
"dojox/html/entities",
"qpid/common/metadata",
"qpid/common/widgetconfigurer",
@@ -48,7 +50,7 @@ define(["dojo/_base/xhr",
"dojox/validate/web",
"dojo/domReady!"
],
- function (xhr, array, event, lang, json, dom, geometry, domStyle, win, query, parser, Memory, entities, metadata, widgetconfigurer, registry) {
+ function (xhr, array, event, lang, json, dom, geometry, domStyle, win, query, parser, Memory, w, on, entities, metadata, widgetconfigurer, registry) {
var util = {};
if (Array.isArray) {
util.isArray = function (object) {
@@ -735,5 +737,39 @@ define(["dojo/_base/xhr",
return "^(([0-9a-zA-Z.-_]|::)+:[0-9]{1,5})|" + singleContextVarRegexp + "$";
}
+ util.resizeContentAreaAndRepositionDialog = function(contentNode, dialog)
+ {
+ var viewport = w.getBox();
+ var contentDimension =dojo.position(contentNode);
+ var dialogDimension = dojo.position(dialog.domNode);
+ var dialogTitleAndFooterHeight = dialogDimension.h - contentDimension.h;
+ var dialogLeftRightSpaces = dialogDimension.w - contentDimension.w;
+
+ var resize = function()
+ {
+ var viewport = w.getBox();
+ var width = viewport.w * dialog.maxRatio;
+ var height = viewport.h * dialog.maxRatio;
+ var dialogDimension = dojo.position(dialog.domNode);
+
+ var maxContentHeight = height - dialogTitleAndFooterHeight;
+
+ // if width style is set on a dialog node, use dialog width
+ if (dialog.domNode.style && dialog.domNode.style.width)
+ {
+ width = dialogDimension.w;
+ }
+ var maxContentWidth = width - dialogLeftRightSpaces;
+ domStyle.set(contentNode, {"overflow": "auto", maxHeight: maxContentHeight + "px", maxWidth: maxContentWidth + "px"});
+
+ var dialogX = viewport.w/2 - dialogDimension.w/2;
+ var dialogY = viewport.h/2 - dialogDimension.h/2;
+ domStyle.set(dialog.domNode, {top: dialogY + "px", left: dialogX + "px"});
+ dialog.resize();
+ };
+ resize();
+ on(window, "resize", resize);
+ }
+
return util;
});
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js?rev=1625650&r1=1625649&r2=1625650&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/addVirtualHostNodeAndVirtualHost.js Wed Sep 17 16:47:06 2014
@@ -27,6 +27,8 @@ define(["dojo/_base/xhr",
"dojo/json",
"dojo/parser",
"dojo/store/Memory",
+ "dojo/window",
+ "dojo/on",
"dojox/lang/functional/object",
"dijit/registry",
"dijit/Dialog",
@@ -45,7 +47,7 @@ define(["dojo/_base/xhr",
"dojox/validate/us",
"dojox/validate/web",
"dojo/domReady!"],
- function (xhr, event, lang, array, dom, domConstruct, json, parser, Memory, fobject, registry, Dialog, Button, FilteringSelect, properties, util, metadata, template)
+ function (xhr, event, lang, array, dom, domConstruct, json, parser, Memory, win, on, fobject, registry, Dialog, Button, FilteringSelect, properties, util, metadata, template)
{
var addVirtualHostNodeAndVirtualHost =
@@ -94,7 +96,6 @@ define(["dojo/_base/xhr",
this.virtualHostType.set("store", this.virtualHostTypeStore);
this.virtualHostType.set("disabled", false);
this.virtualHostType.on("change", function(type){that._vhTypeChanged(type, that.virtualHostTypeFieldsContainer, "qpid/management/virtualhost/");});
-
},
show: function()
{
@@ -163,6 +164,11 @@ define(["dojo/_base/xhr",
this.virtualHostNodeContext.setData({},effectiveValues,inheritedActualValues);
this.virtualHostContext.setData({},effectiveValues,inheritedActualValues);
this.dialog.show();
+ if (!this.resizeEventRegistered)
+ {
+ this.resizeEventRegistered = true;
+ util.resizeContentAreaAndRepositionDialog(dom.byId("addVirtualHostNodeAndVirtualHost.contentPane"), this.dialog);
+ }
},
destroy: function()
{
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js?rev=1625650&r1=1625649&r2=1625650&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editBroker.js Wed Sep 17 16:47:06 2014
@@ -68,8 +68,9 @@ define(["dojo/_base/xhr",
this[fieldName] = registry.byId("editBroker." + fieldName);
}
this.form = registry.byId("editBrokerForm");
+ this.form.on("submit", function(){return false;});
this.context = registry.byId("editBroker.context");
- util.applyMetadataToWidgets(this.containerNode, "Broker", "broker");
+ util.applyMetadataToWidgets(dom.byId("editBroker.allFields"), "Broker", "broker");
for(var i = 0; i < numericFieldNames.length; i++)
{
@@ -186,6 +187,11 @@ define(["dojo/_base/xhr",
this.context.load(this.query, {actualValues: actualData.context, effectiveValues: effectiveData.context});
this.dialog.startup();
this.dialog.show();
+ if (!this.resizeEventRegistered)
+ {
+ this.resizeEventRegistered = true;
+ util.resizeContentAreaAndRepositionDialog(dom.byId("editBroker.contentPane"), this.dialog);
+ }
}
};
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js?rev=1625650&r1=1625649&r2=1625650&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHost.js Wed Sep 17 16:47:06 2014
@@ -70,6 +70,7 @@ define(["dojo/_base/xhr",
this[fieldName] = registry.byId("editVirtualHost." + fieldName);
}
this.form = registry.byId("editVirtualHostForm");
+ this.form.on("submit", function(){return false;});
},
show: function(hostData)
{
@@ -204,6 +205,11 @@ define(["dojo/_base/xhr",
this.dialog.startup();
this.dialog.show();
+ if (!this.resizeEventRegistered)
+ {
+ this.resizeEventRegistered = true;
+ util.resizeContentAreaAndRepositionDialog(dom.byId("editVirtualHost.contentPane"), this.dialog);
+ }
}
};
Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js?rev=1625650&r1=1625649&r2=1625650&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js (original)
+++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/resources/js/qpid/management/editVirtualHostNode.js Wed Sep 17 16:47:06 2014
@@ -61,6 +61,7 @@ define(["dojo/_base/xhr",
this.saveButton.on("click", function(e){that._save(e);});
this.name = registry.byId("editVirtualHostNode.name");
this.form = registry.byId("editVirtualHostNodeForm");
+ this.form.on("submit", function(){return false;});
},
show: function(effectiveData)
{
@@ -173,6 +174,11 @@ define(["dojo/_base/xhr",
this.dialog.startup();
this.dialog.show();
+ if (!this.resizeEventRegistered)
+ {
+ this.resizeEventRegistered = true;
+ util.resizeContentAreaAndRepositionDialog(dom.byId("editVirtualHostNode.contentPane"), this.dialog);
+ }
}
};
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org