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

[NIFI-2147] Fix Warning/Invalid roll-over text. This closes #620

This commit is contained in:
Scott Aslan 2016-07-11 09:40:35 -04:00 committed by Matt Gilman
parent cf183e15e3
commit 039fd70ded
6 changed files with 89 additions and 69 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/jquery/propertytable/jquery.propertytable.js
View File

@ -1334,9 +1334,11 @@
var tooltip = nf.Common.formatPropertyTooltip(propertyDescriptor, propertyHistory);
if (nf.Common.isDefinedAndNotNull(tooltip)) {
infoIcon.qtip($.extend({
content: tooltip,
}, nf.Common.config.tooltipConfig));
infoIcon.qtip($.extend({},
nf.Common.config.tooltipConfig,
{
content: tooltip
}));
}
}
});

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-flow-status-controller.js
View File

@ -285,10 +285,10 @@ nf.ng.Canvas.FlowStatusCtrl = function (serviceProvider, $sanitize) {
bulletinIcon.qtip('option', 'content.text', newBulletins);
} else {
// no bulletins before, show icon and tips
bulletinIcon.addClass('has-bulletins').qtip($.extend({
content: newBulletins
}, nf.CanvasUtils.config.systemTooltipConfig, {
bulletinIcon.addClass('has-bulletins').qtip($.extend({},
nf.CanvasUtils.config.systemTooltipConfig, {
position: {
content: newBulletins,
at: 'bottom left',
my: 'top right',
adjust: {

24
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-service.js
View File

@ -275,9 +275,11 @@ nf.ControllerService = (function () {
if (bulletinIcon.data('qtip')) {
bulletinIcon.qtip('option', 'content.text', list);
} else {
bulletinIcon.addClass('has-bulletins').show().qtip($.extend({
content: list
}, nf.CanvasUtils.config.systemTooltipConfig));
bulletinIcon.addClass('has-bulletins').show().qtip($.extend({},
nf.CanvasUtils.config.systemTooltipConfig,
{
content: list
}));
}
} else if (bulletinIcon.data('qtip')) {
bulletinIcon.removeClass('has-bulletins').removeData('bulletins').hide().qtip('api').destroy(true);
@ -304,9 +306,11 @@ nf.ControllerService = (function () {
if (icon.data('qtip')) {
icon.qtip('option', 'content.text', list);
} else {
icon.qtip($.extend({
content: list
}, nf.CanvasUtils.config.systemTooltipConfig));
icon.qtip($.extend({},
nf.CanvasUtils.config.systemTooltipConfig,
{
content: list
}));
}
} else if (icon.data('qtip')) {
icon.qtip('api').destroy(true);
@ -334,9 +338,11 @@ nf.ControllerService = (function () {
if (icon.data('qtip')) {
icon.qtip('option', 'content.text', list);
} else {
icon.qtip($.extend({
content: list
}, nf.CanvasUtils.config.systemTooltipConfig));
icon.qtip($.extend({},
nf.CanvasUtils.config.systemTooltipConfig,
{
content: list
}));
}
} else if (icon.data('qtip')) {
icon.qtip('api').destroy(true);

52
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js
View File

@ -499,13 +499,13 @@ nf.ControllerServices = (function () {
var markup = '<div class="pointer view-controller-service fa fa-info-circle" title="View Details" style="margin-top: 5px; float: left;" ></div>';
// always include a button to view the usage
markup += '<div title="Usage" class="pointer controller-service-usage fa fa-book" style="margin-left: -2px; margin-top: 5px; float: left;" ></div>';
markup += '<div title="Usage" class="pointer controller-service-usage fa fa-book" style="margin-left: 3px; margin-top: 5px; float: left;" ></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: 6px; float: left;" ></div>';
markup += '<div class="pointer has-errors fa fa-warning" style="margin-top: 4px; margin-left: 3px; float: left;" ></div>';
}
if (hasBulletins) {
@ -672,18 +672,20 @@ nf.ControllerServices = (function () {
// show the tooltip
if (nf.Common.isDefinedAndNotNull(tooltip)) {
errorIcon.qtip($.extend({
content: tooltip,
position: {
target: 'mouse',
viewport: $(window),
adjust: {
x: 8,
y: 8,
method: 'flipinvert flipinvert'
errorIcon.qtip($.extend({},
nf.Common.config.tooltipConfig,
{
content: tooltip,
position: {
target: 'mouse',
viewport: $(window),
adjust: {
x: 8,
y: 8,
method: 'flipinvert flipinvert'
}
}
}
}, nf.Common.config.tooltipConfig));
}));
}
}
@ -700,18 +702,20 @@ nf.ControllerServices = (function () {
// show the tooltip
if (nf.Common.isDefinedAndNotNull(tooltip)) {
bulletinIcon.qtip($.extend({}, nf.Common.config.tooltipConfig, {
content: tooltip,
position: {
target: 'mouse',
viewport: $(window),
adjust: {
x: 8,
y: 8,
method: 'flipinvert flipinvert'
bulletinIcon.qtip($.extend({},
nf.Common.config.tooltipConfig,
{
content: tooltip,
position: {
target: 'mouse',
viewport: $(window),
adjust: {
x: 8,
y: 8,
method: 'flipinvert flipinvert'
}
}
}
}));
}));
}
}
});

16
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js
View File

@ -253,9 +253,11 @@ nf.RemoteProcessGroupPorts = (function () {
editRemotePort.show();
}
} else if (port.exists === false) {
$('<div class="remote-port-removed"/>').appendTo(portContainerEditContainer).qtip($.extend({
content: 'This port has been removed.'
}, nf.Common.config.tooltipConfig));
$('<div class="remote-port-removed"/>').appendTo(portContainerEditContainer).qtip($.extend({},
nf.Common.config.tooltipConfig,
{
content: 'This port has been removed.'
}));
}
// only allow modifications to transmission when the swtich is defined
@ -389,9 +391,11 @@ nf.RemoteProcessGroupPorts = (function () {
'Concurrent tasks' +
'<div class="processor-setting concurrent-tasks-info fa fa-question-circle"></div>' +
'</div>' +
'</div>').append(concurrentTasks).appendTo(concurrentTasksContainer).find('div.concurrent-tasks-info').qtip($.extend({
content: 'The number of tasks that should be concurrently scheduled for this port.'
}, nf.Common.config.tooltipConfig));
'</div>').append(concurrentTasks).appendTo(concurrentTasksContainer).find('div.concurrent-tasks-info').qtip($.extend({},
nf.Common.config.tooltipConfig,
{
content: 'The number of tasks that should be concurrently scheduled for this port.'
}));
var compressionContainer = $('<div class="compression-container"></div>').appendTo(portContainerDetailsContainer);

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

@ -596,13 +596,13 @@ nf.Settings = (function () {
var markup = '<div title="View Details" class="pointer view-reporting-task fa fa-info-circle" style="margin-top: 5px; float: left;" ></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;"></div>';
markup += '<div title="Usage" class="pointer reporting-task-usage fa fa-book" style="margin-left: 3px; margin-top: 5px;"></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: 6px; float: left;" ></div>';
markup += '<div class="pointer has-errors fa fa-warning" style="margin-top: 4px; margin-left: 3px; float: left;" ></div>';
}
if (hasBulletins) {
@ -769,18 +769,20 @@ nf.Settings = (function () {
// show the tooltip
if (nf.Common.isDefinedAndNotNull(tooltip)) {
errorIcon.qtip($.extend({
content: tooltip,
position: {
target: 'mouse',
viewport: $(window),
adjust: {
x: 8,
y: 8,
method: 'flipinvert flipinvert'
errorIcon.qtip($.extend({},
nf.Common.config.tooltipConfig,
{
content: tooltip,
position: {
target: 'mouse',
viewport: $(window),
adjust: {
x: 8,
y: 8,
method: 'flipinvert flipinvert'
}
}
}
}, nf.Common.config.tooltipConfig));
}));
}
}
@ -797,18 +799,20 @@ nf.Settings = (function () {
// show the tooltip
if (nf.Common.isDefinedAndNotNull(tooltip)) {
bulletinIcon.qtip($.extend({}, nf.Common.config.tooltipConfig, {
content: tooltip,
position: {
target: 'mouse',
viewport: $(window),
adjust: {
x: 8,
y: 8,
method: 'flipinvert flipinvert'
bulletinIcon.qtip($.extend({},
nf.Common.config.tooltipConfig,
{
content: tooltip,
position: {
target: 'mouse',
viewport: $(window),
adjust: {
x: 8,
y: 8,
method: 'flipinvert flipinvert'
}
}
}
}));
}));
}
}
});