Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[NIFI-2775] update Provenance table GoTo button visibility in FF. This closes #1040

This commit is contained in:
Scott Aslan 2016-09-26 10:20:30 -04:00 committed by Matt Gilman
parent de717da73f
commit d674cdfc79
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
View File

@ -586,20 +586,20 @@ nf.Settings = (function () {
return '';
}
var markup = '<div title="View Details" class="pointer view-reporting-task fa fa-info-circle" style="margin-top: 5px; float: left;" ></div>';
var markup = '<div title="View Details" class="pointer view-reporting-task fa fa-info-circle"></div>';
// always include a button to view the usage
markup += '<div title="Usage" class="pointer reporting-task-usage fa fa-book" style="margin-left: 6px; margin-top: 5px; float: left;"></div>';
markup += '<div title="Usage" class="pointer reporting-task-usage fa fa-book"></div>';
var hasErrors = !nf.Common.isEmpty(dataContext.component.validationErrors);
var hasBulletins = !nf.Common.isEmpty(dataContext.bulletins);
if (hasErrors) {
markup += '<div class="pointer has-errors fa fa-warning" style="margin-top: 4px; margin-left: 3px; float: left;" ></div>';
markup += '<div class="pointer has-errors fa fa-warning" ></div>';
}
if (hasBulletins) {
markup += '<div class="has-bulletins fa fa-sticky-note-o" style="margin-top: 5px; margin-left: 5px; float: left;"></div>';
markup += '<div class="has-bulletins fa fa-sticky-note-o"></div>';
}
if (hasErrors || hasBulletins) {

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js
View File

@ -606,7 +606,7 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) {
// define how the column is formatted
var showLineageFormatter = function (row, cell, value, columnDef, dataContext) {
var markup = '';
var markup = '<div style="white-space: normal;">';
// conditionally include the cluster node id
if (nf.Common.SUPPORTS_SVG) {
@ -618,6 +618,8 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) {
markup += '&nbsp;<div class="pointer go-to fa fa-long-arrow-right" title="Go To"></div>';
}
markup += '</div>';
return markup;
};

24
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
View File

@ -369,7 +369,7 @@ nf.SummaryTable = (function () {
if (isClustered || isInShell || nf.Common.SUPPORTS_SVG) {
// define how the column is formatted
var processorActionFormatter = function (row, cell, value, columnDef, dataContext) {
var markup = '';
var markup = '<div style="white-space: normal;">';
if (isInShell) {
markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Processor" style="margin-right: 3px;"></div>&nbsp;';
@ -383,6 +383,8 @@ nf.SummaryTable = (function () {
markup += '<div class="pointer show-cluster-processor-summary fa fa-cubes" title="View Processor Details"></div>&nbsp;';
}
markup += '</div>';
return markup;
};
@ -654,7 +656,7 @@ nf.SummaryTable = (function () {
if (isClustered || isInShell || nf.Common.SUPPORTS_SVG) {
// define how the column is formatted
var connectionActionFormatter = function (row, cell, value, columnDef, dataContext) {
var markup = '';
var markup = '<div style="white-space: normal;">';
if (isInShell) {
markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Connection" style="margin-right: 3px;"></div>&nbsp;';
@ -668,6 +670,8 @@ nf.SummaryTable = (function () {
markup += '<div class="pointer show-cluster-connection-summary fa fa-cubes" title="View Connection Details"></div>&nbsp;';
}
markup += '</div>';
return markup;
};
@ -932,7 +936,7 @@ nf.SummaryTable = (function () {
if (isClustered || isInShell || nf.Common.SUPPORTS_SVG) {
// define how the column is formatted
var processGroupActionFormatter = function (row, cell, value, columnDef, dataContext) {
var markup = '';
var markup = '<div style="white-space: normal;">';
if (isInShell && dataContext.groupId !== null) {
markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Process Group" style="margin-right: 3px;"></div>&nbsp;';
@ -946,6 +950,8 @@ nf.SummaryTable = (function () {
markup += '<div class="pointer show-cluster-process-group-summary fa fa-cubes" title="View Process Group Details"></div>&nbsp;';
}
markup += '</div>';
return markup;
};
@ -1185,7 +1191,7 @@ nf.SummaryTable = (function () {
if (isClustered || isInShell) {
// define how the column is formatted
var inputPortActionFormatter = function (row, cell, value, columnDef, dataContext) {
var markup = '';
var markup = '<div style="white-space: normal;">';
if (isInShell) {
markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Input Port" style="margin-right: 3px;"></div>&nbsp;';
@ -1195,6 +1201,8 @@ nf.SummaryTable = (function () {
markup += '<div class="pointer show-cluster-input-port-summary fa fa-cubes" title="View Input Port Details"></div>&nbsp;';
}
markup += '</div>';
return markup;
};
@ -1425,7 +1433,7 @@ nf.SummaryTable = (function () {
if (isClustered || isInShell) {
// define how the column is formatted
var outputPortActionFormatter = function (row, cell, value, columnDef, dataContext) {
var markup = '';
var markup = '<div style="white-space: normal;">';
if (isInShell) {
markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Output Port" style="margin-right: 3px;"></div>&nbsp;';
@ -1435,6 +1443,8 @@ nf.SummaryTable = (function () {
markup += '<div class="pointer show-cluster-output-port-summary fa fa-cubes" title="View Output Port Details"></div>&nbsp;';
}
markup += '</div>';
return markup;
};
@ -1716,7 +1726,7 @@ nf.SummaryTable = (function () {
if (isClustered || isInShell || nf.Common.SUPPORTS_SVG) {
// define how the column is formatted
var remoteProcessGroupActionFormatter = function (row, cell, value, columnDef, dataContext) {
var markup = '';
var markup = '<div style="white-space: normal;">';
if (isInShell) {
markup += '<div class="pointer go-to fa fa-long-arrow-right" title="Go To Process Group" style="margin-right: 3px;"></div>&nbsp;';
@ -1730,6 +1740,8 @@ nf.SummaryTable = (function () {
markup += '<div class="pointer show-cluster-remote-process-group-summary fa fa-cubes" title="View Remote Process Group Details"></div>&nbsp;';
}
markup += '</div>';
return markup;
};