You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/05/06 19:50:47 UTC
[6/6] nifi git commit: NIFI-1781: - Incorporating updated styles to
reflect component level authorization. - Updating canvas for new look and
feel. - This closes #417
NIFI-1781:
- Incorporating updated styles to reflect component level authorization.
- Updating canvas for new look and feel.
- This closes #417
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/9db1def6
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/9db1def6
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/9db1def6
Branch: refs/heads/master
Commit: 9db1def6c6c850ba6c0dddb1414b09985a2e3298
Parents: 04c41c0
Author: Matt Gilman <ma...@gmail.com>
Authored: Fri May 6 13:30:49 2016 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Fri May 6 15:50:06 2016 -0400
----------------------------------------------------------------------
.../nifi/web/api/entity/ProcessorEntity.java | 14 +
.../nifi/cluster/manager/StatusMerger.java | 2 +-
.../WEB-INF/partials/canvas/canvas-header.jsp | 2 +-
.../WEB-INF/partials/canvas/flow-status.jsp | 2 +-
.../src/main/webapp/css/flow-status.css | 2 +-
.../nifi-web-ui/src/main/webapp/css/graph.css | 216 ++-
.../nifi-web-ui/src/main/webapp/css/header.css | 3 +-
.../nifi-web-ui/src/main/webapp/css/main.css | 4 +-
.../src/main/webapp/images/bgContextMenu.png | Bin 746 -> 0 bytes
.../src/main/webapp/images/bgControlsInset.png | Bin 618 -> 0 bytes
.../src/main/webapp/images/bgHeader.png | Bin 1697 -> 0 bytes
.../src/main/webapp/images/bgNifiLogo.png | Bin 4232 -> 0 bytes
.../src/main/webapp/images/bgOutline.png | Bin 585 -> 0 bytes
.../src/main/webapp/images/bgPanCenter.png | Bin 362 -> 0 bytes
.../src/main/webapp/images/bgPanZoom.png | Bin 832 -> 0 bytes
.../webapp/images/bgProcessGroupDetailsArea.png | Bin 6596 -> 0 bytes
.../main/webapp/images/bgProcessorStatArea.png | Bin 4062 -> 0 bytes
.../images/bgRemoteProcessGroupDetailsArea.png | Bin 4433 -> 0 bytes
.../src/main/webapp/images/bgSearchInput.png | Bin 221 -> 0 bytes
.../main/webapp/images/bgToolbarBtnBorder.png | Bin 227 -> 0 bytes
.../src/main/webapp/images/blueBtnBg-over.jpg | Bin 356 -> 0 bytes
.../src/main/webapp/images/blueBtnBg.jpg | Bin 356 -> 0 bytes
.../src/main/webapp/images/buttonColor.png | Bin 1679 -> 0 bytes
.../src/main/webapp/images/buttonCopy.png | Bin 1166 -> 0 bytes
.../src/main/webapp/images/buttonDelete.png | Bin 1837 -> 0 bytes
.../src/main/webapp/images/buttonDisable.png | Bin 1737 -> 0 bytes
.../src/main/webapp/images/buttonEnable.png | Bin 1375 -> 0 bytes
.../src/main/webapp/images/buttonGroup.png | Bin 880 -> 0 bytes
.../src/main/webapp/images/buttonOutline.png | Bin 495 -> 0 bytes
.../src/main/webapp/images/buttonPanDown.png | Bin 554 -> 0 bytes
.../src/main/webapp/images/buttonPanLeft.png | Bin 588 -> 0 bytes
.../src/main/webapp/images/buttonPanRight.png | Bin 530 -> 0 bytes
.../src/main/webapp/images/buttonPanUp.png | Bin 551 -> 0 bytes
.../src/main/webapp/images/buttonPaste.png | Bin 1372 -> 0 bytes
.../src/main/webapp/images/buttonRun.png | Bin 1163 -> 0 bytes
.../src/main/webapp/images/buttonStop.png | Bin 869 -> 0 bytes
.../src/main/webapp/images/buttonTemplate.png | Bin 1290 -> 0 bytes
.../src/main/webapp/images/buttonZoom100.png | Bin 449 -> 0 bytes
.../src/main/webapp/images/buttonZoomFit.png | Bin 499 -> 0 bytes
.../src/main/webapp/images/buttonZoomIn.png | Bin 435 -> 0 bytes
.../src/main/webapp/images/buttonZoomOut.png | Bin 339 -> 0 bytes
.../src/main/webapp/images/grayBtnBg-over.jpg | Bin 319 -> 0 bytes
.../src/main/webapp/images/grayBtnBg.jpg | Bin 317 -> 0 bytes
.../src/main/webapp/images/headerTabBg.gif | Bin 131 -> 0 bytes
.../src/main/webapp/images/portRemoved.png | Bin 1090 -> 0 bytes
.../src/main/webapp/images/portRunning.png | Bin 337 -> 0 bytes
.../src/main/webapp/images/portStopped.png | Bin 192 -> 0 bytes
.../src/main/webapp/images/toolbarBg.gif | Bin 45 -> 0 bytes
.../src/main/webapp/js/nf/canvas/nf-actions.js | 4 +-
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 37 +-
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 174 +-
.../js/nf/canvas/nf-connection-configuration.js | 69 +-
.../main/webapp/js/nf/canvas/nf-connection.js | 1500 ++++++++++--------
.../src/main/webapp/js/nf/canvas/nf-funnel.js | 134 +-
.../src/main/webapp/js/nf/canvas/nf-label.js | 24 +-
.../src/main/webapp/js/nf/canvas/nf-port.js | 480 +++---
.../webapp/js/nf/canvas/nf-process-group.js | 1133 ++++++-------
.../main/webapp/js/nf/canvas/nf-processor.js | 890 ++++++-----
.../js/nf/canvas/nf-remote-process-group.js | 944 +++++------
.../src/main/webapp/js/nf/nf-common.js | 37 +
60 files changed, 2990 insertions(+), 2681 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java
index edf3c5e..89b784e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessorEntity.java
@@ -17,6 +17,7 @@
package org.apache.nifi.web.api.entity;
import org.apache.nifi.web.api.dto.ProcessorDTO;
+import org.apache.nifi.web.api.dto.status.ProcessorStatusDTO;
import javax.xml.bind.annotation.XmlRootElement;
@@ -27,6 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement;
public class ProcessorEntity extends ComponentEntity {
private ProcessorDTO component;
+ private ProcessorStatusDTO status;
/**
* The ProcessorDTO that is being serialized.
@@ -41,4 +43,16 @@ public class ProcessorEntity extends ComponentEntity {
this.component = component;
}
+ /**
+ * The Processor status.
+ *
+ * @return status
+ */
+ public ProcessorStatusDTO getStatus() {
+ return status;
+ }
+
+ public void setStatus(ProcessorStatusDTO status) {
+ this.status = status;
+ }
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
index 7fc764a..d8cead7 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/manager/StatusMerger.java
@@ -634,7 +634,7 @@ public class StatusMerger {
}
public static String prettyPrint(final Integer count, final Long bytes) {
- return formatCount(count) + " / " + formatDataSize(bytes);
+ return formatCount(count) + " (" + formatDataSize(bytes) + ")";
}
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp
index f129d91..8f00429 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp
@@ -85,7 +85,7 @@
<md-menu-item layout-align="space-around center">
<a id="bulletin-board-link"
ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.bulletinBoard.shell.launch();"><i
- class="icon icon-bulletin"></i>Bulletin Board</a>
+ class="fa fa-sticky-note-o"></i>Bulletin Board</a>
</md-menu-item>
<md-menu-divider></md-menu-divider>
<md-menu-item
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp
index d1208e0..efecd01 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp
@@ -32,7 +32,7 @@
<div layout="row" layout-align="end center">
<input id="search-field" type="text"/>
<button id="search-button"><i class="fa fa-search"></i></button>
- <button id="bulletin-button"><i class="icon-bulletin"></i></button>
+ <button id="bulletin-button"><i class="fa fa-sticky-note-o"></i></button>
</div>
</div>
<div id="search-flow-results"></div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/flow-status.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/flow-status.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/flow-status.css
index 6ce3538..f79c8e3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/flow-status.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/flow-status.css
@@ -78,7 +78,7 @@
background-color:#728E9B; /*base-color*/
}
-#bulletin-button i{
+#bulletin-button i.fa {
color: #fff;
font-size:15px;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/graph.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/graph.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/graph.css
index 605a28c..958eb05 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/graph.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/graph.css
@@ -53,16 +53,78 @@ text.unset {
*/
g.component {
- font-family: Arial, sans-serif;
+ font-family: Roboto;
+}
+
+g.component rect.body {
+ fill: #ffffff;
+}
+
+g.component rect.body.unauthorized {
+ fill: #f4f6f7;
+}
+
+g.component rect.border.unauthorized {
+ stroke-width: 1.5;
+ stroke: #ba554a;
+ stroke-dasharray: 3,3;
}
g.component.selected rect.border {
- stroke: #ffcc00;
- stroke-width: 5;
+ stroke: #004849;
+ stroke-width: 3;
+}
+
+text.stats-label {
+ fill: #262626;
+ font-size: 12px;
+ font-family: Roboto Slab;
+}
+
+text.stats-value {
+ fill: #775351;
+ font-size: 12px;
+ font-weight: bold;
+}
+
+text.stats-value tspan.size, text.stats-value tspan.size {
+ font-weight: normal;
+}
+
+text.stats-info {
+ fill: #728E9B;
+ font-size: 12px;
+}
+
+text.bulletin-icon {
+ font-size: 13px;
+ font-family: FontAwesome;
+ fill: #ffffff;
+}
+
+rect.bulletin-background {
+ fill: #728e9b;
}
-g.funnel.selected rect.border {
- stroke-width: 2.5;
+rect.bulletin-background.has-bulletins {
+ fill: #ba554a;
+}
+
+text.process-group-invalid.has-validation-errors {
+ fill: #ba554a;
+}
+
+text.active-thread-count-icon {
+ font-family: flowfont;
+ font-size: 12px;
+ fill: #728e9b;
+ text-anchor: end;
+}
+
+text.active-thread-count {
+ fill: #775351;
+ font-size: 12px;
+ font-weight: bold;
}
/*
@@ -88,19 +150,24 @@ image.add-connect {
Processor
*/
-text.processor-stats-label {
- fill: #fff;
- font-size: 11px;
- font-weight: bold;
+text.processor-name {
+ fill: #262626;
+ font-size: 14px;
}
-text.processor-stats-value {
- font-size: 11px;
+text.processor-type {
+ fill: #728e9b;
+ font-size: 12px;
}
-text.processor-stats-info {
- fill: #999999;
- font-size: 11px;
+text.processor-icon {
+ fill: #ad9897;
+ font-family: flowfont;
+ font-size: 30px;
+}
+
+text.run-status-icon {
+ font-size: 13px;
}
/*
@@ -108,7 +175,27 @@ text.processor-stats-info {
*/
g.connection {
- font-family: Arial, sans-serif;
+ font-family: Roboto;
+}
+
+g.connection rect.body {
+ fill: #ffffff;
+}
+
+g.connection rect.body.unauthorized {
+ fill: #f4f6f7;
+}
+
+g.connection rect.border.unauthorized {
+ stroke-width: 1.5;
+ stroke: #ba554a;
+ stroke-dasharray: 3,3;
+}
+
+g.connection.selected rect.border {
+ /*stroke: #004849;*/
+ stroke: #ffcc00;
+ stroke-width: 3;
}
path.connector {
@@ -126,12 +213,6 @@ path.connector.connectable {
stroke-dasharray: 4;
}
-g.connection rect.connection-label {
- fill: #ffffff;
- stroke: #000000;
- stroke-width: 2;
-}
-
g.connection path.connection-path {
fill: none;
stroke: #000000;
@@ -139,6 +220,21 @@ g.connection path.connection-path {
cursor: pointer;
}
+g.connection path.connection-path.unauthorized {
+ stroke: #ba554a;
+ stroke-dasharray: 3,3;
+}
+
+text.connection-from-run-status, text.connection-to-run-status {
+ fill: #728e9b;
+ font-family: FontAwesome;
+ font-size: 10px;
+}
+
+text.connection-from-run-status.is-missing-port, text.connection-to-run-status.is-missing-port {
+ fill: #ba554a;
+}
+
/* grouped connection */
g.connection.grouped path.connection-path, g.connection.grouped rect.connection-label {
@@ -196,12 +292,6 @@ g.connection rect.endpoint {
cursor: pointer;
}
-g.connection text.connection-stats-label {
- font-size: 11px;
- font-weight: bold;
- fill: #598599;
-}
-
/* labels */
g.label rect.labelpoint {
@@ -218,8 +308,30 @@ g.label.selected rect.labelpoint {
/* funnels */
+text.funnel-icon {
+ fill: #ad9897;
+ font-family: flowfont;
+ font-size: 30px;
+}
+
/* ports */
+text.port-name {
+ fill: #262626;
+ font-size: 14px;
+}
+
+text.port-icon {
+ fill: #ad9897;
+ font-family: flowfont;
+ font-size: 30px;
+}
+
+text.port-transmission-icon {
+ font-size: 11px;
+ fill: #728e9b
+}
+
/* active thread count */
text.active-thread-count {
@@ -228,35 +340,55 @@ text.active-thread-count {
/* process groups */
-g.process-group.drop rect.border {
- stroke: #0000ff;
- stroke-width: 3;
+text.process-group-name {
+ fill: #262626;
+ font-size: 14px;
}
text.process-group-contents-count {
font-weight: bold;
+ font-size: 13px;
fill: #294c58;
}
-text.process-group-stats-label {
- font-size: 11px;
- font-weight: bold;
- fill: #598599;
+g.process-group.drop rect.border {
+ stroke: #0000ff;
+ stroke-width: 3;
}
-text.process-group-stats-value {
- font-size: 11px;
+text.process-group-contents-icon {
+ font-size: 13px;
+ fill: #728e9b;
}
-text.process-group-stats-info {
- fill: #999999;
- font-size: 11px;
+/* remote process group */
+
+text.remote-process-group-name {
+ fill: #262626;
+ font-size: 14px;
}
-/* remote process group */
+text.remote-process-group-uri {
+ fill: #004849;
+ font-size: 12px;
+}
+
+text.remote-process-group-transmission-status {
+ font-size: 13px;
+ fill: #728e9b
+}
+
+text.remote-process-group-transmission-status.has-authorization-errors {
+ fill: #ba554a;
+}
+
+text.remote-process-group-transmission-secure {
+ font-family: FontAwesome;
+ font-size: 13px;
+ fill: #004849;
+}
text.remote-process-group-last-refresh {
- fill: #cccccc;
- font-style: italic;
+ fill: #728e9b;
text-anchor: end;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/header.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/header.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/header.css
index f95f78c..b36914e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/header.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/header.css
@@ -74,12 +74,13 @@ md-toolbar.md-small .md-toolbar-tools {
#global-menu-content {
font-size: 13px;
- padding: 3px 0;
+ padding: 0px 0;
background-color:rgba(249,250,251,0.97); /*tint base-color 96%*/
border:1px solid #004849; /*link-color*/
border-radius:2px;
box-shadow:0 2px 3px rgba(0,0,0,0.35);
width: 215px;
+ max-height: inherit;
}
#global-menu-content md-menu-item{
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
index 4488d62..83a2830 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
@@ -69,7 +69,7 @@
}
@font-face {
- font-family: 'Roboto+Slab';
+ font-family: 'Roboto Slab';
font-style: normal;
font-weight: normal;
src: local('RobotoSlab Regular'),
@@ -78,7 +78,7 @@
}
@font-face {
- font-family: 'Roboto+Slab';
+ font-family: 'Roboto Slab';
font-style: normal;
font-weight: bold;
src: local('RobotoSlab Bold'),
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgContextMenu.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgContextMenu.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgContextMenu.png
deleted file mode 100755
index 5d3bbf8..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgContextMenu.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgControlsInset.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgControlsInset.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgControlsInset.png
deleted file mode 100755
index ab3b6b7..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgControlsInset.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgHeader.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgHeader.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgHeader.png
deleted file mode 100755
index 65bc7fe..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgHeader.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png
deleted file mode 100755
index d92c484..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgNifiLogo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgOutline.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgOutline.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgOutline.png
deleted file mode 100755
index 65b3636..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgOutline.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgPanCenter.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgPanCenter.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgPanCenter.png
deleted file mode 100755
index 0ef3ef2..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgPanCenter.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgPanZoom.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgPanZoom.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgPanZoom.png
deleted file mode 100755
index 9a3f906..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgPanZoom.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgProcessGroupDetailsArea.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgProcessGroupDetailsArea.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgProcessGroupDetailsArea.png
deleted file mode 100755
index 58dedbd..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgProcessGroupDetailsArea.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgProcessorStatArea.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgProcessorStatArea.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgProcessorStatArea.png
deleted file mode 100755
index 0d8874c..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgProcessorStatArea.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgRemoteProcessGroupDetailsArea.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgRemoteProcessGroupDetailsArea.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgRemoteProcessGroupDetailsArea.png
deleted file mode 100755
index 59e0cd9..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgRemoteProcessGroupDetailsArea.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgSearchInput.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgSearchInput.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgSearchInput.png
deleted file mode 100755
index 60658e5..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgSearchInput.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgToolbarBtnBorder.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgToolbarBtnBorder.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgToolbarBtnBorder.png
deleted file mode 100755
index cb18212..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/bgToolbarBtnBorder.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/blueBtnBg-over.jpg
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/blueBtnBg-over.jpg b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/blueBtnBg-over.jpg
deleted file mode 100755
index dc29c29..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/blueBtnBg-over.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/blueBtnBg.jpg
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/blueBtnBg.jpg b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/blueBtnBg.jpg
deleted file mode 100755
index b11ed7c..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/blueBtnBg.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonColor.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonColor.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonColor.png
deleted file mode 100755
index 7f0cc06..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonColor.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonCopy.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonCopy.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonCopy.png
deleted file mode 100755
index 584f601..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonCopy.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonDelete.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonDelete.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonDelete.png
deleted file mode 100755
index dd1cc95..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonDelete.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonDisable.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonDisable.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonDisable.png
deleted file mode 100755
index 3b2ddbf..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonDisable.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonEnable.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonEnable.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonEnable.png
deleted file mode 100755
index 664a1d6..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonEnable.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonGroup.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonGroup.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonGroup.png
deleted file mode 100755
index 81f79e1..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonGroup.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonOutline.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonOutline.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonOutline.png
deleted file mode 100755
index 56ec870..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonOutline.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanDown.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanDown.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanDown.png
deleted file mode 100755
index 091ad18..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanDown.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanLeft.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanLeft.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanLeft.png
deleted file mode 100755
index 05d746c..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanLeft.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanRight.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanRight.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanRight.png
deleted file mode 100755
index befc1fc..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanRight.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanUp.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanUp.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanUp.png
deleted file mode 100755
index c6bae8d..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPanUp.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPaste.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPaste.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPaste.png
deleted file mode 100755
index 7e19a9a..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonPaste.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonRun.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonRun.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonRun.png
deleted file mode 100755
index 08aceb5..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonRun.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonStop.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonStop.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonStop.png
deleted file mode 100755
index 2c6bd27..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonStop.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonTemplate.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonTemplate.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonTemplate.png
deleted file mode 100755
index 2f52861..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonTemplate.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoom100.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoom100.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoom100.png
deleted file mode 100755
index 7a2e605..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoom100.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoomFit.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoomFit.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoomFit.png
deleted file mode 100755
index ddecdbd..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoomFit.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoomIn.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoomIn.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoomIn.png
deleted file mode 100755
index 311da20..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoomIn.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoomOut.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoomOut.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoomOut.png
deleted file mode 100755
index 3ae4526..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/buttonZoomOut.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/grayBtnBg-over.jpg
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/grayBtnBg-over.jpg b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/grayBtnBg-over.jpg
deleted file mode 100755
index b8c463a..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/grayBtnBg-over.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/grayBtnBg.jpg
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/grayBtnBg.jpg b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/grayBtnBg.jpg
deleted file mode 100755
index c6668f8..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/grayBtnBg.jpg and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/headerTabBg.gif
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/headerTabBg.gif b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/headerTabBg.gif
deleted file mode 100755
index 4ad168c..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/headerTabBg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/portRemoved.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/portRemoved.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/portRemoved.png
deleted file mode 100755
index cd370e4..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/portRemoved.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/portRunning.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/portRunning.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/portRunning.png
deleted file mode 100755
index 898bdb5..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/portRunning.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/portStopped.png
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/portStopped.png b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/portStopped.png
deleted file mode 100755
index 514f19f..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/portStopped.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/toolbarBg.gif
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/toolbarBg.gif b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/toolbarBg.gif
deleted file mode 100755
index 820730f..0000000
Binary files a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/toolbarBg.gif and /dev/null differ
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
index 9d90a61..54314e9 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js
@@ -152,7 +152,7 @@ nf.Actions = (function () {
url: d.component.uri,
dataType: 'json'
}).done(function (response) {
- var remoteProcessGroup = response.remoteProcessGroup;
+ var remoteProcessGroup = response.component;
// the timestamp has not updated yet, poll again
if (refreshTimestamp === remoteProcessGroup.flowRefreshed) {
@@ -163,7 +163,7 @@ nf.Actions = (function () {
// reload the group's connections
var connections = nf.Connection.getComponentConnections(remoteProcessGroup.id);
$.each(connections, function (_, connection) {
- nf.Connection.reload(connection);
+ nf.Connection.reload(connection.component);
});
}
});
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
index 55c4b49..655dedb 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas-utils.js
@@ -405,16 +405,12 @@ nf.CanvasUtils = (function () {
.each(function () {
var bBox = this.getBBox();
d3.select(this).attr('x', function () {
- return d.dimensions.width - bBox.width - 4;
+ return d.dimensions.width - bBox.width - 15;
});
});
// update the background width
- selection.select('rect.active-thread-count-background')
- .attr('width', function () {
- var bBox = activeThreadCount.node().getBBox();
- return bBox.width + 8;
- })
+ selection.select('text.active-thread-count-icon')
.attr('x', function () {
var bBox = activeThreadCount.node().getBBox();
@@ -423,22 +419,11 @@ nf.CanvasUtils = (function () {
setOffset(bBox.width + 6);
}
- return d.dimensions.width - bBox.width - 8;
- })
- .attr('stroke-dasharray', function() {
- var rect = d3.select(this);
- var width = parseFloat(rect.attr('width'));
- var height = parseFloat(rect.attr('height'));
-
- var dashArray = [];
- dashArray.push(0);
- dashArray.push(width + height);
- dashArray.push(width + height);
- return dashArray.join(' ');
+ return d.dimensions.width - bBox.width - 20;
})
.style('display', 'block');
} else {
- selection.selectAll('text.active-thread-count, rect.active-thread-count-background').style('display', 'none');
+ selection.selectAll('text.active-thread-count, text.active-thread-count-icon').style('display', 'none');
}
},
@@ -475,16 +460,8 @@ nf.CanvasUtils = (function () {
// if there are bulletins show them, otherwise hide
if (nf.Common.isDefinedAndNotNull(d.status) && !nf.Common.isEmpty(d.status.bulletins)) {
// update the tooltip
- selection.select('image.bulletin-icon')
- .style('display', 'block')
+ selection.select('text.bulletin-icon')
.each(function () {
- var bBox = this.getBBox();
- var bulletinIcon = d3.select(this);
-
- bulletinIcon.attr('x', function () {
- return d.dimensions.width - offset - bBox.width - 4;
- });
-
// if there are bulletins generate a tooltip
tip = getTooltipContainer().append('div')
.attr('id', function () {
@@ -505,10 +482,8 @@ nf.CanvasUtils = (function () {
});
// add the tooltip
- nf.CanvasUtils.canvasTooltip(tip, bulletinIcon);
+ nf.CanvasUtils.canvasTooltip(tip, d3.select(this));
});
- } else {
- selection.selectAll('image.bulletin-icon').style('display', 'none');
}
},
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
index d5ddbed..f82f6c3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-canvas.js
@@ -241,7 +241,7 @@ nf.Canvas = (function () {
// create arrow definitions for the various line types
defs.selectAll('marker')
- .data(['normal', 'ghost'])
+ .data(['normal', 'ghost', 'unauthorized'])
.enter().append('marker')
.attr({
'id': function (d) {
@@ -256,6 +256,8 @@ nf.Canvas = (function () {
'fill': function (d) {
if (d === 'ghost') {
return '#aaaaaa';
+ } else if (d === 'unauthorized') {
+ return '#ba554a';
} else {
return '#000000';
}
@@ -264,77 +266,42 @@ nf.Canvas = (function () {
.append('path')
.attr('d', 'M2,3 L0,6 L6,3 L0,0 z');
- // define the gradient for the processor stats background
- var processGroupStatsBackground = defs.append('linearGradient')
- .attr({
- 'id': 'process-group-stats-background',
- 'x1': '0%',
- 'y1': '100%',
- 'x2': '0%',
- 'y2': '0%'
- });
-
- processGroupStatsBackground.append('stop')
- .attr({
- 'offset': '0%',
- 'stop-color': '#dedede'
- });
-
- processGroupStatsBackground.append('stop')
- .attr({
- 'offset': '50%',
- 'stop-color': '#ffffff'
- });
-
- processGroupStatsBackground.append('stop')
- .attr({
- 'offset': '100%',
- 'stop-color': '#dedede'
- });
-
- // define the gradient for the processor stats background
- var processorStatsBackground = defs.append('linearGradient')
- .attr({
- 'id': 'processor-stats-background',
- 'x1': '0%',
- 'y1': '100%',
- 'x2': '0%',
- 'y2': '0%'
- });
-
- processorStatsBackground.append('stop')
- .attr({
- 'offset': '0%',
- 'stop-color': '#6f97ac'
- });
-
- processorStatsBackground.append('stop')
- .attr({
- 'offset': '100%',
- 'stop-color': '#30505c'
- });
-
- // define the gradient for the port background
- var portBackground = defs.append('linearGradient')
- .attr({
- 'id': 'port-background',
- 'x1': '0%',
- 'y1': '100%',
- 'x2': '0%',
- 'y2': '0%'
- });
-
- portBackground.append('stop')
- .attr({
- 'offset': '0%',
- 'stop-color': '#aaaaaa'
- });
-
- portBackground.append('stop')
- .attr({
- 'offset': '100%',
- 'stop-color': '#ffffff'
- });
+ // filter for drop shadow
+ var filter = defs.append('filter')
+ .attr('id', 'component-drop-shadow');
+
+ // blur
+ filter.append('feGaussianBlur')
+ .attr('in', 'SourceAlpha')
+ .attr('stdDeviation', 2)
+ .attr('result', 'blur');
+
+ // offset
+ filter.append('feOffset')
+ .attr('in', 'blur')
+ .attr('dx', 0)
+ .attr('dy', 1)
+ .attr('result', 'offsetBlur');
+
+ // color/opacity
+ filter.append('feFlood')
+ .attr('flood-color', '#000000')
+ .attr('flood-opacity', 0.25)
+ .attr('result', 'offsetColor');
+
+ // combine
+ filter.append('feComposite')
+ .attr('in', 'offsetColor')
+ .attr('in2', 'offsetBlur')
+ .attr('operator', 'in')
+ .attr('result', 'offsetColorBlur');
+
+ // stack the effect under the source graph
+ var feMerge = filter.append('feMerge');
+ feMerge.append('feMergeNode')
+ .attr('in', 'offsetColorBlur');
+ feMerge.append('feMergeNode')
+ .attr('in', 'SourceGraphic');
// define the gradient for the expiration icon
var expirationBackground = defs.append('linearGradient')
@@ -637,51 +604,6 @@ nf.Canvas = (function () {
};
/**
- * Sets the colors for the specified type.
- *
- * @param {array} colors The possible colors
- * @param {string} type The component type for these colors
- */
- var setColors = function (colors, type) {
- var defs = d3.select('defs');
-
- // update processors
- var processorSelection = defs.selectAll('linearGradient.' + type + '-background').data(colors, function (d) {
- return d;
- });
-
- // define the gradient for the processor background
- var gradient = processorSelection.enter().append('linearGradient')
- .attr({
- 'id': function (d) {
- return type + '-background-' + d;
- },
- 'class': type + '-background',
- 'x1': '0%',
- 'y1': '100%',
- 'x2': '0%',
- 'y2': '0%'
- });
-
- gradient.append('stop')
- .attr({
- 'offset': '0%',
- 'stop-color': function (d) {
- return '#' + d;
- }
- });
-
- gradient.append('stop')
- .attr({
- 'offset': '100%',
- 'stop-color': '#ffffff'
- });
-
- // remove old processor colors
- processorSelection.exit().remove();
- };
-
- /**
* Reloads the current status of this flow.
*/
var reloadFlowStatus = function () {
@@ -1173,24 +1095,6 @@ nf.Canvas = (function () {
},
/**
- * Defines the gradient colors used to render processors.
- *
- * @param {array} colors The colors
- */
- defineProcessorColors: function (colors) {
- setColors(colors, 'processor');
- },
-
- /**
- * Defines the gradient colors used to render label.
- *
- * @param {array} colors The colors
- */
- defineLabelColors: function (colors) {
- setColors(colors, 'label');
- },
-
- /**
* Return whether this instance of NiFi is clustered.
*
* @returns {Boolean}
http://git-wip-us.apache.org/repos/asf/nifi/blob/9db1def6/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js
index a316b5d..e27f431 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js
@@ -248,29 +248,32 @@ nf.ConnectionConfiguration = (function () {
$.ajax({
type: 'GET',
- url: config.urls.api + '/process-groups/' + encodeURIComponent(processGroupData.id),
+ url: config.urls.api + '/flow/process-groups/' + encodeURIComponent(processGroupData.id),
data: {
verbose: true
},
dataType: 'json'
}).done(function (response) {
- var processGroup = response.component;
- var processGroupContents = processGroup.contents;
+ var processGroup = response.processGroupFlow;
+ var processGroupContents = processGroup.flow;
+
+ // show the output port options
+ var options = [];
+ $.each(processGroupContents.outputPorts, function (i, outputPort) {
+ if (outputPort.accessPolicy.canRead && outputPort.accessPolicy.canWrite) {
+ var component = outputPort.component;
+ options.push({
+ text: component.name,
+ value: component.id,
+ description: nf.Common.escapeHtml(component.comments)
+ });
+ }
+ });
// only proceed if there are output ports
- if (!nf.Common.isEmpty(processGroupContents.outputPorts)) {
+ if (!nf.Common.isEmpty(options)) {
$('#output-port-source').show();
- // show the output port options
- var options = [];
- $.each(processGroupContents.outputPorts, function (i, outputPort) {
- options.push({
- text: outputPort.name,
- value: outputPort.id,
- description: nf.Common.escapeHtml(outputPort.comments)
- });
- });
-
// sort the options
options.sort(function (a, b) {
return a.text.localeCompare(b.text);
@@ -331,7 +334,7 @@ nf.ConnectionConfiguration = (function () {
},
dataType: 'json'
}).done(function (response) {
- var remoteProcessGroup = response.remoteProcessGroup;
+ var remoteProcessGroup = response.component;
var remoteProcessGroupContents = remoteProcessGroup.contents;
// only proceed if there are output ports
@@ -473,29 +476,29 @@ nf.ConnectionConfiguration = (function () {
$.ajax({
type: 'GET',
- url: config.urls.api + '/process-groups/' + encodeURIComponent(processGroupData.id),
- data: {
- verbose: true
- },
+ url: config.urls.api + '/flow/process-groups/' + encodeURIComponent(processGroupData.id),
dataType: 'json'
}).done(function (response) {
- var processGroup = response.component;
- var processGroupContents = processGroup.contents;
+ var processGroup = response.processGroupFlow;
+ var processGroupContents = processGroup.flow;
+
+ // show the input port options
+ var options = [];
+ $.each(processGroupContents.inputPorts, function (i, inputPort) {
+ if (inputPort.accessPolicy.canRead && inputPort.accessPolicy.canWrite) {
+ var component = inputPort.component;
+ options.push({
+ text: component.name,
+ value: component.id,
+ description: nf.Common.escapeHtml(component.comments)
+ });
+ }
+ });
// only proceed if there are output ports
- if (!nf.Common.isEmpty(processGroupContents.inputPorts)) {
+ if (!nf.Common.isEmpty(options)) {
$('#input-port-destination').show();
- // show the input port options
- var options = [];
- $.each(processGroupContents.inputPorts, function (i, inputPort) {
- options.push({
- text: inputPort.name,
- value: inputPort.id,
- description: nf.Common.escapeHtml(inputPort.comments)
- });
- });
-
// sort the options
options.sort(function (a, b) {
return a.text.localeCompare(b.text);
@@ -555,7 +558,7 @@ nf.ConnectionConfiguration = (function () {
},
dataType: 'json'
}).done(function (response) {
- var remoteProcessGroup = response.remoteProcessGroup;
+ var remoteProcessGroup = response.component;
var remoteProcessGroupContents = remoteProcessGroup.contents;
// only proceed if there are output ports