Author: kwall
Date: Wed Nov 25 12:19:26 2015
New Revision: 1716368
URL: http://svn.apache.org/viewvc?rev=1716368&view=rev
Log:
QPID-6904: [Web Management Console] Correct screen labels in copy message
dialogue
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/moveCopyMessages.html
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js?rev=1716368&r1=1716367&r2=1716368&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/moveCopyMessages.js
Wed Nov 25 12:19:26 2015
@@ -41,15 +41,17 @@ define(["dojo/dom",
node.innerHTML = template;
moveMessages.dialogNode = dom.byId("moveMessages");
parser.instantiate([moveMessages.dialogNode]);
+ moveMessages.dialog =
registry.byId("moveMessages");
+ moveMessages.submitButton =
registry.byId("moveMessageSubmit");
theForm = registry.byId("formMoveMessages");
+ var cancelButton =
registry.byId("moveMessageCancel");
- var cancelButton = query(".moveMessageCancel")[0];
- connect.connect(registry.byNode(cancelButton),
"onClick",
+ connect.connect(cancelButton, "onClick",
function(evt){
event.stop(evt);
-
registry.byId("moveMessages").hide();
+ moveMessages.dialog.hide();
});
@@ -65,7 +67,7 @@ define(["dojo/dom",
moveMessages.management.update(modelObj,
parameters).then(
function(result)
{
- registry.byId("moveMessages").hide();
+ moveMessages.dialog.hide();
if(moveMessages.next)
{
moveMessages.next();
@@ -87,7 +89,9 @@ define(["dojo/dom",
moveMessages.next = next;
registry.byId("formMoveMessages").reset();
-
+ var label = data.move ? "Move messages" : "Copy messages";
+ moveMessages.submitButton.set("label", label);
+ moveMessages.dialog.set("title", label);
management.load({type: "queue", parent: modelObj.parent},
{depth:0}).then(
function(data) {
@@ -115,7 +119,7 @@ define(["dojo/dom",
- registry.byId("moveMessages").show();
+ moveMessages.dialog.show();
}, util.xhrErrorHandler);
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/moveCopyMessages.html
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/moveCopyMessages.html?rev=1716368&r1=1716367&r2=1716368&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/moveCopyMessages.html
(original)
+++
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/moveCopyMessages.html
Wed Nov 25 12:19:26 2015
@@ -16,7 +16,7 @@
-->
<div class="dijitHidden">
- <div data-dojo-type="dijit.Dialog" style="width:600px;"
data-dojo-props="title:'Move/Copy Messages'" id="moveMessages">
+ <div data-dojo-type="dijit.Dialog" style="width:600px;" id="moveMessages">
<form id="formMoveMessages" method="post" dojoType="dijit.form.Form">
<table cellpadding="0" cellspacing="2">
<tr>
@@ -28,8 +28,8 @@
<!-- submit buttons -->
- <input type="button" value="Cancel" label="Cancel"
dojoType="dijit.form.Button" class="moveMessageCancel"/>
- <input type="submit" value="Move Messages" label="Move Messages"
dojoType="dijit.form.Button" />
+ <input type="button" value="Cancel" label="Cancel"
dojoType="dijit.form.Button" id="moveMessageCancel"/>
+ <input type="submit" value="Submit" dojoType="dijit.form.Button"
id="moveMessageSubmit"/>
</form>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
