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/06/21 18:49:10 UTC
[17/17] nifi git commit: [NIFI-1879] Responsive dialogs and dialog UX
refresh. This closes #523
[NIFI-1879] Responsive dialogs and dialog UX refresh. This closes #523
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/8b27ed90
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/8b27ed90
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/8b27ed90
Branch: refs/heads/master
Commit: 8b27ed905d076b7571736995ef0d2ca48132b156
Parents: 6f3abdb
Author: Scott Aslan <ja...@hortonworks.com>
Authored: Tue Jun 21 00:40:16 2016 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Tue Jun 21 14:48:14 2016 -0400
----------------------------------------------------------------------
.../endpoints/GroupStatusEndpointMerger.java | 16 +-
.../nifi/web/StandardNiFiServiceFacade.java | 46 +-
.../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 12 +-
.../resources/filters/bulletin-board.properties | 4 +
.../main/resources/filters/canvas.properties | 4 +-
.../main/resources/filters/summary.properties | 6 +-
.../webapp/WEB-INF/pages/bulletin-board.jsp | 16 +-
.../src/main/webapp/WEB-INF/pages/canvas.jsp | 2 -
.../src/main/webapp/WEB-INF/pages/cluster.jsp | 5 +-
.../src/main/webapp/WEB-INF/pages/counters.jsp | 5 +-
.../src/main/webapp/WEB-INF/pages/history.jsp | 5 +-
.../src/main/webapp/WEB-INF/pages/login.jsp | 5 +-
.../main/webapp/WEB-INF/pages/provenance.jsp | 5 +-
.../src/main/webapp/WEB-INF/pages/summary.jsp | 16 +-
.../src/main/webapp/WEB-INF/pages/templates.jsp | 5 +-
.../bulletin-board/bulletin-board-content.jsp | 33 +-
.../WEB-INF/partials/canvas/about-dialog.jsp | 22 +-
.../WEB-INF/partials/canvas/canvas-header.jsp | 87 +-
.../partials/canvas/component-state-dialog.jsp | 8 +-
.../canvas/connection-configuration.jsp | 18 +-
.../partials/canvas/connections-dialog.jsp | 2 +-
.../canvas/controller-service-configuration.jsp | 8 +-
.../disable-controller-service-dialog.jsp | 6 +-
.../canvas/drop-request-status-dialog.jsp | 2 +-
.../canvas/enable-controller-service-dialog.jsp | 4 +-
.../partials/canvas/fill-color-dialog.jsp | 2 +-
.../WEB-INF/partials/canvas/flow-status.jsp | 20 +-
.../partials/canvas/flowfile-details-dialog.jsp | 6 +-
.../canvas/instantiate-template-dialog.jsp | 7 +-
.../partials/canvas/label-configuration.jsp | 4 +-
.../canvas/listing-request-status-dialog.jsp | 2 +-
.../WEB-INF/partials/canvas/navigation.jsp | 42 +-
.../canvas/new-controller-service-dialog.jsp | 45 +-
.../WEB-INF/partials/canvas/new-port-dialog.jsp | 2 +-
.../canvas/new-process-group-dialog.jsp | 2 +-
.../partials/canvas/new-processor-dialog.jsp | 47 +-
.../canvas/new-remote-process-group-dialog.jsp | 54 +-
.../canvas/new-reporting-task-dialog.jsp | 46 +-
.../partials/canvas/new-template-dialog.jsp | 2 +-
.../partials/canvas/port-configuration.jsp | 16 +-
.../WEB-INF/partials/canvas/port-details.jsp | 2 +-
.../canvas/process-group-configuration.jsp | 17 +-
.../partials/canvas/process-group-details.jsp | 2 +-
.../partials/canvas/processor-configuration.jsp | 32 +-
.../WEB-INF/partials/canvas/queue-listing.jsp | 14 +-
.../canvas/remote-port-configuration.jsp | 4 +-
.../remote-process-group-configuration.jsp | 54 +-
.../canvas/remote-process-group-details.jsp | 54 +-
.../canvas/remote-process-group-ports.jsp | 2 +-
.../canvas/reporting-task-configuration.jsp | 10 +-
.../partials/canvas/settings-content.jsp | 25 +-
.../webapp/WEB-INF/partials/canvas/shell.jsp | 12 +-
.../partials/cluster/cluster-content.jsp | 28 +-
.../partials/cluster/node-details-dialog.jsp | 2 +-
.../WEB-INF/partials/connection-details.jsp | 14 +-
.../partials/counters/counters-content.jsp | 26 +-
.../partials/history/action-details-dialog.jsp | 2 +-
.../partials/history/history-content.jsp | 26 +-
.../partials/history/history-filter-dialog.jsp | 10 +-
.../partials/history/history-purge-dialog.jsp | 6 +-
.../main/webapp/WEB-INF/partials/ok-dialog.jsp | 2 +-
.../WEB-INF/partials/processor-details.jsp | 23 +-
.../provenance/lineage-query-dialog.jsp | 2 +-
.../partials/provenance/provenance-content.jsp | 44 +-
.../provenance-event-details-dialog.jsp | 6 +-
.../provenance/provenance-query-dialog.jsp | 2 +-
.../provenance/provenance-search-dialog.jsp | 14 +-
.../WEB-INF/partials/status-history-dialog.jsp | 26 +-
.../cluster-connection-summary-dialog.jsp | 6 +-
.../cluster-input-port-summary-dialog.jsp | 6 +-
.../cluster-output-port-summary-dialog.jsp | 6 +-
.../cluster-process-group-summary-dialog.jsp | 6 +-
.../cluster-processor-summary-dialog.jsp | 6 +-
...ster-remote-process-group-summary-dialog.jsp | 6 +-
.../partials/summary/summary-content.jsp | 43 +-
.../summary/system-diagnostics-dialog.jsp | 140 ++-
.../summary/view-single-node-dialog.jsp | 2 +-
.../partials/templates/templates-content.jsp | 35 +-
.../webapp/WEB-INF/partials/yes-no-dialog.jsp | 2 +-
.../nifi-web-ui/src/main/webapp/css/about.css | 30 +-
.../src/main/webapp/css/bulletin-board.css | 120 +-
.../nifi-web-ui/src/main/webapp/css/cluster.css | 67 +-
.../src/main/webapp/css/component-state.css | 49 +-
.../webapp/css/connection-configuration.css | 84 +-
.../src/main/webapp/css/connection-details.css | 29 -
.../src/main/webapp/css/controller-service.css | 85 +-
.../src/main/webapp/css/counters.css | 86 +-
.../nifi-web-ui/src/main/webapp/css/dialog.css | 192 +--
.../src/main/webapp/css/flow-status.css | 2 +
.../nifi-web-ui/src/main/webapp/css/graph.css | 1 +
.../nifi-web-ui/src/main/webapp/css/header.css | 8 +
.../nifi-web-ui/src/main/webapp/css/history.css | 123 +-
.../src/main/webapp/css/label-configuration.css | 14 +-
.../nifi-web-ui/src/main/webapp/css/main.css | 274 ++++-
.../src/main/webapp/css/navigation.css | 15 +-
.../css/new-controller-service-dialog.css | 106 +-
.../main/webapp/css/new-processor-dialog.css | 102 +-
.../webapp/css/new-reporting-task-dialog.css | 102 +-
.../src/main/webapp/css/port-configuration.css | 9 +-
.../webapp/css/process-group-configuration.css | 29 +-
.../main/webapp/css/processor-configuration.css | 90 +-
.../src/main/webapp/css/processor-details.css | 36 +-
.../src/main/webapp/css/provenance.css | 199 +---
.../src/main/webapp/css/queue-listing.css | 71 +-
.../css/remote-process-group-configuration.css | 92 +-
.../src/main/webapp/css/reporting-task.css | 41 +-
.../src/main/webapp/css/settings.css | 96 +-
.../nifi-web-ui/src/main/webapp/css/shell.css | 42 +-
.../src/main/webapp/css/status-history.css | 37 +-
.../nifi-web-ui/src/main/webapp/css/summary.css | 329 +-----
.../src/main/webapp/css/templates.css | 104 +-
.../src/main/webapp/fonts/flowfont/flowfont.css | 54 +-
.../src/main/webapp/fonts/flowfont/flowfont.eot | Bin 16668 -> 25120 bytes
.../src/main/webapp/fonts/flowfont/flowfont.svg | 60 +-
.../src/main/webapp/fonts/flowfont/flowfont.ttf | Bin 16500 -> 24952 bytes
.../main/webapp/fonts/flowfont/flowfont.woff | Bin 8544 -> 12664 bytes
.../main/webapp/fonts/flowfont/flowfont.woff2 | Bin 7248 -> 10780 bytes
.../src/main/webapp/images/nifi-logo-about.svg | 17 +
.../src/main/webapp/images/nifi_about.png | Bin 16323 -> 0 bytes
.../webapp/js/jquery/combo/jquery.combo.css | 67 +-
.../main/webapp/js/jquery/combo/jquery.combo.js | 73 +-
.../webapp/js/jquery/modal/jquery.modal.css | 118 +-
.../main/webapp/js/jquery/modal/jquery.modal.js | 361 ++++--
.../propertytable/jquery.propertytable.css | 92 +-
.../propertytable/jquery.propertytable.js | 424 ++++---
.../webapp/js/jquery/qtip2/jquery.qtip.min.css | 5 +-
.../webapp/js/jquery/qtip2/jquery.qtip.min.js | 8 +-
.../webapp/js/jquery/qtip2/jquery.qtip.min.map | 1 +
.../slickgrid/css/slick-default-theme.css | 156 +--
.../webapp/js/jquery/tabbs/jquery.tabbs.css | 49 +-
.../js/jquery/tagcloud/jquery.tagcloud.css | 26 +-
.../js/jquery/tagcloud/jquery.tagcloud.js | 33 +-
.../js/nf/bulletin-board/nf-bulletin-board.js | 444 +++----
.../controllers/nf-ng-canvas-app-controller.js | 39 -
.../nf-ng-canvas-flow-status-controller.js | 14 +-
.../nf-ng-canvas-global-menu-controller.js | 16 +-
.../nf-ng-canvas-graph-controls-controller.js | 4 +-
.../nf-ng-canvas-operate-controller.js | 40 +-
.../nf-ng-canvas-toolbox-controller.js | 5 +-
.../header/components/nf-ng-funnel-component.js | 10 +
.../header/components/nf-ng-group-component.js | 55 +-
.../components/nf-ng-input-port-component.js | 47 +-
.../header/components/nf-ng-label-component.js | 10 +
.../components/nf-ng-output-port-component.js | 46 +-
.../components/nf-ng-processor-component.js | 64 +-
.../nf-ng-remote-process-group-component.js | 49 +-
.../components/nf-ng-template-component.js | 51 +-
.../src/main/webapp/js/nf/canvas/nf-actions.js | 288 ++---
.../main/webapp/js/nf/canvas/nf-canvas-utils.js | 24 +-
.../src/main/webapp/js/nf/canvas/nf-canvas.js | 27 +-
.../webapp/js/nf/canvas/nf-component-state.js | 20 +-
.../js/nf/canvas/nf-connection-configuration.js | 216 ++--
.../main/webapp/js/nf/canvas/nf-connection.js | 11 +-
.../js/nf/canvas/nf-controller-service.js | 574 +++++----
.../js/nf/canvas/nf-controller-services.js | 56 +-
.../main/webapp/js/nf/canvas/nf-custom-ui.js | 4 +-
.../main/webapp/js/nf/canvas/nf-draggable.js | 6 +-
.../src/main/webapp/js/nf/canvas/nf-go-to.js | 138 +--
.../js/nf/canvas/nf-label-configuration.js | 34 +-
.../js/nf/canvas/nf-ng-canvas-app-config.js | 95 --
.../js/nf/canvas/nf-port-configuration.js | 153 +--
.../main/webapp/js/nf/canvas/nf-port-details.js | 22 +-
.../nf/canvas/nf-process-group-configuration.js | 22 +-
.../js/nf/canvas/nf-process-group-details.js | 22 +-
.../js/nf/canvas/nf-processor-configuration.js | 145 +--
.../webapp/js/nf/canvas/nf-queue-listing.js | 109 +-
.../nf-remote-process-group-configuration.js | 87 +-
.../canvas/nf-remote-process-group-details.js | 22 +-
.../nf/canvas/nf-remote-process-group-ports.js | 73 +-
.../webapp/js/nf/canvas/nf-reporting-task.js | 229 ++--
.../src/main/webapp/js/nf/canvas/nf-settings.js | 122 +-
.../webapp/js/nf/cluster/nf-cluster-table.js | 103 +-
.../src/main/webapp/js/nf/cluster/nf-cluster.js | 9 +-
.../webapp/js/nf/counters/nf-counters-table.js | 10 +-
.../main/webapp/js/nf/counters/nf-counters.js | 8 +-
.../webapp/js/nf/history/nf-history-table.js | 265 +++--
.../src/main/webapp/js/nf/history/nf-history.js | 8 +-
.../src/main/webapp/js/nf/login/nf-login.js | 4 +-
.../src/main/webapp/js/nf/nf-common.js | 26 +-
.../main/webapp/js/nf/nf-connection-details.js | 71 +-
.../src/main/webapp/js/nf/nf-dialog.js | 53 +-
.../src/main/webapp/js/nf/nf-ng-app-config.js | 95 ++
.../main/webapp/js/nf/nf-ng-app-controller.js | 39 +
.../src/main/webapp/js/nf/nf-ng-bridge.js | 12 +-
.../main/webapp/js/nf/nf-processor-details.js | 76 +-
.../src/main/webapp/js/nf/nf-shell.js | 17 +-
.../src/main/webapp/js/nf/nf-status-history.js | 421 +++----
.../js/nf/provenance/nf-provenance-lineage.js | 1107 +++++++++---------
.../js/nf/provenance/nf-provenance-table.js | 347 +++---
.../webapp/js/nf/provenance/nf-provenance.js | 7 +-
.../webapp/js/nf/summary/nf-cluster-search.js | 100 +-
.../webapp/js/nf/summary/nf-summary-table.js | 834 ++++++++-----
.../src/main/webapp/js/nf/summary/nf-summary.js | 63 +-
.../js/nf/templates/nf-templates-table.js | 15 +-
.../main/webapp/js/nf/templates/nf-templates.js | 24 +-
195 files changed, 6442 insertions(+), 6231 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/GroupStatusEndpointMerger.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/GroupStatusEndpointMerger.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/GroupStatusEndpointMerger.java
index b769042..9440760 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/GroupStatusEndpointMerger.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/GroupStatusEndpointMerger.java
@@ -17,13 +17,6 @@
package org.apache.nifi.cluster.coordination.http.endpoints;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.regex.Pattern;
-
import org.apache.nifi.cluster.manager.StatusMerger;
import org.apache.nifi.cluster.protocol.NodeIdentifier;
import org.apache.nifi.web.api.dto.status.NodeProcessGroupStatusSnapshotDTO;
@@ -32,6 +25,13 @@ import org.apache.nifi.web.api.dto.status.ProcessGroupStatusSnapshotDTO;
import org.apache.nifi.web.api.dto.status.RemoteProcessGroupStatusSnapshotDTO;
import org.apache.nifi.web.api.entity.ProcessGroupStatusEntity;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.regex.Pattern;
+
public class GroupStatusEndpointMerger extends AbstractNodeStatusEndpoint<ProcessGroupStatusEntity, ProcessGroupStatusDTO> {
public static final Pattern GROUP_STATUS_URI_PATTERN = Pattern.compile("/nifi-api/flow/process-groups/(?:(?:root)|(?:[a-f0-9\\-]{36}))/status");
@@ -73,7 +73,7 @@ public class GroupStatusEndpointMerger extends AbstractNodeStatusEndpoint<Proces
final ProcessGroupStatusSnapshotDTO nodeSnapshot = nodeProcessGroupStatus.getAggregateSnapshot();
for (final RemoteProcessGroupStatusSnapshotDTO remoteProcessGroupStatus : nodeSnapshot.getRemoteProcessGroupStatusSnapshots()) {
final List<String> nodeAuthorizationIssues = remoteProcessGroupStatus.getAuthorizationIssues();
- if (!nodeAuthorizationIssues.isEmpty()) {
+ if (nodeAuthorizationIssues != null && !nodeAuthorizationIssues.isEmpty()) {
for (final ListIterator<String> iter = nodeAuthorizationIssues.listIterator(); iter.hasNext();) {
final String Issue = iter.next();
iter.set("[" + nodeId.getApiAddress() + ":" + nodeId.getApiPort() + "] -- " + Issue);
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
index 21ea757..a1e88ca 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
@@ -16,28 +16,7 @@
*/
package org.apache.nifi.web;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.UUID;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Collectors;
-
-import javax.ws.rs.WebApplicationException;
-
+import com.google.common.collect.Sets;
import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.action.Action;
import org.apache.nifi.action.Component;
@@ -193,7 +172,26 @@ import org.apache.nifi.web.util.SnippetUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Sets;
+import javax.ws.rs.WebApplicationException;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Collectors;
/**
* Implementation of NiFiServiceFacade that performs revision checking.
@@ -2527,7 +2525,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
@Override
public PortStatusDTO getOutputPortStatus(final String outputPortId) {
- return revisionManager.get(outputPortId, rev -> dtoFactory.createPortStatusDto(controllerFacade.getInputPortStatus(outputPortId)));
+ return revisionManager.get(outputPortId, rev -> dtoFactory.createPortStatusDto(controllerFacade.getOutputPortStatus(outputPortId)));
}
@Override
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
index cf3edcc..1b65f0b 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
@@ -374,8 +374,8 @@
<include>${staging.dir}/js/nf/nf-status-history.js</include>
<include>${staging.dir}/js/nf/canvas/nf-canvas.js</include>
<include>${staging.dir}/js/nf/canvas/nf-clipboard.js</include>
- <include>${staging.dir}/js/nf/canvas/nf-ng-canvas-app-config.js</include>
- <include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-app-controller.js</include>
+ <include>${staging.dir}/js/nf/nf-ng-app-config.js</include>
+ <include>${staging.dir}/js/nf/nf-ng-app-controller.js</include>
<include>${staging.dir}/js/nf/canvas/controllers/nf-ng-breadcrumbs-controller.js</include>
<include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-header-controller.js</include>
<include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js</include>
@@ -441,6 +441,10 @@
<include>${staging.dir}/js/nf/nf-processor-details.js</include>
<include>${staging.dir}/js/nf/nf-connection-details.js</include>
<include>${staging.dir}/js/nf/nf-status-history.js</include>
+ <include>${staging.dir}/js/nf/nf-ng-bridge.js</include>
+ <include>${staging.dir}/js/nf/nf-ng-service-provider.js</include>
+ <include>${staging.dir}/js/nf/nf-ng-app-config.js</include>
+ <include>${staging.dir}/js/nf/nf-ng-app-controller.js</include>
<include>${staging.dir}/js/nf/summary/nf-summary.js</include>
<include>${staging.dir}/js/nf/summary/nf-summary-table.js</include>
<include>${staging.dir}/js/nf/summary/nf-cluster-search.js</include>
@@ -498,6 +502,10 @@
<include>${staging.dir}/js/nf/nf-dialog.js</include>
<include>${staging.dir}/js/nf/nf-storage.js</include>
<include>${staging.dir}/js/nf/nf-ajax-setup.js</include>
+ <include>${staging.dir}/js/nf/nf-ng-bridge.js</include>
+ <include>${staging.dir}/js/nf/nf-ng-service-provider.js</include>
+ <include>${staging.dir}/js/nf/nf-ng-app-config.js</include>
+ <include>${staging.dir}/js/nf/nf-ng-app-controller.js</include>
<include>${staging.dir}/js/nf/bulletin-board/nf-bulletin-board.js</include>
</includes>
</aggregation>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties
index 7fe8584..a4afc92 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties
@@ -19,6 +19,10 @@ nf.bulletin.board.script.tags=<script type="text/javascript" src="js/nf/nf-names
<script type="text/javascript" src="js/nf/nf-dialog.js?${project.version}"></script>\n\
<script type="text/javascript" src="js/nf/nf-storage.js?${project.version}"></script>\n\
<script type="text/javascript" src="js/nf/nf-ajax-setup.js?${project.version}"></script>\n\
+<script type="text/javascript" src="js/nf/nf-ng-bridge.js?${project.version}"></script>\n\
+<script type="text/javascript" src="js/nf/nf-ng-service-provider.js?${project.version}"></script>\n\
+<script type="text/javascript" src="js/nf/nf-ng-app-controller.js?${project.version}"></script>\n\
+<script type="text/javascript" src="js/nf/nf-ng-app-config.js?${project.version}"></script>\n\
<script type="text/javascript" src="js/nf/bulletin-board/nf-bulletin-board.js?${project.version}"></script>
nf.bulletin.board.style.tags=<link rel="stylesheet" href="css/reset.css?${project.version}" type="text/css" />\n\
<link rel="stylesheet" href="css/main.css?${project.version}" type="text/css" />\n\
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties
index fc1f2c9..f3d3941 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties
@@ -80,6 +80,6 @@ nf.canvas.script.tags=<script type="text/javascript" src="js/nf/nf-namespace.js?
<script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-label-component.js?${project.version}"></script>\n\
<script type="text/javascript" src="js/nf/canvas/directives/nf-ng-breadcrumbs-directive.js?${project.version}"></script>\n\
<script type="text/javascript" src="js/nf/canvas/directives/nf-ng-draggable-directive.js?${project.version}"></script>\n\
-<script type="text/javascript" src="js/nf/canvas/controllers/nf-ng-canvas-app-controller.js?${project.version}"></script>\n\
-<script type="text/javascript" src="js/nf/canvas/nf-ng-canvas-app-config.js?${project.version}"></script>
+<script type="text/javascript" src="js/nf/nf-ng-app-controller.js?${project.version}"></script>\n\
+<script type="text/javascript" src="js/nf/nf-ng-app-config.js?${project.version}"></script>
nf.canvas.style.tags=<link rel="stylesheet" href="css/canvas.css?${project.version}" type="text/css" />
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties
index e130655..33e1a5a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties
@@ -24,7 +24,11 @@ nf.summary.script.tags=<script type="text/javascript" src="js/nf/nf-namespace.js
<script type="text/javascript" src="js/nf/nf-status-history.js?${project.version}"></script>\n\
<script type="text/javascript" src="js/nf/summary/nf-summary.js?${project.version}"></script>\n\
<script type="text/javascript" src="js/nf/summary/nf-summary-table.js?${project.version}"></script>\n\
-<script type="text/javascript" src="js/nf/summary/nf-cluster-search.js?${project.version}"></script>
+<script type="text/javascript" src="js/nf/summary/nf-cluster-search.js?${project.version}"></script>\n\
+<script type="text/javascript" src="js/nf/nf-ng-bridge.js?${project.version}"></script>\n\
+<script type="text/javascript" src="js/nf/nf-ng-service-provider.js?${project.version}"></script>\n\
+<script type="text/javascript" src="js/nf/nf-ng-app-controller.js?${project.version}"></script>\n\
+<script type="text/javascript" src="js/nf/nf-ng-app-config.js?${project.version}"></script>
nf.summary.style.tags=<link rel="stylesheet" href="css/reset.css?${project.version}" type="text/css" />\n\
<link rel="stylesheet" href="css/main.css?${project.version}" type="text/css" />\n\
<link rel="stylesheet" href="css/banner.css?${project.version}" type="text/css" />\n\
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
index 3eaa225..cc78c90 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
@@ -27,6 +27,9 @@
<link rel="stylesheet" href="js/jquery/modal/jquery.modal.css?${project.version}" type="text/css" />
<link rel="stylesheet" href="js/jquery/qtip2/jquery.qtip.min.css?" type="text/css" />
<link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" />
+ <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" />
+ <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" />
+ <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" />
<script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery.base64.js"></script>
<script type="text/javascript" src="js/jquery/jquery.center.js"></script>
@@ -36,16 +39,23 @@
<script type="text/javascript" src="js/jquery/jquery.each.js"></script>
<script type="text/javascript" src="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.js"></script>
<script type="text/javascript" src="js/jquery/qtip2/jquery.qtip.min.js"></script>
+ <script type="text/javascript" src="assets/angular/angular.min.js"></script>
+ <script type="text/javascript" src="assets/angular-messages/angular-messages.min.js"></script>
+ <script type="text/javascript" src="assets/angular-resource/angular-resource.min.js"></script>
+ <script type="text/javascript" src="assets/angular-route/angular-route.min.js"></script>
+ <script type="text/javascript" src="assets/angular-aria/angular-aria.min.js"></script>
+ <script type="text/javascript" src="assets/angular-animate/angular-animate.min.js"></script>
+ <script type="text/javascript" src="assets/angular-material/angular-material.min.js"></script>
+ <script type="text/javascript" src="assets/angular-sanitize/angular-sanitize.min.js"></script>
<script type="text/javascript" src="js/nf/nf-namespace.js?${project.version}"></script>
+ <script type="text/javascript" src="js/nf/nf-ng-namespace.js?${project.version}"></script>
${nf.bulletin.board.script.tags}
</head>
- <body>
+ <body ng-controller="ngBulletinBoardAppCtrl">
<jsp:include page="/WEB-INF/partials/message-pane.jsp"/>
<jsp:include page="/WEB-INF/partials/banners-utility.jsp"/>
<jsp:include page="/WEB-INF/partials/ok-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/yes-no-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp"/>
- <div id="faded-background"></div>
- <div id="glass-pane"></div>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
index dac5032..77ee3f3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
@@ -136,8 +136,6 @@
<jsp:include page="/WEB-INF/partials/canvas/queue-listing.jsp"/>
<jsp:include page="/WEB-INF/partials/canvas/component-state-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/connection-details.jsp"/>
- <div id="faded-background"></div>
- <div id="glass-pane"></div>
<div id="context-menu" class="unselectable"></div>
<span id="nifi-content-viewer-url" class="hidden"></span>
</body>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
index acf2e55..baa4c6a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
@@ -29,6 +29,9 @@
<link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" />
+ <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" />
+ <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" />
+ <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" />
<script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery.base64.js"></script>
<script type="text/javascript" src="js/jquery/jquery.center.js"></script>
@@ -57,7 +60,5 @@
<jsp:include page="/WEB-INF/partials/yes-no-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/cluster/cluster-content.jsp"/>
<jsp:include page="/WEB-INF/partials/cluster/node-details-dialog.jsp"/>
- <div id="faded-background"></div>
- <div id="glass-pane"></div>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp
index e3113f9..b8dee0a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp
@@ -29,6 +29,9 @@
<link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" />
+ <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" />
+ <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" />
+ <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" />
<script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery.base64.js"></script>
<script type="text/javascript" src="js/jquery/jquery.center.js"></script>
@@ -56,7 +59,5 @@
<jsp:include page="/WEB-INF/partials/banners-utility.jsp"/>
<jsp:include page="/WEB-INF/partials/ok-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/counters/counters-content.jsp"/>
- <div id="faded-background"></div>
- <div id="glass-pane"></div>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp
index ac28bb7..88f28fa 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp
@@ -29,6 +29,9 @@
<link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" />
+ <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" />
+ <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" />
+ <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" />
<script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery.base64.js"></script>
<script type="text/javascript" src="js/jquery/jquery.center.js"></script>
@@ -60,7 +63,5 @@
<jsp:include page="/WEB-INF/partials/history/action-details-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/history/history-filter-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/history/history-purge-dialog.jsp"/>
- <div id="faded-background"></div>
- <div id="glass-pane"></div>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp
index 06a7e91..2e2c713 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp
@@ -26,6 +26,9 @@
<link rel="stylesheet" href="js/jquery/modal/jquery.modal.css?${project.version}" type="text/css" />
<link rel="stylesheet" href="js/jquery/qtip2/jquery.qtip.min.css?" type="text/css" />
<link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" />
+ <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" />
+ <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" />
+ <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" />
<script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery.base64.js"></script>
<script type="text/javascript" src="js/jquery/jquery.count.js"></script>
@@ -55,7 +58,5 @@
<jsp:include page="/WEB-INF/partials/login/login-progress.jsp"/>
</div>
<jsp:include page="/WEB-INF/partials/ok-dialog.jsp"/>
- <div id="faded-background"></div>
- <div id="glass-pane"></div>
</body>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp
index eebe3e4..9c15371 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp
@@ -30,6 +30,9 @@
<link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" />
+ <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" />
+ <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" />
+ <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" />
<script type="text/javascript" src="js/d3/d3.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery.base64.js"></script>
@@ -64,7 +67,5 @@
<jsp:include page="/WEB-INF/partials/provenance/provenance-search-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/provenance/provenance-query-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/provenance/lineage-query-dialog.jsp"/>
- <div id="faded-background"></div>
- <div id="glass-pane"></div>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp
index 68ca6ab..01ba6b4 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp
@@ -35,6 +35,9 @@
<link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" />
+ <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" />
+ <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" />
+ <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" />
<script type="text/javascript" src="js/codemirror/lib/codemirror-compressed.js"></script>
<script type="text/javascript" src="js/d3/d3.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script>
@@ -58,12 +61,21 @@
<script type="text/javascript" src="js/jquery/slickgrid/slick.dataview.js"></script>
<script type="text/javascript" src="js/jquery/slickgrid/slick.core.js"></script>
<script type="text/javascript" src="js/jquery/slickgrid/slick.grid.js"></script>
+ <script type="text/javascript" src="assets/angular/angular.min.js"></script>
+ <script type="text/javascript" src="assets/angular-messages/angular-messages.min.js"></script>
+ <script type="text/javascript" src="assets/angular-resource/angular-resource.min.js"></script>
+ <script type="text/javascript" src="assets/angular-route/angular-route.min.js"></script>
+ <script type="text/javascript" src="assets/angular-aria/angular-aria.min.js"></script>
+ <script type="text/javascript" src="assets/angular-animate/angular-animate.min.js"></script>
+ <script type="text/javascript" src="assets/angular-material/angular-material.min.js"></script>
+ <script type="text/javascript" src="assets/angular-sanitize/angular-sanitize.min.js"></script>
<script type="text/javascript" src="js/nf/nf-namespace.js?${project.version}"></script>
+ <script type="text/javascript" src="js/nf/nf-ng-namespace.js?${project.version}"></script>
${nf.summary.script.tags}
<script type="text/javascript" src="js/jquery/nfeditor/languages/nfel.js?${project.version}"></script>
<script type="text/javascript" src="js/jquery/nfeditor/jquery.nfeditor.js?${project.version}"></script>
</head>
- <body>
+ <body ng-controller="ngSummaryAppCtrl">
<jsp:include page="/WEB-INF/partials/message-pane.jsp"/>
<jsp:include page="/WEB-INF/partials/banners-utility.jsp"/>
<jsp:include page="/WEB-INF/partials/ok-dialog.jsp"/>
@@ -79,7 +91,5 @@
<jsp:include page="/WEB-INF/partials/summary/cluster-process-group-summary-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/summary/system-diagnostics-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/summary/view-single-node-dialog.jsp"/>
- <div id="faded-background"></div>
- <div id="glass-pane"></div>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp
index 452064d..91409e7 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp
@@ -29,6 +29,9 @@
<link rel="stylesheet" href="js/jquery/ui-smoothness/jquery-ui-1.10.4.min.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" />
+ <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" />
+ <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" />
+ <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" />
<script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script>
<script type="text/javascript" src="js/jquery/jquery.base64.js"></script>
<script type="text/javascript" src="js/jquery/jquery.center.js"></script>
@@ -58,7 +61,5 @@
<jsp:include page="/WEB-INF/partials/ok-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/yes-no-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/templates/templates-content.jsp"/>
- <div id="faded-background"></div>
- <div id="glass-pane"></div>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
index a266d13..cdfe102 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
@@ -18,23 +18,26 @@
<div id="bulletin-board">
<div id="bulletin-board-header-and-filter">
<div id="bulletin-board-header-text">NiFi Templates</div>
- <div id="bulletin-board-filter-controls">
- <div id="bulletin-board-filter-container">
- <input type="text" id="bulletin-board-filter"/>
- <div id="bulletin-board-filter-type"></div>
+ <div id="bulletin-board-filter-controls" class="filter-controls">
+ <div id="bulletin-board-filter-container" class="filter-container">
+ <input type="text" placeholder="Filter" id="bulletin-board-filter" class="filter"/>
+ <div id="bulletin-board-filter-type" class="filter-type"></div>
</div>
</div>
</div>
- <div id="bulletin-board-refresh-container">
- <div id="refresh-button" class="bulletin-board-refresh pointer" title="Start/Stop auto refresh"></div>
- <div id="bulletin-board-last-refreshed-container">
- Last updated: <span id="bulletin-board-last-refreshed"></span>
- </div>
- <div id="bulletin-board-loading-container" class="loading-container"></div>
- <div id="bulletin-board-status-container">
- <div id="bulletin-error-message"></div>
- <div id="clear-bulletins-button" class="button-normal pointer">Clear</div>
- </div>
- </div>
<div id="bulletin-board-container"></div>
+</div>
+<div id="bulletin-board-refresh-container">
+ <md-switch class="md-primary refresh-toggle" aria-label="Toggle auto refresh" ng-change="appCtrl.serviceProvider.bulletinBoardCtrl.togglePolling()" ng-model="appCtrl.serviceProvider.bulletinBoardCtrl.polling">
+ Auto-refresh
+ </md-switch>
+ <button id="refresh-button" ng-click="appCtrl.serviceProvider.bulletinBoardCtrl.loadBulletins()" class="refresh-button pointer fa fa-refresh" title="Start/Stop auto refresh"></button>
+ <div id="bulletin-board-last-refreshed-container" class="last-refreshed-container">
+ Last updated: <span id="bulletin-board-last-refreshed" class="value-color"></span>
+ </div>
+ <div id="bulletin-board-loading-container" class="loading-container"></div>
+ <div id="bulletin-board-status-container">
+ <div id="bulletin-error-message"></div>
+ <span id="clear-bulletins-button" class="link pointer">Clear</span>
+ </div>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp
index ce43f84..9024f35 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp
@@ -16,14 +16,18 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="nf-about">
- <div id="nf-about-pic"></div>
- <div id="nf-about-content">
- <span id="nf-version"></span>
- <p>
- Apache NiFi is a framework to support highly scalable and flexible dataflows.
- It can be run on on laptops up through clusters of enterprise class servers.
- Instead of dictating a particular dataflow or behavior it empowers you to design your own
- optimal dataflow tailored to your specific environment.
- </p>
+ <div id="nf-about-pic-container">
+ <div id="nf-about-pic"></div>
+ </div>
+ <div class="dialog-content">
+ <div id="nf-about-content">
+ <span id="nf-version"></span>
+ <p>
+ Apache NiFi is a framework to support highly scalable and flexible dataflows.
+ It can be run on on laptops up through clusters of enterprise class servers.
+ Instead of dictating a particular dataflow or behavior it empowers you to design your own
+ optimal dataflow tailored to your specific environment.
+ </p>
+ </div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/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 bc2676c..0f3a434 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
@@ -23,42 +23,50 @@
id="processor-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.processorComponent);">
- <i class="icon icon-processor"></i></button>
+ <div class="icon icon-processor"></div>
+ </button>
<button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.inputPort}}"
id="port-in-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.inputPortComponent);">
- <i class="icon icon-port-in"></i></button>
+ <div class="icon icon-port-in"></div>
+ </button>
<button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.outputPort}}"
id="port-out-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.outputPortComponent);">
- <i class="icon icon-port-out"></i></button>
+ <div class="icon icon-port-out"></div>
+ </button>
<button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.processGroup}}"
id="group-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.groupComponent);">
- <i class="icon icon-group"></i></button>
- <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.remoteProcessGroup}}" hide
- show-gt-sm id="group-remote-component" class="component-button"
+ <div class="icon icon-group"></div>
+ </button>
+ <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.remoteProcessGroup}}"
+ id="group-remote-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.remoteGroupComponent);">
- <i class="icon icon-group-remote"></i></button>
+ <div class="icon icon-group-remote"></div>
+ </button>
<button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.funnel}}"
id="funnel-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.funnelComponent);">
- <i class="icon icon-funnel"></i></button>
+ <div class="icon icon-funnel"></div>
+ </button>
<button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.template}}"
id="template-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.templateComponent);">
- <i class="icon icon-template"></i></button>
+ <div class="icon icon-template"></div>
+ </button>
<button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.label}}"
id="label-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.labelComponent);">
- <i class="icon icon-label"></i></button>
+ <div class="icon icon-label"></div>
+ </button>
</div>
<div layout="row" layout-align="space-between center">
<div layout-align="space-between end" layout="column">
@@ -77,71 +85,84 @@
</div>
</div>
<md-menu md-position-mode="target-right target" md-offset="-1 44">
- <button md-menu-origin id="global-menu-button" ng-click="$mdOpenMenu()"><i class="fa fa-navicon"></i>
+ <button md-menu-origin id="global-menu-button" ng-click="$mdOpenMenu()">
+ <div class="fa fa-navicon"></div>
</button>
<md-menu-content id="global-menu-content">
<md-menu-item layout-align="space-around center">
<a id="reporting-link"
- ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.summary.shell.launch();"><i
- class="fa fa-table"></i>Summary</a>
+ ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.summary.shell.launch();">
+ <i class="fa fa-table"></i>Summary
+ </a>
</md-menu-item>
<md-menu-item layout-align="space-around center">
<a id="counters-link"
- ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.counters.shell.launch();"><i
- class="icon icon-counter"></i>Counters</a>
+ ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.counters.shell.launch();">
+ <i class="icon icon-counter"></i>Counters
+ </a>
</md-menu-item>
<md-menu-item layout-align="space-around center">
<a id="bulletin-board-link"
- ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.bulletinBoard.shell.launch();"><i
- class="fa fa-sticky-note-o"></i>Bulletin Board</a>
+ ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.bulletinBoard.shell.launch();">
+ <i class="fa fa-sticky-note-o"></i>Bulletin Board
+ </a>
</md-menu-item>
<md-menu-divider></md-menu-divider>
<md-menu-item
ng-if="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.dataProvenance.enabled();"
layout-align="space-around center">
<a id="provenance-link"
- ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.dataProvenance.shell.launch();"><i
- class="icon icon-provenance"></i>Data Provenance</a>
+ ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.dataProvenance.shell.launch();">
+ <i class="icon icon-provenance"></i>Data Provenance
+ </a>
</md-menu-item>
<md-menu-divider></md-menu-divider>
<md-menu-item layout-align="space-around center">
<a id="flow-settings-link"
- ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.controllerSettings.shell.launch();"><i
- class="fa fa-wrench"></i>Controller Settings</a>
+ ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.controllerSettings.shell.launch();">
+ <i class="fa fa-wrench"></i>Controller Settings
+ </a>
</md-menu-item>
<md-menu-item ng-if="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.cluster.enabled();"
layout-align="space-around center">
<a id="cluster-link"
- ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.cluster.shell.launch();"><i
- class="fa fa-cubes"></i>Cluster</a>
+ ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.cluster.shell.launch();">
+ <i class="fa fa-cubes"></i>Cluster
+ </a>
</md-menu-item>
<md-menu-item layout-align="space-around center">
<a id="history-link"
- ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.flowConfigHistory.shell.launch();"><i
- class="fa fa-history"></i>Flow Configuration History</a>
+ ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.flowConfigHistory.shell.launch();">
+ <i class="fa fa-history"></i>Flow Configuration History
+ </a>
</md-menu-item>
<md-menu-item ng-if="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.users.enabled();"
layout-align="space-around center">
<a id="users-link" layout="row"
- ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.users.shell.launch();;"><i
- class="fa fa-users"></i>Users<div id="has-pending-accounts" class="hidden"></div></a>
+ ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.users.shell.launch();;">
+ <i class="fa fa-users"></i>Users
+ <div id="has-pending-accounts" class="hidden"></div>
+ </a>
</md-menu-item>
<md-menu-divider></md-menu-divider>
<md-menu-item layout-align="space-around center">
<a id="templates-link"
- ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.templates.shell.launch();"><i
- class="icon icon-template"></i>Templates</a>
+ ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.templates.shell.launch();">
+ <i class="icon icon-template"></i>Templates
+ </a>
</md-menu-item>
<md-menu-divider></md-menu-divider>
<md-menu-item layout-align="space-around center">
<a id="help-link"
- ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.help.shell.launch();"><i
- class="fa fa-question-circle"></i>Help</a>
+ ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.help.shell.launch();">
+ <i class="fa fa-question-circle"></i>Help
+ </a>
</md-menu-item>
<md-menu-item layout-align="space-around center">
<a id="about-link"
- ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.about.modal.show();"><i
- class="fa fa-info-circle"></i>About</a>
+ ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.about.modal.show();">
+ <i class="fa fa-info-circle"></i>About
+ </a>
</md-menu-item>
</md-menu-content>
</md-menu>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp
index fa16eb1..3c7c3fb 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp
@@ -15,7 +15,7 @@
limitations under the License.
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-<div id="component-state-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}">
+<div id="component-state-dialog" layout="column" class="hidden large-dialog">
<div class="dialog-content">
<div class="setting">
<div class="setting-name">Name</div>
@@ -34,12 +34,12 @@
Showing partial results
</div>
<div id="component-state-filter-controls">
+ <div id="component-state-filter-status" class="filter-status">
+ Displaying <span id="displayed-component-state-entries"></span> of <span id="total-component-state-entries"></span>
+ </div>
<div id="component-state-filter-container">
<input type="text" id="component-state-filter"/>
</div>
- <div id="component-state-filter-status">
- Displaying <span id="displayed-component-state-entries"></span> of <span id="total-component-state-entries"></span>
- </div>
</div>
<div class="clear"></div>
</div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
index 1e487c5..a93bea0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
@@ -15,9 +15,9 @@
limitations under the License.
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-<div id="connection-configuration" nf-draggable="{containment: 'parent', handle: '.dialog-header'}">
- <div class="connection-configuration-tab-container">
- <div id="connection-configuration-tabs"></div>
+<div id="connection-configuration" layout="column" class="hidden large-dialog">
+ <div class="connection-configuration-tab-container dialog-content">
+ <div id="connection-configuration-tabs" class="tab-container"></div>
<div id="connection-configuration-tabs-content">
<div id="connection-settings-tab-content" class="configuration-tab">
<div class="settings-left">
@@ -36,7 +36,7 @@
<div class="setting">
<div class="setting-name">
FlowFile expiration
- <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The maximum amount of time an object may be in the flow before it will be automatically aged out of the flow."/>
+ <div class="fa fa-question-circle" alt="Info" title="The maximum amount of time an object may be in the flow before it will be automatically aged out of the flow."></div>
</div>
<div class="setting-field">
<input type="text" id="flow-file-expiration" name="flow-file-expiration" class="setting-input"/>
@@ -45,7 +45,7 @@
<div class="setting">
<div class="setting-name">
Back pressure object threshold
- <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The maximum number of objects that can be queued before back pressure is applied."/>
+ <div class="fa fa-question-circle" alt="Info" title="The maximum number of objects that can be queued before back pressure is applied."></div>
</div>
<div class="setting-field">
<input type="text" id="back-pressure-object-threshold" name="back-pressure-object-threshold" class="setting-input"/>
@@ -54,7 +54,7 @@
<div class="setting">
<div class="setting-name">
Back pressure data size threshold
- <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The maximum data size of objects that can be queued before back pressure is applied."/>
+ <div class="fa fa-question-circle" alt="Info" title="The maximum data size of objects that can be queued before back pressure is applied."></div>
</div>
<div class="setting-field">
<input type="text" id="back-pressure-data-size-threshold" name="back-pressure-data-size-threshold" class="setting-input"/>
@@ -66,7 +66,7 @@
<div class="setting">
<div class="setting-name">
Available prioritizers
- <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Available prioritizers that could reprioritize FlowFiles in this work queue."/>
+ <div class="fa fa-question-circle" alt="Info" title="Available prioritizers that could reprioritize FlowFiles in this work queue."></div>
</div>
<div class="setting-field">
<ul id="prioritizer-available"></ul>
@@ -75,7 +75,7 @@
<div class="setting">
<div class="setting-name">
Selected prioritizers
- <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Prioritizers that have been selected to reprioritize FlowFiles in this work queue."/>
+ <div class="fa fa-question-circle" alt="Info" title="Prioritizers that have been selected to reprioritize FlowFiles in this work queue."></div>
</div>
<div class="setting-field">
<ul id="prioritizer-selected"></ul>
@@ -176,5 +176,5 @@
</div>
</div>
</div>
- </div>
+ </div>
</div>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connections-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connections-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connections-dialog.jsp
index 196f77a..14d5088 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connections-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connections-dialog.jsp
@@ -15,7 +15,7 @@
limitations under the License.
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-<div id="connections-dialog">
+<div id="connections-dialog" layout="column" class="hidden large-dialog">
<div class="dialog-content">
<div class="setting">
<div class="setting-name">Selected component</div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
index 0cf7f1a..33a6298 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
@@ -15,9 +15,9 @@
limitations under the License.
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-<div id="controller-service-configuration" nf-draggable="{containment: 'parent', handle: '.dialog-header'}">
- <div class="controller-service-configuration-tab-container">
- <div id="controller-service-configuration-tabs"></div>
+<div id="controller-service-configuration" class="hidden large-dialog">
+ <div class="controller-service-configuration-tab-container dialog-content">
+ <div id="controller-service-configuration-tabs" class="tab-container"></div>
<div id="controller-service-configuration-tabs-content">
<div id="controller-service-standard-settings-tab-content" class="configuration-tab">
<div class="settings-left">
@@ -48,7 +48,7 @@
<div class="setting">
<div class="setting-name">
Referencing Components
- <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Other components referencing this controller service."/>
+ <div class="fa fa-question-circle" alt="Info" title="Other components referencing this controller service."></div>
</div>
<div class="setting-field">
<div id="controller-service-referencing-components"></div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp
index 0315064..dd1ac00 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp
@@ -15,7 +15,7 @@
limitations under the License.
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-<div id="disable-controller-service-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}">
+<div id="disable-controller-service-dialog" layout="column" class="hidden large-dialog">
<div class="dialog-content">
<div class="settings-left">
<div id="disable-controller-service-service-container" class="setting">
@@ -31,7 +31,7 @@
<div class="setting-name">Scope</div>
<div class="setting-field">
Service and referencing components
- <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Referencing components must be disabled/stopped in order to disable this service."/>
+ <div class="fa fa-question-circle" alt="Info" title="Referencing components must be disabled/stopped in order to disable this service."></div>
</div>
</div>
<div id="disable-controller-service-progress-container" class="setting hidden">
@@ -62,7 +62,7 @@
<div class="setting">
<div class="setting-name">
Referencing Components
- <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Other components referencing this controller service."/>
+ <div class="fa fa-question-circle" alt="Info" title="Other components referencing this controller service."></div>
</div>
<div class="setting-field">
<div id="disable-controller-service-referencing-components"></div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/drop-request-status-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/drop-request-status-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/drop-request-status-dialog.jsp
index 506ffac..9dd35ba 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/drop-request-status-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/drop-request-status-dialog.jsp
@@ -15,7 +15,7 @@
limitations under the License.
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-<div id="drop-request-status-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}">
+<div id="drop-request-status-dialog" layout="column" class="hidden large-dialog">
<div class="dialog-content">
<div class="setting">
<div class="setting-field">
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp
index 5f5a800..f5fc998 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp
@@ -15,7 +15,7 @@
limitations under the License.
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-<div id="enable-controller-service-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}">
+<div id="enable-controller-service-dialog" layout="column" class="hidden large-dialog">
<div class="dialog-content">
<div class="settings-left">
<div id="enable-controller-service-service-container" class="setting">
@@ -61,7 +61,7 @@
<div class="setting">
<div class="setting-name">
Referencing Components
- <img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Other components referencing this controller service."/>
+ <div class="fa fa-question-circle" alt="Info" title="Other components referencing this controller service."></div>
</div>
<div class="setting-field">
<div id="enable-controller-service-referencing-components"></div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp
index fedfd96..e6c7ae3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp
@@ -15,7 +15,7 @@
limitations under the License.
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
-<div id="fill-color-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}">
+<div id="fill-color-dialog" class="hidden small-dialog">
<div class="dialog-content">
<div class="setting">
<div class="setting-name">Color</div>