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 2016/09/02 11:18:11 UTC
svn commit: r1758940 - in
/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources:
css/common.css dashboard/DashboardCreateDialogForm.html
js/qpid/common/ConsoleHelper.js js/qpid/common/util.js
query/QueryCreateDialogForm.html
Author: orudyy
Date: Fri Sep 2 11:18:10 2016
New Revision: 1758940
URL: http://svn.apache.org/viewvc?rev=1758940&view=rev
Log:
QPID-7413: [Java Broker, WMC] Address review comments
Change tooltips and labels on query/dashboard creation UI
Decode friendly username
Verify the existance of window for Broker Manual before moving focus to it
Modified:
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/dashboard/DashboardCreateDialogForm.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryCreateDialogForm.html
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css?rev=1758940&r1=1758939&r2=1758940&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/css/common.css Fri Sep 2 11:18:10 2016
@@ -653,9 +653,3 @@ td.advancedSearchField, col.autoWidth {
background-size: 1em;
}
-.dashedUnderline
-{
- text-decoration-line: underline;
- text-decoration-style: dashed;
- cursor: help;
-}
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/dashboard/DashboardCreateDialogForm.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/dashboard/DashboardCreateDialogForm.html?rev=1758940&r1=1758939&r2=1758940&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/dashboard/DashboardCreateDialogForm.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/dashboard/DashboardCreateDialogForm.html Fri Sep 2 11:18:10 2016
@@ -21,19 +21,22 @@
<form data-dojo-attach-point="createDashboardForm" data-dojo-type="dijit/form/Form" id="${id}_createDashboardForm">
<div>
<div class="clear">
- <label class="formLabel-labelCell tableContainer-labelCell dashedUnderline" for="${id}_dashboardScope" id="${id}_scopeLabel">Scope*: </label>
+ <label class="formLabel-labelCell tableContainer-labelCell" for="${id}_dashboardScope"
+ id="${id}_scopeLabel">Associate dashboard with*: </label>
<select id="${id}_dashboardScope" class="formLabel-controlCell tableContainer-valueCell"
data-dojo-attach-point="scope"
data-dojo-type='dijit/form/FilteringSelect'
data-dojo-props="name: 'scope',
placeHolder: 'Dashboard scope',
required: true,
- title: 'Select entity where dashboard data will be saved and accessible',
- promptMessage: 'Select entity where dashboard data will be saved and accessible',
- intermediateChanges: true">
+ intermediateChanges: true"
+ title="Determines where to save the dashboard and where to get queries.
+Only queries with the same associated object can be added to the dashboard.
+Dashboards associated with a Virtual Host will be replicated across HA nodes."
+ promptMessage="Determines where to save the dashboard and where to get queries.
+Only queries with the same associated object can be added to the dashboard.
+Dashboards associated with a Virtual Host will be replicated across HA nodes.">
</select>
- <div data-dojo-type="dijit/Tooltip"
- data-dojo-props="connectId:'${id}_scopeLabel',position:['below']">Determines where dashboard data is stored and accessible.</div>
</div>
<div class="clear"></div>
</div>
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js?rev=1758940&r1=1758939&r2=1758940&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/ConsoleHelper.js Fri Sep 2 11:18:10 2016
@@ -40,9 +40,12 @@ define(["dojo/query",
var newWindow = window.open(
url,
title,
- 'height=600,width=600,scrollbars=1,location=1,resizable=1,status=0,toolbar=0,titlebar=1,menubar=0',
+ 'height=600,width=600,scrollbars=1,location=1,resizable=1,status=0,toolbar=1,titlebar=1,menubar=0',
true);
- newWindow.focus();
+ if (newWindow)
+ {
+ newWindow.focus();
+ }
};
return {
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js?rev=1758940&r1=1758939&r2=1758940&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/common/util.js Fri Sep 2 11:18:10 2016
@@ -983,7 +983,7 @@ define(["dojo/_base/xhr",
var atPosition = serializedUserName.indexOf("@");
if (atPosition !== -1)
{
- return serializedUserName.substring(0, atPosition);
+ return decodeURIComponent(serializedUserName.substring(0, atPosition));
}
return serializedUserName;
};
Modified: qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryCreateDialogForm.html
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryCreateDialogForm.html?rev=1758940&r1=1758939&r2=1758940&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryCreateDialogForm.html (original)
+++ qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/query/QueryCreateDialogForm.html Fri Sep 2 11:18:10 2016
@@ -19,38 +19,40 @@
<div>
<form data-dojo-attach-point="createQueryForm" data-dojo-type="dijit/form/Form" id="${id}_createQueryForm">
<div>
- <div class="infoMessage infoPane">Please, specify query scope and category.</div>
<div class="clear">
- <label class="formLabel-labelCell tableContainer-labelCell dashedUnderline" for="${id}_queryScope" id="${id}_scopeLabel">Scope*: </label>
+ <label class="formLabel-labelCell tableContainer-labelCell" for="${id}_queryScope"
+ id="${id}_scopeLabel">Associate query with*: </label>
<select id="${id}_queryScope" class="formLabel-controlCell tableContainer-valueCell"
data-dojo-attach-point="scope"
data-dojo-type='dijit/form/FilteringSelect'
- data-dojo-props=" name: 'scope',
- placeHolder: 'Query scope',
- required: true,
- title: 'Select entity where query data will be saved and accessible',
- promptMessage: 'Select entity where query data will be saved and accessible',
- intermediateChanges: true">
+ data-dojo-props="name: 'scope', placeHolder: 'Query scope', required: true, intermediateChanges: true"
+ title="Determines where query is stored and where to query for the objects.
+If Broker is selected then any entity within the Broker can be queried.
+If Virtual Host is selected then only entities on the selected Virtual Host can be queried.
+Queries associated with a Virtual Host will be replicated across HA nodes.
+Queries can be added to the dashboards having the same associated object."
+ promptMessage="Determines where query is stored and where to query for the objects.
+If Broker is selected then any entity within the Broker can be queried.
+If Virtual Host is selected then only entities on the selected Virtual Host can be queried.
+Queries associated with a Virtual Host will be replicated across HA nodes.
+Queries can be added to the dashboards having the same associated object.">
</select>
- <div data-dojo-type="dijit/Tooltip"
- data-dojo-props="connectId:'${id}_scopeLabel',position:['below']">Determines where query data is stored and accessible.</div>
</div>
<div class="clear">
- <label class="formLabel-labelCell tableContainer-labelCell dashedUnderline" for="${id}_queryCategory" id="${id}_categoryLabel">Category*: </label>
+ <label class="formLabel-labelCell tableContainer-labelCell" for="${id}_queryCategory"
+ id="${id}_categoryLabel">What to query for*: </label>
<select id="${id}_queryCategory" class="formLabel-controlCell tableContainer-valueCell"
data-dojo-attach-point="category"
data-dojo-type='dijit/form/ComboBox'
data-dojo-props=" name: 'scope',
placeHolder: 'Query category',
required: true,
- title: 'Select category of objects to query',
- promptMessage: 'Select category of objects to query',
+ title: 'Determines the category of configured objects to select.',
+ promptMessage: 'Determines the category of configured objects to select.',
intermediateChanges: true">
<option value="queue" selected="true">Queue</option>
<option value="connection">Connection</option>
</select>
- <div data-dojo-type="dijit/Tooltip"
- data-dojo-props="connectId:'${id}_categoryLabel',position:['below']">Determines category of objects to query.</div>
</div>
<div class="clear"></div>
</div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org