From 8b27ed905d076b7571736995ef0d2ca48132b156 Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Tue, 21 Jun 2016 00:40:16 -0400 Subject: [PATCH] [NIFI-1879] Responsive dialogs and dialog UX refresh. This closes #523 --- .../endpoints/GroupStatusEndpointMerger.java | 16 +- .../nifi/web/StandardNiFiServiceFacade.java | 46 +- .../nifi-web/nifi-web-ui/pom.xml | 12 +- .../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 +- .../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 +- .../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 +- .../canvas/component-state-dialog.jsp | 8 +- .../canvas/connection-configuration.jsp | 18 +- .../partials/canvas/connections-dialog.jsp | 2 +- .../controller-service-configuration.jsp | 8 +- .../disable-controller-service-dialog.jsp | 6 +- .../canvas/drop-request-status-dialog.jsp | 2 +- .../enable-controller-service-dialog.jsp | 4 +- .../partials/canvas/fill-color-dialog.jsp | 2 +- .../WEB-INF/partials/canvas/flow-status.jsp | 20 +- .../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 | 47 +- .../partials/canvas/new-port-dialog.jsp | 2 +- .../canvas/new-process-group-dialog.jsp | 2 +- .../partials/canvas/new-processor-dialog.jsp | 49 +- .../new-remote-process-group-dialog.jsp | 54 +- .../canvas/new-reporting-task-dialog.jsp | 48 +- .../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 +- .../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 +- .../history/action-details-dialog.jsp | 2 +- .../partials/history/history-content.jsp | 26 +- .../history/history-filter-dialog.jsp | 10 +- .../partials/history/history-purge-dialog.jsp | 6 +- .../webapp/WEB-INF/partials/ok-dialog.jsp | 2 +- .../WEB-INF/partials/processor-details.jsp | 23 +- .../provenance/lineage-query-dialog.jsp | 2 +- .../provenance/provenance-content.jsp | 44 +- .../provenance-event-details-dialog.jsp | 6 +- .../provenance/provenance-query-dialog.jsp | 2 +- .../provenance/provenance-search-dialog.jsp | 14 +- .../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 +- ...er-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 +- .../src/main/webapp/css/cluster.css | 67 +- .../src/main/webapp/css/component-state.css | 49 +- .../webapp/css/connection-configuration.css | 84 +- .../main/webapp/css/connection-details.css | 29 - .../main/webapp/css/controller-service.css | 85 +- .../src/main/webapp/css/counters.css | 86 +- .../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 + .../src/main/webapp/css/header.css | 8 + .../src/main/webapp/css/history.css | 123 +- .../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 +- .../main/webapp/css/port-configuration.css | 9 +- .../css/process-group-configuration.css | 29 +- .../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 +- .../remote-process-group-configuration.css | 92 +- .../src/main/webapp/css/reporting-task.css | 43 +- .../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 +- .../src/main/webapp/css/summary.css | 333 +---- .../src/main/webapp/css/templates.css | 104 +- .../main/webapp/fonts/flowfont/flowfont.css | 54 +- .../main/webapp/fonts/flowfont/flowfont.eot | Bin 16668 -> 25120 bytes .../main/webapp/fonts/flowfont/flowfont.svg | 60 +- .../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 .../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 +- .../webapp/js/jquery/combo/jquery.combo.js | 73 +- .../webapp/js/jquery/modal/jquery.modal.css | 118 +- .../webapp/js/jquery/modal/jquery.modal.js | 367 ++++-- .../propertytable/jquery.propertytable.css | 92 +- .../propertytable/jquery.propertytable.js | 424 ++++--- .../js/jquery/qtip2/jquery.qtip.min.css | 5 +- .../webapp/js/jquery/qtip2/jquery.qtip.min.js | 8 +- .../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 +++---- .../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 +- .../components/nf-ng-funnel-component.js | 10 + .../components/nf-ng-group-component.js | 53 +- .../components/nf-ng-input-port-component.js | 47 +- .../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 +- .../main/webapp/js/nf/canvas/nf-actions.js | 282 +++-- .../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 +- .../nf/canvas/nf-connection-configuration.js | 210 ++-- .../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-port-configuration.js | 147 +-- .../webapp/js/nf/canvas/nf-port-details.js | 22 +- .../canvas/nf-process-group-configuration.js | 22 +- .../js/nf/canvas/nf-process-group-details.js | 22 +- .../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 +- .../canvas/nf-remote-process-group-ports.js | 73 +- .../webapp/js/nf/canvas/nf-reporting-task.js | 229 ++-- .../main/webapp/js/nf/canvas/nf-settings.js | 120 +- .../webapp/js/nf/cluster/nf-cluster-table.js | 103 +- .../main/webapp/js/nf/cluster/nf-cluster.js | 9 +- .../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 | 269 ++-- .../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 +- .../webapp/js/nf/nf-connection-details.js | 71 +- .../src/main/webapp/js/nf/nf-dialog.js | 53 +- ...nvas-app-config.js => nf-ng-app-config.js} | 2 +- ...-controller.js => nf-ng-app-controller.js} | 4 +- .../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 +- .../main/webapp/js/nf/nf-status-history.js | 421 ++++--- .../js/nf/provenance/nf-provenance-lineage.js | 1101 +++++++++-------- .../js/nf/provenance/nf-provenance-table.js | 353 +++--- .../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 | 822 ++++++++---- .../main/webapp/js/nf/summary/nf-summary.js | 63 +- .../js/nf/templates/nf-templates-table.js | 15 +- .../webapp/js/nf/templates/nf-templates.js | 24 +- 193 files changed, 6305 insertions(+), 6094 deletions(-) create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi-logo-about.svg delete mode 100755 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/images/nifi_about.png mode change 100644 => 100755 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.css create mode 100755 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/qtip2/jquery.qtip.min.map rename nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/{canvas/nf-ng-canvas-app-config.js => nf-ng-app-config.js} (97%) rename nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/{canvas/controllers/nf-ng-canvas-app-controller.js => nf-ng-app-controller.js} (93%) 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 b7690424e9..9440760ebd 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 { 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 nodeAuthorizationIssues = remoteProcessGroupStatus.getAuthorizationIssues(); - if (!nodeAuthorizationIssues.isEmpty()) { + if (nodeAuthorizationIssues != null && !nodeAuthorizationIssues.isEmpty()) { for (final ListIterator iter = nodeAuthorizationIssues.listIterator(); iter.hasNext();) { final String Issue = iter.next(); iter.set("[" + nodeId.getApiAddress() + ":" + nodeId.getApiPort() + "] -- " + Issue); 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 21ea757d1e..a1e88cab45 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 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 cf3edcce4c..1b65f0b7b9 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 @@ ${staging.dir}/js/nf/nf-status-history.js ${staging.dir}/js/nf/canvas/nf-canvas.js ${staging.dir}/js/nf/canvas/nf-clipboard.js - ${staging.dir}/js/nf/canvas/nf-ng-canvas-app-config.js - ${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-app-controller.js + ${staging.dir}/js/nf/nf-ng-app-config.js + ${staging.dir}/js/nf/nf-ng-app-controller.js ${staging.dir}/js/nf/canvas/controllers/nf-ng-breadcrumbs-controller.js ${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-header-controller.js ${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js @@ -441,6 +441,10 @@ ${staging.dir}/js/nf/nf-processor-details.js ${staging.dir}/js/nf/nf-connection-details.js ${staging.dir}/js/nf/nf-status-history.js + ${staging.dir}/js/nf/nf-ng-bridge.js + ${staging.dir}/js/nf/nf-ng-service-provider.js + ${staging.dir}/js/nf/nf-ng-app-config.js + ${staging.dir}/js/nf/nf-ng-app-controller.js ${staging.dir}/js/nf/summary/nf-summary.js ${staging.dir}/js/nf/summary/nf-summary-table.js ${staging.dir}/js/nf/summary/nf-cluster-search.js @@ -498,6 +502,10 @@ ${staging.dir}/js/nf/nf-dialog.js ${staging.dir}/js/nf/nf-storage.js ${staging.dir}/js/nf/nf-ajax-setup.js + ${staging.dir}/js/nf/nf-ng-bridge.js + ${staging.dir}/js/nf/nf-ng-service-provider.js + ${staging.dir}/js/nf/nf-ng-app-config.js + ${staging.dir}/js/nf/nf-ng-app-controller.js ${staging.dir}/js/nf/bulletin-board/nf-bulletin-board.js 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 7fe85846b7..a4afc922e4 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=\n\ \n\ \n\ +\n\ +\n\ +\n\ +\n\ nf.bulletin.board.style.tags=\n\ \n\ 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 fc1f2c92b1..f3d3941ff5 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=\n\ \n\ \n\ -\n\ - +\n\ + nf.canvas.style.tags= \ No newline at end of file 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 e130655fd7..33e1a5a630 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=\n\ \n\ \n\ - +\n\ +\n\ +\n\ +\n\ + nf.summary.style.tags=\n\ \n\ \n\ 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 3eaa2258e4..cc78c90843 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 @@ + + + @@ -36,16 +39,23 @@ + + + + + + + + + ${nf.bulletin.board.script.tags} - + -
-
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 dac5032c90..77ee3f327e 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 @@ -
-
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 acf2e55629..baa4c6a82b 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 @@ + + + @@ -57,7 +60,5 @@ -
-
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 e3113f9534..b8dee0a12a 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 @@ + + + @@ -56,7 +59,5 @@ -
-
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 ac28bb7662..88f28fa29f 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 @@ + + + @@ -60,7 +63,5 @@ -
-
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 06a7e91eb3..2e2c713cbb 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 @@ + + + @@ -55,7 +58,5 @@ -
-
\ No newline at end of file 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 eebe3e409c..9c15371489 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 @@ + + + @@ -64,7 +67,5 @@ -
-
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 68ca6ab8ec..01ba6b4ed7 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 @@ + + + @@ -58,12 +61,21 @@ + + + + + + + + + ${nf.summary.script.tags} - + @@ -79,7 +91,5 @@ -
-
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 452064d6cd..91409e7da2 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 @@ + + + @@ -58,7 +61,5 @@ -
-
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 a266d1347c..cdfe10239e 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 @@
NiFi Templates
-
-
- -
+
+
+ +
-
-
-
- Last updated:  -
-
-
-
-
Clear
-
-
+
+
+ + Auto-refresh + + +
+ Last updated:  +
+
+
+
+ Clear +
\ No newline at end of file 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 ce43f84389..9024f35b98 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" %>
-
-
- -

- 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. -

+
+
+
+
+
+ +

+ 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. +

+
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 bc2676c942..0f3a434a48 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);"> - +
+ +
+ +
+ -
+ + +
+ +
+ +
+ +
+
@@ -77,71 +85,84 @@
- Summary + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.summary.shell.launch();"> + Summary + Counters + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.counters.shell.launch();"> + Counters + Bulletin Board + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.bulletinBoard.shell.launch();"> + Bulletin Board + Data Provenance + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.dataProvenance.shell.launch();"> + Data Provenance + Controller Settings + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.controllerSettings.shell.launch();"> + Controller Settings + Cluster + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.cluster.shell.launch();"> + Cluster + Flow Configuration History + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.flowConfigHistory.shell.launch();"> + Flow Configuration History + Users + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.users.shell.launch();;"> + Users + + Templates + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.templates.shell.launch();"> + Templates + Help + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.help.shell.launch();"> + Help + About + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.about.modal.show();"> + About + 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 fa16eb1ae0..3c7c3fba39 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" %> -
+