You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by jo...@apache.org on 2016/07/29 16:54:51 UTC
[4/4] nifi git commit: NIFI-2430 This closes #737. Update some
tooltip text and context menu text/icon
NIFI-2430 This closes #737. Update some tooltip text and context menu text/icon
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/0c8fc25b
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/0c8fc25b
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/0c8fc25b
Branch: refs/heads/master
Commit: 0c8fc25ba44901375d6d1a20eb9f349f0c292061
Parents: a8224ed
Author: Scott Aslan <ja...@hortonworks.com>
Authored: Fri Jul 29 12:38:02 2016 -0400
Committer: joewitt <jo...@apache.org>
Committed: Fri Jul 29 12:54:31 2016 -0400
----------------------------------------------------------------------
.../main/webapp/js/nf/canvas/nf-context-menu.js | 2 +-
.../webapp/js/nf/summary/nf-summary-table.js | 36 ++++++++++----------
2 files changed, 19 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/0c8fc25b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
index 326f1a1..df2870a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-context-menu.js
@@ -421,7 +421,7 @@ nf.ContextMenu = (function () {
{condition: isRemoteProcessGroup, menuItem: {clazz: 'fa fa-cloud', text: 'Remote ports', action: 'remotePorts'}},
{condition: canStartTransmission, menuItem: {clazz: 'fa fa-bullseye', text: 'Enable transmission', action: 'enableTransmission'}},
{condition: canStopTransmission, menuItem: {clazz: 'icon icon-transmit-false', text: 'Disable transmission', action: 'disableTransmission'}},
- {condition: supportsStats, menuItem: {clazz: 'fa fa-bar-chart', text: 'Stats', action: 'showStats'}},
+ {condition: supportsStats, menuItem: {clazz: 'fa fa-area-chart', text: 'Status History', action: 'showStats'}},
{condition: canAccessProvenance, menuItem: {clazz: 'icon icon-provenance', imgStyle: 'context-menu-provenance', text: 'Data provenance', action: 'openProvenance'}},
{condition: isStatefulProcessor, menuItem: {clazz: 'fa fa-tasks', text: 'View state', action: 'viewState'}},
{condition: canMoveToFront, menuItem: {clazz: 'fa fa-clone', text: 'Bring to front', action: 'toFront'}},
http://git-wip-us.apache.org/repos/asf/nifi/blob/0c8fc25b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
index 3788e42..145ae1f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
@@ -243,7 +243,7 @@ nf.SummaryTable = (function () {
// define a custom formatter for showing more processor details
var moreProcessorDetails = function (row, cell, value, columnDef, dataContext) {
- var markup = '<div title="View Details" class="pointer show-processor-details fa fa-info-circle" style="margin-right: 3px;"></div>';
+ var markup = '<div title="View Processor Details" class="pointer show-processor-details fa fa-info-circle" style="margin-right: 3px;"></div>';
// if there are bulletins, render them on the graph
if (!nf.Common.isEmpty(dataContext.bulletins)) {
@@ -382,15 +382,15 @@ nf.SummaryTable = (function () {
var markup = '';
if (isInShell) {
- markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Processor" style="margin-right: 3px;"></div> ';
}
if (nf.Common.SUPPORTS_SVG) {
- markup += '<div class="pointer show-processor-status-history fa fa-area-chart" title="Show History" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer show-processor-status-history fa fa-area-chart" title="View Status History" style="margin-right: 3px;"></div> ';
}
if (isClustered) {
- markup += '<div class="pointer show-cluster-processor-summary fa fa-cubes" title="Show Details"></div> ';
+ markup += '<div class="pointer show-cluster-processor-summary fa fa-cubes" title="View Processor Details"></div> ';
}
return markup;
@@ -622,7 +622,7 @@ nf.SummaryTable = (function () {
// define a custom formatter for showing more processor details
var moreConnectionDetails = function (row, cell, value, columnDef, dataContext) {
- return '<div class="pointer show-connection-details fa fa-info-circle" title="View Details" style="margin-top: 5px;"></div>';
+ return '<div class="pointer show-connection-details fa fa-info-circle" title="View Connection Details" style="margin-top: 5px;"></div>';
};
// define the input, read, written, and output columns (reused between both tables)
@@ -667,15 +667,15 @@ nf.SummaryTable = (function () {
var markup = '';
if (isInShell) {
- markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Connection" style="margin-right: 3px;"></div> ';
}
if (nf.Common.SUPPORTS_SVG) {
- markup += '<div class="pointer show-connection-status-history fa fa-area-chart" title="Show History" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer show-connection-status-history fa fa-area-chart" title="View Status History" style="margin-right: 3px;"></div> ';
}
if (isClustered) {
- markup += '<div class="pointer show-cluster-connection-summary fa fa-cubes" title="Show Details"></div> ';
+ markup += '<div class="pointer show-cluster-connection-summary fa fa-cubes" title="View Connection Details"></div> ';
}
return markup;
@@ -945,15 +945,15 @@ nf.SummaryTable = (function () {
var markup = '';
if (isInShell && dataContext.groupId !== null) {
- markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Process Group" style="margin-right: 3px;"></div> ';
}
if (nf.Common.SUPPORTS_SVG) {
- markup += '<div class="pointer show-process-group-status-history fa fa-area-chart" title="Show History" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer show-process-group-status-history fa fa-area-chart" title="View Status History" style="margin-right: 3px;"></div> ';
}
if (isClustered) {
- markup += '<div class="pointer show-cluster-process-group-summary fa fa-cubes" title="Show Details"></div> ';
+ markup += '<div class="pointer show-cluster-process-group-summary fa fa-cubes" title="View Process Group Details"></div> ';
}
return markup;
@@ -1198,11 +1198,11 @@ nf.SummaryTable = (function () {
var markup = '';
if (isInShell) {
- markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Input Port" style="margin-right: 3px;"></div> ';
}
if (isClustered) {
- markup += '<div class="pointer show-cluster-input-port-summary fa fa-cubes" title="Show Details"></div> ';
+ markup += '<div class="pointer show-cluster-input-port-summary fa fa-cubes" title="View Input Port Details"></div> ';
}
return markup;
@@ -1438,11 +1438,11 @@ nf.SummaryTable = (function () {
var markup = '';
if (isInShell) {
- markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Output Port" style="margin-right: 3px;"></div> ';
}
if (isClustered) {
- markup += '<div class="pointer show-cluster-output-port-summary fa fa-cubes" title="Show Details"></div> ';
+ markup += '<div class="pointer show-cluster-output-port-summary fa fa-cubes" title="View Output Port Details"></div> ';
}
return markup;
@@ -1729,15 +1729,15 @@ nf.SummaryTable = (function () {
var markup = '';
if (isInShell) {
- markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Process Group" style="margin-right: 3px;"></div> ';
}
if (nf.Common.SUPPORTS_SVG) {
- markup += '<div class="pointer show-remote-process-group-status-history fa fa-area-chart" title="Show History" style="margin-right: 3px;"></div> ';
+ markup += '<div class="pointer show-remote-process-group-status-history fa fa-area-chart" title="View Status History" style="margin-right: 3px;"></div> ';
}
if (isClustered) {
- markup += '<div class="pointer show-cluster-remote-process-group-summary fa fa-cubes" title="Show Details"></div> ';
+ markup += '<div class="pointer show-cluster-remote-process-group-summary fa fa-cubes" title="View Remote Process Group Details"></div> ';
}
return markup;