You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by ma...@apache.org on 2015/01/06 16:21:32 UTC
[06/12] incubator-nifi git commit: NIFI-140: - Addressing
inconsistent tooltip styles.
NIFI-140:
- Addressing inconsistent tooltip styles.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/c1eb209d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/c1eb209d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/c1eb209d
Branch: refs/heads/NIFI-221
Commit: c1eb209d4f927ae58671ec13948cba0835180f4e
Parents: a08d318
Author: Matt Gilman <ma...@gmail.com>
Authored: Mon Jan 5 07:22:10 2015 -0500
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Jan 5 07:22:10 2015 -0500
----------------------------------------------------------------------
.../nifi-web-ui/src/main/webapp/css/graph.css | 5 +--
.../nifi-web-ui/src/main/webapp/css/main.css | 6 ++++
.../webapp/js/nf/canvas/nf-canvas-header.js | 4 +--
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 37 +++++---------------
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 4 +--
.../js/nf/canvas/nf-connection-configuration.js | 4 +--
.../src/main/webapp/js/nf/canvas/nf-port.js | 2 +-
.../js/nf/canvas/nf-processor-property-table.js | 4 +--
.../main/webapp/js/nf/canvas/nf-processor.js | 2 +-
.../nf/canvas/nf-remote-process-group-ports.js | 12 +++----
.../js/nf/canvas/nf-remote-process-group.js | 4 +--
.../src/main/webapp/js/nf/nf-common.js | 2 +-
.../main/webapp/js/nf/nf-processor-details.js | 4 +--
.../webapp/js/nf/summary/nf-summary-table.js | 16 ++++-----
14 files changed, 44 insertions(+), 62 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css
index fb03260..041476b 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/graph.css
@@ -30,13 +30,10 @@
}
.tooltip {
+ padding: 10px;
display: none;
position: absolute;
- padding: 10px;
z-index: 1000;
- border: 3px solid #959FA9;
- background-color: #F9F9F9;
- color: #454545;
}
/* svg styles */
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css
index e5c402a..3afdc12 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css
@@ -111,6 +111,12 @@ div.context-menu-item-text {
font-weight: bold !important;
}
+div.nifi-tooltip {
+ border: 1px solid #454545;
+ background-color: #FFFFA3;
+ color: #454545;
+}
+
.ellipsis {
white-space: nowrap;
overflow: hidden;
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
index edd2000..03715e8 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-header.js
@@ -97,9 +97,9 @@ nf.CanvasHeader = (function () {
});
// setup the tooltip for the refresh icon
- $('#refresh-required-icon').qtip($.extend(nf.CanvasUtils.config.systemTooltipConfig, {
+ $('#refresh-required-icon').qtip($.extend({
content: 'This flow has been modified by another user. Please refresh.'
- }));
+ }, nf.CanvasUtils.config.systemTooltipConfig));
// setup the refresh link actions
$('#refresh-required-link').click(function () {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
index 00142c5..40116ca 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
@@ -50,30 +50,9 @@ nf.CanvasUtils = (function () {
return {
config: {
- cellTooltipConfig: {
- style: {
- classes: 'ui-tooltip-tipped ui-tooltip-shadow'
- },
- show: {
- solo: true,
- effect: false
- },
- hide: {
- effect: false
- },
- position: {
- target: 'mouse',
- viewport: $(window),
- adjust: {
- x: 8,
- y: 8,
- method: 'flipinvert flipinvert'
- }
- }
- },
systemTooltipConfig: {
style: {
- classes: 'ui-tooltip-tipped ui-tooltip-shadow'
+ classes: 'nifi-tooltip'
},
show: {
solo: true,
@@ -444,7 +423,7 @@ nf.CanvasUtils = (function () {
.attr('id', function () {
return 'bulletin-tip-' + d.component.id;
})
- .attr('class', 'tooltip')
+ .attr('class', 'tooltip nifi-tooltip')
.html(function () {
// format the bulletins
var bulletins = nf.Common.getFormattedBulletins(d.status.bulletins);
@@ -476,12 +455,12 @@ nf.CanvasUtils = (function () {
target.on('mouseenter', function () {
tip.style('top', (d3.event.pageY + 15) + 'px').style('left', (d3.event.pageX + 15) + 'px').style('display', 'block');
})
- .on('mousemove', function () {
- tip.style('top', (d3.event.pageY + 15) + 'px').style('left', (d3.event.pageX + 15) + 'px');
- })
- .on('mouseleave', function () {
- tip.style('display', 'none');
- });
+ .on('mousemove', function () {
+ tip.style('top', (d3.event.pageY + 15) + 'px').style('left', (d3.event.pageX + 15) + 'px');
+ })
+ .on('mouseleave', function () {
+ tip.style('display', 'none');
+ });
},
/**
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
index c4798be..eb16ad9 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
@@ -695,9 +695,9 @@ nf.Canvas = (function () {
bulletinIcon.qtip('option', 'content.text', newBulletins);
} else {
// no bulletins before, show icon and tips
- bulletinIcon.addClass('has-bulletins').qtip($.extend(nf.CanvasUtils.config.systemTooltipConfig, {
+ bulletinIcon.addClass('has-bulletins').qtip($.extend({
content: newBulletins
- }));
+ }, nf.CanvasUtils.config.systemTooltipConfig));
}
// show the icon
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js
index ef387d6..fd70aa1 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js
@@ -1164,9 +1164,9 @@ nf.ConnectionConfiguration = (function () {
// add the description if applicable
if (nf.Common.isDefinedAndNotNull(prioritizerType.description)) {
- $('<img class="icon-info" style="float: right; margin-right: 5px;" src="images/iconInfo.png"></img>').appendTo(prioritizer).qtip($.extend(nf.Common.config.tooltipConfig, {
+ $('<img class="icon-info" style="float: right; margin-right: 5px;" src="images/iconInfo.png"></img>').appendTo(prioritizer).qtip($.extend({
content: nf.Common.escapeHtml(prioritizerType.description)
- }));
+ }, nf.Common.config.tooltipConfig));
}
},
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js
index 4eb3653..ed584b8 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port.js
@@ -304,7 +304,7 @@ nf.Port = (function () {
.attr('id', function () {
return 'run-status-tip-' + d.component.id;
})
- .attr('class', 'tooltip')
+ .attr('class', 'tooltip nifi-tooltip')
.html(function () {
var list = nf.Common.formatUnorderedList(d.component.validationErrors);
if (list === null || list.length === 0) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js
index 3ffc17b..12a652c 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-property-table.js
@@ -302,9 +302,9 @@ nf.ProcessorPropertyTable = (function () {
var tooltip = nf.Common.formatPropertyTooltip(propertyDescriptor, propertyHistory);
if (nf.Common.isDefinedAndNotNull(tooltip)) {
- infoIcon.qtip($.extend(nf.Common.config.tooltipConfig, {
+ infoIcon.qtip($.extend({
content: tooltip
- }));
+ }, nf.Common.config.tooltipConfig));
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js
index 11bc106..be6ff1b 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor.js
@@ -437,7 +437,7 @@ nf.Processor = (function () {
.attr('id', function () {
return 'run-status-tip-' + d.component.id;
})
- .attr('class', 'tooltip')
+ .attr('class', 'tooltip nifi-tooltip')
.html(function () {
var list = nf.Common.formatUnorderedList(d.component.validationErrors);
if (list === null || list.length === 0) {
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js
index 7cce907..caadfea 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js
@@ -231,9 +231,9 @@ nf.RemoteProcessGroupPorts = (function () {
editRemotePort.show();
}
} else if (port.exists === false) {
- $('<div class="remote-port-removed"/>').appendTo(portContainerEditContainer).qtip($.extend(nf.Common.config.tooltipConfig, {
+ $('<div class="remote-port-removed"/>').appendTo(portContainerEditContainer).qtip($.extend({
content: 'This port has been removed.'
- }));
+ }, nf.Common.config.tooltipConfig));
}
// only allow modifications to transmission when the swtich is defined
@@ -364,13 +364,13 @@ nf.RemoteProcessGroupPorts = (function () {
// add this ports concurrent tasks
$('<div>' +
- '<div class="setting-name">' +
+ '<div class="setting-name">' +
'Concurrent tasks' +
'<img class="processor-setting concurrent-tasks-info" src="images/iconInfo.png" alt="Info"/>' +
- '</div>' +
- '</div>').append(concurrentTasks).appendTo(concurrentTasksContainer).find('img.concurrent-tasks-info').qtip($.extend(nf.Common.config.tooltipConfig, {
+ '</div>' +
+ '</div>').append(concurrentTasks).appendTo(concurrentTasksContainer).find('img.concurrent-tasks-info').qtip($.extend({
content: 'The number of tasks that should be concurrently scheduled for this port.'
- }));
+ }, nf.Common.config.tooltipConfig));
var compressionContainer = $('<div class="compression-container"></div>').appendTo(portContainerDetailsContainer);
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
index 9c6da4c..e55f5bb 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group.js
@@ -568,7 +568,7 @@ nf.RemoteProcessGroup = (function () {
.attr('id', function () {
return 'authorization-issues-' + d.component.id;
})
- .attr('class', 'tooltip')
+ .attr('class', 'tooltip nifi-tooltip')
.html(function () {
var list = nf.Common.formatUnorderedList(d.status.authorizationIssues);
if (list === null || list.length === 0) {
@@ -605,7 +605,7 @@ nf.RemoteProcessGroup = (function () {
.attr('id', function () {
return 'transmission-secure-' + d.component.id;
})
- .attr('class', 'tooltip')
+ .attr('class', 'tooltip nifi-tooltip')
.text(function () {
if (d.component.targetSecure === true) {
return 'Site-to-Site is secure.';
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
index 6bf7e08..24dcf24 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-common.js
@@ -57,7 +57,7 @@ nf.Common = {
config: {
tooltipConfig: {
style: {
- classes: 'ui-tooltip-tipped ui-tooltip-shadow'
+ classes: 'nifi-tooltip'
},
show: {
solo: true,
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
index da7c6e9..ee7c0c5 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js
@@ -381,9 +381,9 @@ nf.ProcessorDetails = (function () {
var tooltip = nf.Common.formatPropertyTooltip(propertyDescriptor, propertyHistory);
if (nf.Common.isDefinedAndNotNull(tooltip)) {
- infoIcon.qtip($.extend(nf.Common.config.tooltipConfig, {
+ infoIcon.qtip($.extend({
content: tooltip
- }));
+ }, nf.Common.config.tooltipConfig));
}
}
});
http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/c1eb209d/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
----------------------------------------------------------------------
diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
index f3150b0..85826ff 100644
--- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
+++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
@@ -424,7 +424,7 @@ nf.SummaryTable = (function () {
// show the tooltip
if (nf.Common.isDefinedAndNotNull(tooltip)) {
- bulletinIcon.qtip($.extend(nf.Common.config.tooltipConfig, {
+ bulletinIcon.qtip($.extend({
content: tooltip,
position: {
target: 'mouse',
@@ -435,7 +435,7 @@ nf.SummaryTable = (function () {
method: 'flipinvert flipinvert'
}
}
- }));
+ }, nf.Common.config.tooltipConfig));
}
}
});
@@ -817,7 +817,7 @@ nf.SummaryTable = (function () {
// show the tooltip
if (nf.Common.isDefinedAndNotNull(tooltip)) {
- bulletinIcon.qtip($.extend(nf.Common.config.tooltipConfig, {
+ bulletinIcon.qtip($.extend({
content: tooltip,
position: {
target: 'mouse',
@@ -828,7 +828,7 @@ nf.SummaryTable = (function () {
method: 'flipinvert flipinvert'
}
}
- }));
+ }, nf.Common.config.tooltipConfig));
}
}
});
@@ -1010,7 +1010,7 @@ nf.SummaryTable = (function () {
// show the tooltip
if (nf.Common.isDefinedAndNotNull(tooltip)) {
- bulletinIcon.qtip($.extend(nf.Common.config.tooltipConfig, {
+ bulletinIcon.qtip($.extend({
content: tooltip,
position: {
target: 'mouse',
@@ -1021,7 +1021,7 @@ nf.SummaryTable = (function () {
method: 'flipinvert flipinvert'
}
}
- }));
+ }, nf.Common.config.tooltipConfig));
}
}
});
@@ -1243,7 +1243,7 @@ nf.SummaryTable = (function () {
// show the tooltip
if (nf.Common.isDefinedAndNotNull(tooltip)) {
- bulletinIcon.qtip($.extend(nf.Common.config.tooltipConfig, {
+ bulletinIcon.qtip($.extend({
content: tooltip,
position: {
target: 'mouse',
@@ -1254,7 +1254,7 @@ nf.SummaryTable = (function () {
method: 'flipinvert flipinvert'
}
}
- }));
+ }, nf.Common.config.tooltipConfig));
}
}
});