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

[NIFI-1879] Responsive dialogs and dialog UX refresh. This closes #523

This commit is contained in:
Scott Aslan 2016-06-21 00:40:16 -04:00 committed by Matt Gilman
parent 6f3abdbcbd
commit 8b27ed905d
193 changed files with 6305 additions and 6094 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-framework-cluster/src/main/java/org/apache/nifi/cluster/coordination/http/endpoints/GroupStatusEndpointMerger.java
View File

@ -17,13 +17,6 @@
package org.apache.nifi.cluster.coordination.http.endpoints; 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.manager.StatusMerger;
import org.apache.nifi.cluster.protocol.NodeIdentifier; import org.apache.nifi.cluster.protocol.NodeIdentifier;
import org.apache.nifi.web.api.dto.status.NodeProcessGroupStatusSnapshotDTO; 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.dto.status.RemoteProcessGroupStatusSnapshotDTO;
import org.apache.nifi.web.api.entity.ProcessGroupStatusEntity; 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 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"); 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(); final ProcessGroupStatusSnapshotDTO nodeSnapshot = nodeProcessGroupStatus.getAggregateSnapshot();
for (final RemoteProcessGroupStatusSnapshotDTO remoteProcessGroupStatus : nodeSnapshot.getRemoteProcessGroupStatusSnapshots()) { for (final RemoteProcessGroupStatusSnapshotDTO remoteProcessGroupStatus : nodeSnapshot.getRemoteProcessGroupStatusSnapshots()) {
final List<String> nodeAuthorizationIssues = remoteProcessGroupStatus.getAuthorizationIssues(); final List<String> nodeAuthorizationIssues = remoteProcessGroupStatus.getAuthorizationIssues();
if (!nodeAuthorizationIssues.isEmpty()) { if (nodeAuthorizationIssues != null && !nodeAuthorizationIssues.isEmpty()) {
for (final ListIterator<String> iter = nodeAuthorizationIssues.listIterator(); iter.hasNext();) { for (final ListIterator<String> iter = nodeAuthorizationIssues.listIterator(); iter.hasNext();) {
final String Issue = iter.next(); final String Issue = iter.next();
iter.set("[" + nodeId.getApiAddress() + ":" + nodeId.getApiPort() + "] -- " + Issue); iter.set("[" + nodeId.getApiAddress() + ":" + nodeId.getApiPort() + "] -- " + Issue);

46
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/StandardNiFiServiceFacade.java
View File

@ -16,28 +16,7 @@
*/ */
package org.apache.nifi.web; package org.apache.nifi.web;
import java.io.IOException; import com.google.common.collect.Sets;
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 org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.nifi.action.Action; import org.apache.nifi.action.Action;
import org.apache.nifi.action.Component; import org.apache.nifi.action.Component;
@ -193,7 +172,26 @@ import org.apache.nifi.web.util.SnippetUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; 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. * Implementation of NiFiServiceFacade that performs revision checking.
@ -2527,7 +2525,7 @@ public class StandardNiFiServiceFacade implements NiFiServiceFacade {
@Override @Override
public PortStatusDTO getOutputPortStatus(final String outputPortId) { 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 @Override

12
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml
View File

@ -374,8 +374,8 @@
<include>${staging.dir}/js/nf/nf-status-history.js</include> <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-canvas.js</include>
<include>${staging.dir}/js/nf/canvas/nf-clipboard.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/nf-ng-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-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-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-header-controller.js</include>
<include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-toolbox-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-processor-details.js</include>
<include>${staging.dir}/js/nf/nf-connection-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-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.js</include>
<include>${staging.dir}/js/nf/summary/nf-summary-table.js</include> <include>${staging.dir}/js/nf/summary/nf-summary-table.js</include>
<include>${staging.dir}/js/nf/summary/nf-cluster-search.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-dialog.js</include>
<include>${staging.dir}/js/nf/nf-storage.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-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> <include>${staging.dir}/js/nf/bulletin-board/nf-bulletin-board.js</include>
</includes> </includes>
</aggregation> </aggregation>

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties
View File

@ -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-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-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-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> <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\ 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\ <link rel="stylesheet" href="css/main.css?${project.version}" type="text/css" />\n\

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties
View File

@ -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/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-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/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/nf-ng-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-config.js?${project.version}"></script>
nf.canvas.style.tags=<link rel="stylesheet" href="css/canvas.css?${project.version}" type="text/css" /> nf.canvas.style.tags=<link rel="stylesheet" href="css/canvas.css?${project.version}" type="text/css" />

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties
View File

@ -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/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.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-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\ 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/main.css?${project.version}" type="text/css" />\n\
<link rel="stylesheet" href="css/banner.css?${project.version}" type="text/css" />\n\ <link rel="stylesheet" href="css/banner.css?${project.version}" type="text/css" />\n\

16
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/bulletin-board.jsp
View File

@ -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/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/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="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-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.base64.js"></script>
<script type="text/javascript" src="js/jquery/jquery.center.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/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/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="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-namespace.js?${project.version}"></script>
<script type="text/javascript" src="js/nf/nf-ng-namespace.js?${project.version}"></script>
${nf.bulletin.board.script.tags} ${nf.bulletin.board.script.tags}
</head> </head>
<body> <body ng-controller="ngBulletinBoardAppCtrl">
<jsp:include page="/WEB-INF/partials/message-pane.jsp"/> <jsp:include page="/WEB-INF/partials/message-pane.jsp"/>
<jsp:include page="/WEB-INF/partials/banners-utility.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/ok-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/yes-no-dialog.jsp"/> <jsp:include page="/WEB-INF/partials/yes-no-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp"/> <jsp:include page="/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp"/>
<div id="faded-background"></div>
<div id="glass-pane"></div>
</body> </body>
</html> </html>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp
View File

@ -136,8 +136,6 @@
<jsp:include page="/WEB-INF/partials/canvas/queue-listing.jsp"/> <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/canvas/component-state-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/connection-details.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> <div id="context-menu" class="unselectable"></div>
<span id="nifi-content-viewer-url" class="hidden"></span> <span id="nifi-content-viewer-url" class="hidden"></span>
</body> </body>

5
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/cluster.jsp
View File

@ -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/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.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.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-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.base64.js"></script>
<script type="text/javascript" src="js/jquery/jquery.center.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/yes-no-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/cluster/cluster-content.jsp"/> <jsp:include page="/WEB-INF/partials/cluster/cluster-content.jsp"/>
<jsp:include page="/WEB-INF/partials/cluster/node-details-dialog.jsp"/> <jsp:include page="/WEB-INF/partials/cluster/node-details-dialog.jsp"/>
<div id="faded-background"></div>
<div id="glass-pane"></div>
</body> </body>
</html> </html>

5
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/counters.jsp
View File

@ -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/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.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.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-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.base64.js"></script>
<script type="text/javascript" src="js/jquery/jquery.center.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/banners-utility.jsp"/>
<jsp:include page="/WEB-INF/partials/ok-dialog.jsp"/> <jsp:include page="/WEB-INF/partials/ok-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/counters/counters-content.jsp"/> <jsp:include page="/WEB-INF/partials/counters/counters-content.jsp"/>
<div id="faded-background"></div>
<div id="glass-pane"></div>
</body> </body>
</html> </html>

5
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/history.jsp
View File

@ -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/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.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.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-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.base64.js"></script>
<script type="text/javascript" src="js/jquery/jquery.center.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/action-details-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/history/history-filter-dialog.jsp"/> <jsp:include page="/WEB-INF/partials/history/history-filter-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/history/history-purge-dialog.jsp"/> <jsp:include page="/WEB-INF/partials/history/history-purge-dialog.jsp"/>
<div id="faded-background"></div>
<div id="glass-pane"></div>
</body> </body>
</html> </html>

5
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/login.jsp
View File

@ -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/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/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="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-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.base64.js"></script>
<script type="text/javascript" src="js/jquery/jquery.count.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"/> <jsp:include page="/WEB-INF/partials/login/login-progress.jsp"/>
</div> </div>
<jsp:include page="/WEB-INF/partials/ok-dialog.jsp"/> <jsp:include page="/WEB-INF/partials/ok-dialog.jsp"/>
<div id="faded-background"></div>
<div id="glass-pane"></div>
</body> </body>
</html> </html>

5
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/provenance.jsp
View File

@ -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/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.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.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/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-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.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-search-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/provenance/provenance-query-dialog.jsp"/> <jsp:include page="/WEB-INF/partials/provenance/provenance-query-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/provenance/lineage-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> </body>
</html> </html>

16
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/summary.jsp
View File

@ -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/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.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.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/codemirror/lib/codemirror-compressed.js"></script>
<script type="text/javascript" src="js/d3/d3.min.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> <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.dataview.js"></script>
<script type="text/javascript" src="js/jquery/slickgrid/slick.core.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="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-namespace.js?${project.version}"></script>
<script type="text/javascript" src="js/nf/nf-ng-namespace.js?${project.version}"></script>
${nf.summary.script.tags} ${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/languages/nfel.js?${project.version}"></script>
<script type="text/javascript" src="js/jquery/nfeditor/jquery.nfeditor.js?${project.version}"></script> <script type="text/javascript" src="js/jquery/nfeditor/jquery.nfeditor.js?${project.version}"></script>
</head> </head>
<body> <body ng-controller="ngSummaryAppCtrl">
<jsp:include page="/WEB-INF/partials/message-pane.jsp"/> <jsp:include page="/WEB-INF/partials/message-pane.jsp"/>
<jsp:include page="/WEB-INF/partials/banners-utility.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/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/cluster-process-group-summary-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/summary/system-diagnostics-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"/> <jsp:include page="/WEB-INF/partials/summary/view-single-node-dialog.jsp"/>
<div id="faded-background"></div>
<div id="glass-pane"></div>
</body> </body>
</html> </html>

5
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/templates.jsp
View File

@ -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/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.grid.css" type="text/css" />
<link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.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-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.base64.js"></script>
<script type="text/javascript" src="js/jquery/jquery.center.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/ok-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/yes-no-dialog.jsp"/> <jsp:include page="/WEB-INF/partials/yes-no-dialog.jsp"/>
<jsp:include page="/WEB-INF/partials/templates/templates-content.jsp"/> <jsp:include page="/WEB-INF/partials/templates/templates-content.jsp"/>
<div id="faded-background"></div>
<div id="glass-pane"></div>
</body> </body>
</html> </html>

33
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
View File

@ -18,23 +18,26 @@
<div id="bulletin-board"> <div id="bulletin-board">
<div id="bulletin-board-header-and-filter"> <div id="bulletin-board-header-and-filter">
<div id="bulletin-board-header-text">NiFi Templates</div> <div id="bulletin-board-header-text">NiFi Templates</div>
<div id="bulletin-board-filter-controls"> <div id="bulletin-board-filter-controls" class="filter-controls">
<div id="bulletin-board-filter-container"> <div id="bulletin-board-filter-container" class="filter-container">
<input type="text" id="bulletin-board-filter"/> <input type="text" placeholder="Filter" id="bulletin-board-filter" class="filter"/>
<div id="bulletin-board-filter-type"></div> <div id="bulletin-board-filter-type" class="filter-type"></div>
</div> </div>
</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:&nbsp;<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 id="bulletin-board-container"></div>
</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:&nbsp;<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>

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/about-dialog.jsp
View File

@ -16,7 +16,10 @@
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="nf-about"> <div id="nf-about">
<div id="nf-about-pic-container">
<div id="nf-about-pic"></div> <div id="nf-about-pic"></div>
</div>
<div class="dialog-content">
<div id="nf-about-content"> <div id="nf-about-content">
<span id="nf-version"></span> <span id="nf-version"></span>
<p> <p>
@ -27,3 +30,4 @@
</p> </p>
</div> </div>
</div> </div>
</div>

87
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp
View File

@ -23,42 +23,50 @@
id="processor-component" class="component-button" id="processor-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();" ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.processorComponent);"> 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}}" <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.inputPort}}"
id="port-in-component" class="component-button" id="port-in-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();" ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.inputPortComponent);"> 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}}" <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.outputPort}}"
id="port-out-component" class="component-button" id="port-out-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();" ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.outputPortComponent);"> 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}}" <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.processGroup}}"
id="group-component" class="component-button" id="group-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();" ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.groupComponent);"> nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.groupComponent);">
<i class="icon icon-group"></i></button> <div class="icon icon-group"></div>
<button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.remoteProcessGroup}}" hide </button>
show-gt-sm id="group-remote-component" class="component-button" <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.remoteProcessGroup}}"
id="group-remote-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();" ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.remoteGroupComponent);"> 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}}" <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.funnel}}"
id="funnel-component" class="component-button" id="funnel-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();" ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.funnelComponent);"> 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}}" <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.template}}"
id="template-component" class="component-button" id="template-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();" ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.templateComponent);"> 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}}" <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.label}}"
id="label-component" class="component-button" id="label-component" class="component-button"
ng-disabled="!appCtrl.nf.Canvas.canWrite();" ng-disabled="!appCtrl.nf.Canvas.canWrite();"
nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.labelComponent);"> 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>
<div layout="row" layout-align="space-between center"> <div layout="row" layout-align="space-between center">
<div layout-align="space-between end" layout="column"> <div layout-align="space-between end" layout="column">
@ -77,71 +85,84 @@
</div> </div>
</div> </div>
<md-menu md-position-mode="target-right target" md-offset="-1 44"> <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> </button>
<md-menu-content id="global-menu-content"> <md-menu-content id="global-menu-content">
<md-menu-item layout-align="space-around center"> <md-menu-item layout-align="space-around center">
<a id="reporting-link" <a id="reporting-link"
ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.summary.shell.launch();"><i ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.summary.shell.launch();">
class="fa fa-table"></i>Summary</a> <i class="fa fa-table"></i>Summary
</a>
</md-menu-item> </md-menu-item>
<md-menu-item layout-align="space-around center"> <md-menu-item layout-align="space-around center">
<a id="counters-link" <a id="counters-link"
ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.counters.shell.launch();"><i ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.counters.shell.launch();">
class="icon icon-counter"></i>Counters</a> <i class="icon icon-counter"></i>Counters
</a>
</md-menu-item> </md-menu-item>
<md-menu-item layout-align="space-around center"> <md-menu-item layout-align="space-around center">
<a id="bulletin-board-link" <a id="bulletin-board-link"
ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.bulletinBoard.shell.launch();"><i ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.bulletinBoard.shell.launch();">
class="fa fa-sticky-note-o"></i>Bulletin Board</a> <i class="fa fa-sticky-note-o"></i>Bulletin Board
</a>
</md-menu-item> </md-menu-item>
<md-menu-divider></md-menu-divider> <md-menu-divider></md-menu-divider>
<md-menu-item <md-menu-item
ng-if="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.dataProvenance.enabled();" ng-if="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.dataProvenance.enabled();"
layout-align="space-around center"> layout-align="space-around center">
<a id="provenance-link" <a id="provenance-link"
ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.dataProvenance.shell.launch();"><i ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.dataProvenance.shell.launch();">
class="icon icon-provenance"></i>Data Provenance</a> <i class="icon icon-provenance"></i>Data Provenance
</a>
</md-menu-item> </md-menu-item>
<md-menu-divider></md-menu-divider> <md-menu-divider></md-menu-divider>
<md-menu-item layout-align="space-around center"> <md-menu-item layout-align="space-around center">
<a id="flow-settings-link" <a id="flow-settings-link"
ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.controllerSettings.shell.launch();"><i ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.controllerSettings.shell.launch();">
class="fa fa-wrench"></i>Controller Settings</a> <i class="fa fa-wrench"></i>Controller Settings
</a>
</md-menu-item> </md-menu-item>
<md-menu-item ng-if="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.cluster.enabled();" <md-menu-item ng-if="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.cluster.enabled();"
layout-align="space-around center"> layout-align="space-around center">
<a id="cluster-link" <a id="cluster-link"
ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.cluster.shell.launch();"><i ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.cluster.shell.launch();">
class="fa fa-cubes"></i>Cluster</a> <i class="fa fa-cubes"></i>Cluster
</a>
</md-menu-item> </md-menu-item>
<md-menu-item layout-align="space-around center"> <md-menu-item layout-align="space-around center">
<a id="history-link" <a id="history-link"
ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.flowConfigHistory.shell.launch();"><i ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.flowConfigHistory.shell.launch();">
class="fa fa-history"></i>Flow Configuration History</a> <i class="fa fa-history"></i>Flow Configuration History
</a>
</md-menu-item> </md-menu-item>
<md-menu-item ng-if="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.users.enabled();" <md-menu-item ng-if="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.users.enabled();"
layout-align="space-around center"> layout-align="space-around center">
<a id="users-link" layout="row" <a id="users-link" layout="row"
ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.users.shell.launch();;"><i ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.users.shell.launch();;">
class="fa fa-users"></i>Users<div id="has-pending-accounts" class="hidden"></div></a> <i class="fa fa-users"></i>Users
<div id="has-pending-accounts" class="hidden"></div>
</a>
</md-menu-item> </md-menu-item>
<md-menu-divider></md-menu-divider> <md-menu-divider></md-menu-divider>
<md-menu-item layout-align="space-around center"> <md-menu-item layout-align="space-around center">
<a id="templates-link" <a id="templates-link"
ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.templates.shell.launch();"><i ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.templates.shell.launch();">
class="icon icon-template"></i>Templates</a> <i class="icon icon-template"></i>Templates
</a>
</md-menu-item> </md-menu-item>
<md-menu-divider></md-menu-divider> <md-menu-divider></md-menu-divider>
<md-menu-item layout-align="space-around center"> <md-menu-item layout-align="space-around center">
<a id="help-link" <a id="help-link"
ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.help.shell.launch();"><i ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.help.shell.launch();">
class="fa fa-question-circle"></i>Help</a> <i class="fa fa-question-circle"></i>Help
</a>
</md-menu-item> </md-menu-item>
<md-menu-item layout-align="space-around center"> <md-menu-item layout-align="space-around center">
<a id="about-link" <a id="about-link"
ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.about.modal.show();"><i ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.about.modal.show();">
class="fa fa-info-circle"></i>About</a> <i class="fa fa-info-circle"></i>About
</a>
</md-menu-item> </md-menu-item>
</md-menu-content> </md-menu-content>
</md-menu> </md-menu>

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ 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="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Name</div> <div class="setting-name">Name</div>
@ -34,12 +34,12 @@
Showing partial results Showing partial results
</div> </div>
<div id="component-state-filter-controls"> <div id="component-state-filter-controls">
<div id="component-state-filter-status" class="filter-status">
Displaying&nbsp;<span id="displayed-component-state-entries"></span>&nbsp;of&nbsp;<span id="total-component-state-entries"></span>
</div>
<div id="component-state-filter-container"> <div id="component-state-filter-container">
<input type="text" id="component-state-filter"/> <input type="text" id="component-state-filter"/>
</div> </div>
<div id="component-state-filter-status">
Displaying&nbsp;<span id="displayed-component-state-entries"></span>&nbsp;of&nbsp;<span id="total-component-state-entries"></span>
</div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>

16
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp
View File

@ -15,9 +15,9 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="connection-configuration" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="connection-configuration" layout="column" class="hidden large-dialog">
<div class="connection-configuration-tab-container"> <div class="connection-configuration-tab-container dialog-content">
<div id="connection-configuration-tabs"></div> <div id="connection-configuration-tabs" class="tab-container"></div>
<div id="connection-configuration-tabs-content"> <div id="connection-configuration-tabs-content">
<div id="connection-settings-tab-content" class="configuration-tab"> <div id="connection-settings-tab-content" class="configuration-tab">
<div class="settings-left"> <div class="settings-left">
@ -36,7 +36,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
FlowFile expiration 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>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="flow-file-expiration" name="flow-file-expiration" class="setting-input"/> <input type="text" id="flow-file-expiration" name="flow-file-expiration" class="setting-input"/>
@ -45,7 +45,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Back pressure object threshold 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>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="back-pressure-object-threshold" name="back-pressure-object-threshold" class="setting-input"/> <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">
<div class="setting-name"> <div class="setting-name">
Back pressure data size threshold 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>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="back-pressure-data-size-threshold" name="back-pressure-data-size-threshold" class="setting-input"/> <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">
<div class="setting-name"> <div class="setting-name">
Available prioritizers 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>
<div class="setting-field"> <div class="setting-field">
<ul id="prioritizer-available"></ul> <ul id="prioritizer-available"></ul>
@ -75,7 +75,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Selected prioritizers 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>
<div class="setting-field"> <div class="setting-field">
<ul id="prioritizer-selected"></ul> <ul id="prioritizer-selected"></ul>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connections-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ 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="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Selected component</div> <div class="setting-name">Selected component</div>

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp
View File

@ -15,9 +15,9 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="controller-service-configuration" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="controller-service-configuration" class="hidden large-dialog">
<div class="controller-service-configuration-tab-container"> <div class="controller-service-configuration-tab-container dialog-content">
<div id="controller-service-configuration-tabs"></div> <div id="controller-service-configuration-tabs" class="tab-container"></div>
<div id="controller-service-configuration-tabs-content"> <div id="controller-service-configuration-tabs-content">
<div id="controller-service-standard-settings-tab-content" class="configuration-tab"> <div id="controller-service-standard-settings-tab-content" class="configuration-tab">
<div class="settings-left"> <div class="settings-left">
@ -48,7 +48,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Referencing Components 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>
<div class="setting-field"> <div class="setting-field">
<div id="controller-service-referencing-components"></div> <div id="controller-service-referencing-components"></div>

6
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
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ 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="dialog-content">
<div class="settings-left"> <div class="settings-left">
<div id="disable-controller-service-service-container" class="setting"> <div id="disable-controller-service-service-container" class="setting">
@ -31,7 +31,7 @@
<div class="setting-name">Scope</div> <div class="setting-name">Scope</div>
<div class="setting-field"> <div class="setting-field">
Service and referencing components 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> </div>
<div id="disable-controller-service-progress-container" class="setting hidden"> <div id="disable-controller-service-progress-container" class="setting hidden">
@ -62,7 +62,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Referencing Components 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>
<div class="setting-field"> <div class="setting-field">
<div id="disable-controller-service-referencing-components"></div> <div id="disable-controller-service-referencing-components"></div>

2
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
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ 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="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-field"> <div class="setting-field">

4
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
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ 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="dialog-content">
<div class="settings-left"> <div class="settings-left">
<div id="enable-controller-service-service-container" class="setting"> <div id="enable-controller-service-service-container" class="setting">
@ -61,7 +61,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Referencing Components 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>
<div class="setting-field"> <div class="setting-field">
<div id="enable-controller-service-referencing-components"></div> <div id="enable-controller-service-referencing-components"></div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ 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="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Color</div> <div class="setting-name">Color</div>

20
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp
View File

@ -17,16 +17,16 @@
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="flow-status" flex layout="row" layout-align="space-between center"> <div id="flow-status" flex layout="row" layout-align="space-between center">
<div id="flow-status-container" layout="row" layout-align="space-around center"> <div id="flow-status-container" layout="row" layout-align="space-around center">
<i class="fa fa-cubes" ng-if="appCtrl.nf.Canvas.isClustered()"><span id="connected-nodes-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.connectedNodesCount}}</span></i> <div class="fa fa-cubes" ng-if="appCtrl.nf.Canvas.isClustered()"><span id="connected-nodes-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.connectedNodesCount}}</span></div>
<i class="icon icon-threads"><span id="active-thread-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.activeThreadCount}}</span></i> <div class="icon icon-threads"><span id="active-thread-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.activeThreadCount}}</span></div>
<i class="fa fa-list"><span id="total-queued">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.totalQueued}}</span></i> <div class="fa fa-list"><span id="total-queued">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.totalQueued}}</span></div>
<i class="fa fa-bullseye"><span id="controller-transmitting-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerTransmittingCount}}</span></i> <div class="fa fa-bullseye"><span id="controller-transmitting-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerTransmittingCount}}</span></div>
<i class="icon icon-transmit-false"><span id="controller-not-transmitting-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerNotTransmittingCount}}</span></i> <div class="icon icon-transmit-false"><span id="controller-not-transmitting-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerNotTransmittingCount}}</span></div>
<i class="fa fa-play"><span id="controller-running-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerRunningCount}}</span></i> <div class="fa fa-play"><span id="controller-running-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerRunningCount}}</span></div>
<i class="fa fa-stop"><span id="controller-stopped-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerStoppedCount}}</span></i> <div class="fa fa-stop"><span id="controller-stopped-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerStoppedCount}}</span></div>
<i class="fa fa-warning"><span id="controller-invalid-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerInvalidCount}}</span></i> <div class="fa fa-warning"><span id="controller-invalid-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerInvalidCount}}</span></div>
<i class="icon icon-enable-false"><span id="controller-disabled-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerDisabledCount}}</span></i> <div class="icon icon-enable-false"><span id="controller-disabled-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerDisabledCount}}</span></div>
<i class="fa fa-refresh"><span id="stats-last-refreshed">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.statsLastRefreshed}}</span></i> <div class="fa fa-refresh"><span id="stats-last-refreshed">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.statsLastRefreshed}}</span></div>
<div id="canvas-loading-container" class="loading-container"></div> <div id="canvas-loading-container" class="loading-container"></div>
</div> </div>
<div layout="row" layout-align="end center"> <div layout="row" layout-align="end center">

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flowfile-details-dialog.jsp
View File

@ -15,9 +15,9 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="flowfile-details-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="flowfile-details-dialog" layout="column" class="hidden large-dialog">
<div id="flowfile-details-dialog-content"> <div id="flowfile-details-dialog-content" class="dialog-content">
<div id="flowfile-details-tabs"></div> <div id="flowfile-details-tabs" class="tab-container"></div>
<div id="flowfile-details-tabs-content"> <div id="flowfile-details-tabs-content">
<div id="flowfile-details-tab-content" class="details-tab"> <div id="flowfile-details-tab-content" class="details-tab">
<span id="flowfile-uri" class="hidden"></span> <span id="flowfile-uri" class="hidden"></span>

5
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/instantiate-template-dialog.jsp
View File

@ -15,8 +15,11 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="instantiate-template-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="instantiate-template-dialog" class="hidden small-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting">
<div class="setting-name">Choose Template:</div>
<div id="available-templates" name="available-templates"></div> <div id="available-templates" name="available-templates"></div>
</div> </div>
</div> </div>
</div>

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp
View File

@ -15,8 +15,8 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="label-configuration" nf-draggable="{ containment: 'parent', cancel: 'textarea, .button, .combo'}"> <div id="label-configuration" class="hidden medium-dialog">
<div id="label-configuration-contents"> <div id="label-configuration-contents" class="dialog-content">
<div class="setting" style="margin-top: 5px;"> <div class="setting" style="margin-top: 5px;">
<div class="setting-name">Label Value</div> <div class="setting-name">Label Value</div>
<div class="setting-field"> <div class="setting-field">

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/listing-request-status-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="listing-request-status-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="listing-request-status-dialog" layout="column" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-field"> <div class="setting-field">

42
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp
View File

@ -25,16 +25,16 @@
<div id="navigation-control" class="graph-control"> <div id="navigation-control" class="graph-control">
<div class="graph-control-docked pointer" title="Navigate" <div class="graph-control-docked pointer" title="Navigate"
ng-click="appCtrl.serviceProvider.graphControlsCtrl.undock($event)"> ng-click="appCtrl.serviceProvider.graphControlsCtrl.undock($event)">
<i class="graph-control-icon fa fa-compass"></i> <div class="graph-control-icon fa fa-compass"></div>
</div> </div>
<div class="graph-control-header-container hidden"> <div class="graph-control-header-container hidden">
<div class="graph-control-header-icon"> <div class="graph-control-header-icon">
<i class="graph-control-icon fa fa-compass"></i> <div class="graph-control-icon fa fa-compass"></div>
</div> </div>
<div class="graph-control-header">Navigate</div> <div class="graph-control-header">Navigate</div>
<div class="graph-control-header-action" <div class="graph-control-header-action"
ng-click="appCtrl.serviceProvider.graphControlsCtrl.expand($event)"> ng-click="appCtrl.serviceProvider.graphControlsCtrl.expand($event)">
<i class="graph-control-expansion fa fa-plus-square-o pointer"></i> <div class="graph-control-expansion fa fa-plus-square-o pointer"></div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
@ -42,22 +42,22 @@
<div id="navigation-buttons"> <div id="navigation-buttons">
<div id="naviagte-zoom-in" class="action-button" title="Zoom In" <div id="naviagte-zoom-in" class="action-button" title="Zoom In"
ng-click="appCtrl.serviceProvider.graphControlsCtrl.navigateCtrl.zoomIn();"> ng-click="appCtrl.serviceProvider.graphControlsCtrl.navigateCtrl.zoomIn();">
<button><i class="graph-control-action-icon fa fa-search-plus"></i></button> <button><div class="graph-control-action-icon fa fa-search-plus"></div></button>
</div> </div>
<div class="button-spacer-small">&nbsp;</div> <div class="button-spacer-small">&nbsp;</div>
<div id="naviagte-zoom-out" class="action-button" title="Zoom Out" <div id="naviagte-zoom-out" class="action-button" title="Zoom Out"
ng-click="appCtrl.serviceProvider.graphControlsCtrl.navigateCtrl.zoomOut();"> ng-click="appCtrl.serviceProvider.graphControlsCtrl.navigateCtrl.zoomOut();">
<button><i class="graph-control-action-icon fa fa-search-minus"></i></button> <button><div class="graph-control-action-icon fa fa-search-minus"></div></button>
</div> </div>
<div class="button-spacer-large">&nbsp;</div> <div class="button-spacer-large">&nbsp;</div>
<div id="naviagte-zoom-fit" class="action-button" title="Fit" <div id="naviagte-zoom-fit" class="action-button" title="Fit"
ng-click="appCtrl.serviceProvider.graphControlsCtrl.navigateCtrl.zoomFit();"> ng-click="appCtrl.serviceProvider.graphControlsCtrl.navigateCtrl.zoomFit();">
<button><i class="graph-control-action-icon icon icon-zoom-fit"></i></button> <button><div class="graph-control-action-icon icon icon-zoom-fit"></div></button>
</div> </div>
<div class="button-spacer-small">&nbsp;</div> <div class="button-spacer-small">&nbsp;</div>
<div id="naviagte-zoom-actual-size" class="action-button" title="Actual" <div id="naviagte-zoom-actual-size" class="action-button" title="Actual"
ng-click="appCtrl.serviceProvider.graphControlsCtrl.navigateCtrl.zoomActualSize();"> ng-click="appCtrl.serviceProvider.graphControlsCtrl.navigateCtrl.zoomActualSize();">
<button><i class="graph-control-action-icon icon icon-zoom-actual"></i></button> <button><div class="graph-control-action-icon icon icon-zoom-actual"></div></button>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
@ -67,16 +67,16 @@
<div id="operation-control" class="graph-control"> <div id="operation-control" class="graph-control">
<div class="graph-control-docked pointer" title="Operate" <div class="graph-control-docked pointer" title="Operate"
ng-click="appCtrl.serviceProvider.graphControlsCtrl.undock($event)"> ng-click="appCtrl.serviceProvider.graphControlsCtrl.undock($event)">
<i class="graph-control-icon fa fa-hand-o-up"></i> <div class="graph-control-icon fa fa-hand-o-up"></div>
</div> </div>
<div class="graph-control-header-container hidden"> <div class="graph-control-header-container hidden">
<div class="graph-control-header-icon"> <div class="graph-control-header-icon">
<i class="graph-control-icon fa fa-hand-o-up"></i> <div class="graph-control-icon fa fa-hand-o-up"></div>
</div> </div>
<div class="graph-control-header">Operate</div> <div class="graph-control-header">Operate</div>
<div class="graph-control-header-action" <div class="graph-control-header-action"
ng-click="appCtrl.serviceProvider.graphControlsCtrl.expand($event)"> ng-click="appCtrl.serviceProvider.graphControlsCtrl.expand($event)">
<i class="graph-control-expansion fa fa-plus-square-o pointer"></i> <div class="graph-control-expansion fa fa-plus-square-o pointer"></div>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
@ -86,37 +86,37 @@
<div id="operate-configure" class="action-button" title="Configuration"> <div id="operate-configure" class="action-button" title="Configuration">
<button ng-click="appCtrl.nf.Actions['showConfiguration'](appCtrl.nf.CanvasUtils.getSelection());" <button ng-click="appCtrl.nf.Actions['showConfiguration'](appCtrl.nf.CanvasUtils.getSelection());"
ng-disabled="false"> ng-disabled="false">
<i class="graph-control-action-icon fa fa-gear"></i></button> <div class="graph-control-action-icon fa fa-gear"></div></button>
</div> </div>
<div class="button-spacer-large">&nbsp;</div> <div class="button-spacer-large">&nbsp;</div>
<div id="operate-enable" class="action-button" title="Enable"> <div id="operate-enable" class="action-button" title="Enable">
<button ng-click="appCtrl.nf.Actions['enable'](appCtrl.nf.CanvasUtils.getSelection());" <button ng-click="appCtrl.nf.Actions['enable'](appCtrl.nf.CanvasUtils.getSelection());"
ng-disabled="!appCtrl.nf.CanvasUtils.canEnable(appCtrl.nf.CanvasUtils.getSelection());"> ng-disabled="!appCtrl.nf.CanvasUtils.canEnable(appCtrl.nf.CanvasUtils.getSelection());">
<i class="graph-control-action-icon fa fa-flash"></i></button> <div class="graph-control-action-icon fa fa-flash"></div></button>
</div> </div>
<div class="button-spacer-small">&nbsp;</div> <div class="button-spacer-small">&nbsp;</div>
<div id="operate-disable" class="action-button" title="Disable"> <div id="operate-disable" class="action-button" title="Disable">
<button ng-click="appCtrl.nf.Actions['disable'](appCtrl.nf.CanvasUtils.getSelection());" <button ng-click="appCtrl.nf.Actions['disable'](appCtrl.nf.CanvasUtils.getSelection());"
ng-disabled="!appCtrl.nf.CanvasUtils.canDisable(appCtrl.nf.CanvasUtils.getSelection());"> ng-disabled="!appCtrl.nf.CanvasUtils.canDisable(appCtrl.nf.CanvasUtils.getSelection());">
<i class="graph-control-action-icon icon icon-enable-false"></i></button> <div class="graph-control-action-icon icon icon-enable-false"></div></button>
</div> </div>
<div class="button-spacer-large">&nbsp;</div> <div class="button-spacer-large">&nbsp;</div>
<div id="operate-start" class="action-button" title="Start"> <div id="operate-start" class="action-button" title="Start">
<button ng-click="appCtrl.nf.Actions['start'](appCtrl.nf.CanvasUtils.getSelection());" <button ng-click="appCtrl.nf.Actions['start'](appCtrl.nf.CanvasUtils.getSelection());"
ng-disabled="!appCtrl.nf.CanvasUtils.getSelection().empty() && !appCtrl.nf.CanvasUtils.canModify(appCtrl.nf.CanvasUtils.getSelection());"> ng-disabled="!appCtrl.nf.CanvasUtils.getSelection().empty() && !appCtrl.nf.CanvasUtils.canModify(appCtrl.nf.CanvasUtils.getSelection());">
<i class="graph-control-action-icon fa fa-play"></i></button> <div class="graph-control-action-icon fa fa-play"></div></button>
</div> </div>
<div class="button-spacer-small">&nbsp;</div> <div class="button-spacer-small">&nbsp;</div>
<div id="operate-stop" class="action-button" title="Stop"> <div id="operate-stop" class="action-button" title="Stop">
<button ng-click="appCtrl.nf.Actions['stop'](appCtrl.nf.CanvasUtils.getSelection());" <button ng-click="appCtrl.nf.Actions['stop'](appCtrl.nf.CanvasUtils.getSelection());"
ng-disabled="!appCtrl.nf.CanvasUtils.getSelection().empty() && !appCtrl.nf.CanvasUtils.canModify(appCtrl.nf.CanvasUtils.getSelection());"> ng-disabled="!appCtrl.nf.CanvasUtils.getSelection().empty() && !appCtrl.nf.CanvasUtils.canModify(appCtrl.nf.CanvasUtils.getSelection());">
<i class="graph-control-action-icon fa fa-stop"></i></button> <div class="graph-control-action-icon fa fa-stop"></div></button>
</div> </div>
<div class="button-spacer-large">&nbsp;</div> <div class="button-spacer-large">&nbsp;</div>
<div id="operate-template" class="action-button" title="Create Template"> <div id="operate-template" class="action-button" title="Create Template">
<button ng-click="appCtrl.nf.Actions['template'](appCtrl.nf.CanvasUtils.getSelection());" <button ng-click="appCtrl.nf.Actions['template'](appCtrl.nf.CanvasUtils.getSelection());"
ng-disabled="!(appCtrl.nf.Canvas.canWrite() && (appCtrl.nf.CanvasUtils.getSelection().empty() || appCtrl.nf.CanvasUtils.canRead(appCtrl.nf.CanvasUtils.getSelection())));"> ng-disabled="!(appCtrl.nf.Canvas.canWrite() && (appCtrl.nf.CanvasUtils.getSelection().empty() || appCtrl.nf.CanvasUtils.canRead(appCtrl.nf.CanvasUtils.getSelection())));">
<i class="graph-control-action-icon icon icon-template"></i></button> <div class="graph-control-action-icon icon icon-template"></div></button>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
@ -124,31 +124,31 @@
<div id="operate-copy" class="action-button" title="Copy"> <div id="operate-copy" class="action-button" title="Copy">
<button ng-click="appCtrl.nf.Actions['copy'](appCtrl.nf.CanvasUtils.getSelection());" <button ng-click="appCtrl.nf.Actions['copy'](appCtrl.nf.CanvasUtils.getSelection());"
ng-disabled="!appCtrl.nf.CanvasUtils.isCopyable(appCtrl.nf.CanvasUtils.getSelection()) || !appCtrl.nf.CanvasUtils.canRead(appCtrl.nf.CanvasUtils.getSelection());"> ng-disabled="!appCtrl.nf.CanvasUtils.isCopyable(appCtrl.nf.CanvasUtils.getSelection()) || !appCtrl.nf.CanvasUtils.canRead(appCtrl.nf.CanvasUtils.getSelection());">
<i class="graph-control-action-icon fa fa-copy"></i></button> <div class="graph-control-action-icon fa fa-copy"></div></button>
</div> </div>
<div class="button-spacer-small">&nbsp;</div> <div class="button-spacer-small">&nbsp;</div>
<div id="operate-paste" class="action-button" title="Paste"> <div id="operate-paste" class="action-button" title="Paste">
<button ng-click="appCtrl.nf.Actions['paste'](appCtrl.nf.CanvasUtils.getSelection());" <button ng-click="appCtrl.nf.Actions['paste'](appCtrl.nf.CanvasUtils.getSelection());"
ng-disabled="!appCtrl.nf.Clipboard.isCopied()"> ng-disabled="!appCtrl.nf.Clipboard.isCopied()">
<i class="graph-control-action-icon fa fa-paste"></i></button> <div class="graph-control-action-icon fa fa-paste"></div></button>
</div> </div>
<div class="button-spacer-large">&nbsp;</div> <div class="button-spacer-large">&nbsp;</div>
<div id="operate-group" class="action-button" title="Group"> <div id="operate-group" class="action-button" title="Group">
<button ng-click="appCtrl.nf.Actions['group'](appCtrl.nf.CanvasUtils.getSelection());" <button ng-click="appCtrl.nf.Actions['group'](appCtrl.nf.CanvasUtils.getSelection());"
ng-disabled="!appCtrl.nf.CanvasUtils.isDisconnected(appCtrl.nf.CanvasUtils.getSelection()) || !appCtrl.nf.CanvasUtils.canModify(appCtrl.nf.CanvasUtils.getSelection());"> ng-disabled="!appCtrl.nf.CanvasUtils.isDisconnected(appCtrl.nf.CanvasUtils.getSelection()) || !appCtrl.nf.CanvasUtils.canModify(appCtrl.nf.CanvasUtils.getSelection());">
<i class="graph-control-action-icon icon icon-group"></i></button> <div class="graph-control-action-icon icon icon-group"></div></button>
</div> </div>
<div class="button-spacer-large">&nbsp;</div> <div class="button-spacer-large">&nbsp;</div>
<div id="operate-color" class="action-button" title="Fill Color"> <div id="operate-color" class="action-button" title="Fill Color">
<button ng-click="appCtrl.nf.Actions['fillColor'](appCtrl.nf.CanvasUtils.getSelection());" <button ng-click="appCtrl.nf.Actions['fillColor'](appCtrl.nf.CanvasUtils.getSelection());"
ng-disabled="!appCtrl.nf.CanvasUtils.isColorable(appCtrl.nf.CanvasUtils.getSelection());"> ng-disabled="!appCtrl.nf.CanvasUtils.isColorable(appCtrl.nf.CanvasUtils.getSelection());">
<i class="graph-control-action-icon fa fa-paint-brush"></i></button> <div class="graph-control-action-icon fa fa-paint-brush"></div></button>
</div> </div>
<div class="button-spacer-large">&nbsp;</div> <div class="button-spacer-large">&nbsp;</div>
<div id="operate-delete" class="action-button" title="Delete"> <div id="operate-delete" class="action-button" title="Delete">
<button ng-click="appCtrl.nf.Actions['delete'](appCtrl.nf.CanvasUtils.getSelection());" <button ng-click="appCtrl.nf.Actions['delete'](appCtrl.nf.CanvasUtils.getSelection());"
ng-disabled="!appCtrl.nf.CanvasUtils.areDeletable(appCtrl.nf.CanvasUtils.getSelection());"> ng-disabled="!appCtrl.nf.CanvasUtils.areDeletable(appCtrl.nf.CanvasUtils.getSelection());">
<i class="graph-control-action-icon fa fa-trash"></i><span>Delete</span></button> <div class="graph-control-action-icon fa fa-trash"></div><span>Delete</span></button>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>

25
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-controller-service-dialog.jsp
View File

@ -15,33 +15,40 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-controller-service-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="new-controller-service-dialog" layout="column" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content" layout="column">
<div id="controller-service-type-filter-controls"> <div layout="row" style="padding-bottom:0">
<div id="controller-service-type-filter-container"> <div flex="25" layout="row" layout-align="start center">
<input type="text" id="controller-service-type-filter"/> <div class="setting-name">Tag Cloud:</div>
</div> </div>
<div flex layout="row" layout-align="space-between center" id="controller-service-type-filter-controls" class="filter-status">
<div id="controller-service-type-filter-status"> <div id="controller-service-type-filter-status">
Displaying&nbsp;<span id="displayed-controller-service-types"></span>&nbsp;of&nbsp;<span id="total-controller-service-types"></span> Displaying&nbsp;<span id="displayed-controller-service-types"></span>&nbsp;of&nbsp;<span id="total-controller-service-types"></span>
</div> </div>
<div id="controller-service-type-filter-container">
<input type="text" id="controller-service-type-filter"/>
</div> </div>
<div id="controller-service-tag-cloud-container"> </div>
</div>
<div flex layout="row" style="padding-top:0">
<div flex="25" id="controller-service-tag-cloud-container">
<div class="setting"> <div class="setting">
<div class="setting-name">Tags</div>
<div class="setting-field"> <div class="setting-field">
<div id="controller-service-tag-cloud"></div> <div id="controller-service-tag-cloud"></div>
</div> </div>
</div> </div>
</div> </div>
<div id="controller-service-types-container"> <div layout="column" flex id="controller-service-types-container">
<div id="controller-service-types-table" class="unselectable"></div> <div id="controller-service-types-table" class="unselectable"></div>
<div id="controller-service-description-container" class="hidden"> <div id="controller-service-type-name-title" class="ellipsis">Selected Controller Service:</div>
<div id="controller-service-type-name" class="ellipsis"></div> <div id="controller-service-type-name" class="ellipsis"></div>
<div id="controller-service-description-container" class="hidden">
<div id="controller-service-type-description" class="ellipsis multiline"></div> <div id="controller-service-type-description" class="ellipsis multiline"></div>
<span class="hidden" id="selected-controller-service-name"></span> <span class="hidden" id="selected-controller-service-name"></span>
<span class="hidden" id="selected-controller-service-type"></span> <span class="hidden" id="selected-controller-service-type"></span>
</div> </div>
</div> </div>
</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div> </div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-port-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-port-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="new-port-dialog" class="hidden small-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name"><span id="new-port-type">Input</span>&nbsp;port name</div> <div class="setting-name"><span id="new-port-type">Input</span>&nbsp;port name</div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-process-group-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-process-group-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="new-process-group-dialog" class="hidden small-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Process group name</div> <div class="setting-name">Process group name</div>

31
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp
View File

@ -15,33 +15,40 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-processor-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="new-processor-dialog" layout="column" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content" layout="column">
<div id="processor-type-filter-controls"> <div layout="row" style="padding-bottom:0">
<div flex="25" layout="row" layout-align="start center">
<div class="setting-name">Tag Cloud:</div>
</div>
<div flex layout="row" layout-align="space-between center" id="processor-type-filter-controls">
<div id="processor-type-filter-status" class="filter-status">
Displaying&nbsp;<span id="displayed-processor-types"></span>&nbsp;of&nbsp;<span
id="total-processor-types"></span>
</div>
<div id="processor-type-filter-container"> <div id="processor-type-filter-container">
<input type="text" id="processor-type-filter"/> <input type="text" placeholder="Filter processor list" id="processor-type-filter"/>
</div>
<div id="processor-type-filter-status">
Displaying&nbsp;<span id="displayed-processor-types"></span>&nbsp;of&nbsp;<span id="total-processor-types"></span>
</div> </div>
</div> </div>
<div id="processor-tag-cloud-container"> </div>
<div flex layout="row" style="padding-top:0">
<div flex="25" id="processor-tag-cloud-container">
<div class="setting"> <div class="setting">
<div class="setting-name">Tags</div>
<div class="setting-field"> <div class="setting-field">
<div id="processor-tag-cloud"></div> <div id="processor-tag-cloud"></div>
</div> </div>
</div> </div>
</div> </div>
<div id="processor-types-container"> <div layout="column" flex id="processor-types-container">
<div id="processor-types-table" class="unselectable"></div> <div id="processor-types-table" class="unselectable"></div>
<div id="processor-description-container"> <div id="processor-type-name-title" class="ellipsis">Selected Processor:</div>
<div id="processor-type-name" class="ellipsis"></div> <div id="processor-type-name" class="ellipsis"></div>
<div id="processor-description-container">
<div id="processor-type-description" class="ellipsis multiline"></div> <div id="processor-type-description" class="ellipsis multiline"></div>
<span class="hidden" id="selected-processor-name"></span> <span class="hidden" id="selected-processor-name"></span>
<span class="hidden" id="selected-processor-type"></span> <span class="hidden" id="selected-processor-type"></span>
</div> </div>
</div> </div>
<div class="clear"></div> </div>
</div> </div>
</div> </div>

54
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-remote-process-group-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="new-remote-process-group-dialog" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">URL</div> <div class="setting-name">URL</div>
@ -23,31 +23,10 @@
<input id="new-remote-process-group-uri" type="text" placeholder="https://remotehost:8080/nifi"/> <input id="new-remote-process-group-uri" type="text" placeholder="https://remotehost:8080/nifi"/>
</div> </div>
</div> </div>
<div class="setting">
<div class="remote-process-group-timeout-setting">
<div class="setting-name">
Communications timeout
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="When communication with this remote process group takes longer than this amount of time, it will timeout."/>
</div>
<div class="setting-field">
<input type="text" class="small-setting-input" id="new-remote-process-group-timeout"/>
</div>
</div>
<div class="remote-process-group-yield-duration-setting">
<div class="setting-name">
Yield duration
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="When communication with this remote process group fails, it will not be scheduled again until this amount of time elapses."/>
</div>
<div class="setting-field">
<input type="text" class="small-setting-input" id="new-remote-process-group-yield-duration"/>
</div>
</div>
<div class="clear"></div>
</div>
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Transport Protocol Transport Protocol
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify the transport protocol to use for this Remote Process Group communication."/> <div class="fa fa-question-circle" alt="Info" title="Specify the transport protocol to use for this Remote Process Group communication."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<div id="new-remote-process-group-transport-protocol-combo"></div> <div id="new-remote-process-group-transport-protocol-combo"></div>
@ -57,7 +36,7 @@
<div class="remote-process-group-proxy-host-setting"> <div class="remote-process-group-proxy-host-setting">
<div class="setting-name"> <div class="setting-name">
HTTP Proxy server hostname HTTP Proxy server hostname
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify the proxy server's hostname to use. If not specified, HTTP traffics are sent directly to the target NiFi instance."/> <div class="fa fa-question-circle" alt="Info" title="Specify the proxy server's hostname to use. If not specified, HTTP traffics are sent directly to the target NiFi instance."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" class="small-setting-input" id="new-remote-process-group-proxy-host"/> <input type="text" class="small-setting-input" id="new-remote-process-group-proxy-host"/>
@ -66,7 +45,7 @@
<div class="remote-process-group-proxy-port-setting"> <div class="remote-process-group-proxy-port-setting">
<div class="setting-name"> <div class="setting-name">
HTTP Proxy server port HTTP Proxy server port
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify the proxy server's port number, optional. If not specified, default port 80 will be used."/> <div class="fa fa-question-circle" alt="Info" title="Specify the proxy server's port number, optional. If not specified, default port 80 will be used."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" class="small-setting-input" id="new-remote-process-group-proxy-port"/> <input type="text" class="small-setting-input" id="new-remote-process-group-proxy-port"/>
@ -78,7 +57,7 @@
<div class="remote-process-group-proxy-user-setting"> <div class="remote-process-group-proxy-user-setting">
<div class="setting-name"> <div class="setting-name">
HTTP Proxy user HTTP Proxy user
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify an user name to connect to the proxy server, optional."/> <div class="fa fa-question-circle" alt="Info" title="Specify an user name to connect to the proxy server, optional."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" class="small-setting-input" id="new-remote-process-group-proxy-user"/> <input type="text" class="small-setting-input" id="new-remote-process-group-proxy-user"/>
@ -87,7 +66,7 @@
<div class="remote-process-group-proxy-password-setting"> <div class="remote-process-group-proxy-password-setting">
<div class="setting-name"> <div class="setting-name">
HTTP Proxy password HTTP Proxy password
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify an user password to connect to the proxy server, optional."/> <div class="fa fa-question-circle" alt="Info" title="Specify an user password to connect to the proxy server, optional."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="password" class="small-setting-input" id="new-remote-process-group-proxy-password"/> <input type="password" class="small-setting-input" id="new-remote-process-group-proxy-password"/>
@ -95,5 +74,26 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="setting">
<div class="remote-process-group-timeout-setting">
<div class="setting-name">
Communications timeout
<div class="fa fa-question-circle" alt="Info" title="When communication with this remote process group takes longer than this amount of time, it will timeout."></div>
</div>
<div class="setting-field">
<input type="text" class="small-setting-input" id="new-remote-process-group-timeout"/>
</div>
</div>
<div class="remote-process-group-yield-duration-setting">
<div class="setting-name">
Yield duration
<div class="fa fa-question-circle" alt="Info" title="When communication with this remote process group fails, it will not be scheduled again until this amount of time elapses."></div>
</div>
<div class="setting-field">
<input type="text" class="small-setting-input" id="new-remote-process-group-yield-duration"/>
</div>
</div>
<div class="clear"></div>
</div>
</div> </div>
</div> </div>

24
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-reporting-task-dialog.jsp
View File

@ -15,17 +15,23 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-reporting-task-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="new-reporting-task-dialog" layout="column" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content" layout="column">
<div id="reporting-task-type-filter-controls"> <div layout="row" style="padding-bottom:0">
<div id="controller-service-type-filter-container"> <div flex="25" layout="row" layout-align="start center">
<input type="text" id="reporting-task-type-filter"/> <div class="setting-name">Tag Cloud:</div>
</div> </div>
<div flex layout="row" layout-align="space-between center" id="reporting-task-type-filter-controls" class="filter-status">
<div id="reporting-task-type-filter-status"> <div id="reporting-task-type-filter-status">
Displaying&nbsp;<span id="displayed-reporting-task-types"></span>&nbsp;of&nbsp;<span id="total-reporting-task-types"></span> Displaying&nbsp;<span id="displayed-reporting-task-types"></span>&nbsp;of&nbsp;<span id="total-reporting-task-types"></span>
</div> </div>
<div id="controller-service-type-filter-container">
<input type="text" id="reporting-task-type-filter"/>
</div> </div>
<div id="reporting-task-tag-cloud-container"> </div>
</div>
<div flex layout="row" style="padding-top:0">
<div flex="25" id="reporting-task-tag-cloud-container">
<div class="setting"> <div class="setting">
<div class="setting-name">Tags</div> <div class="setting-name">Tags</div>
<div class="setting-field"> <div class="setting-field">
@ -33,15 +39,17 @@
</div> </div>
</div> </div>
</div> </div>
<div id="reporting-task-types-container"> <div layout="column" flex id="reporting-task-types-container">
<div id="reporting-task-types-table" class="unselectable"></div> <div id="reporting-task-types-table" class="unselectable"></div>
<div id="reporting-task-description-container" class="hidden"> <div id="reporting-task-type-name-title" class="ellipsis">Selected Reporting Task:</div>
<div id="reporting-task-type-name" class="ellipsis"></div> <div id="reporting-task-type-name" class="ellipsis"></div>
<div id="reporting-task-description-container" class="hidden">
<div id="reporting-task-type-description" class="ellipsis multiline"></div> <div id="reporting-task-type-description" class="ellipsis multiline"></div>
<span class="hidden" id="selected-reporting-task-name"></span> <span class="hidden" id="selected-reporting-task-name"></span>
<span class="hidden" id="selected-reporting-task-type"></span> <span class="hidden" id="selected-reporting-task-type"></span>
</div> </div>
</div> </div>
</div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div> </div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-template-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-template-dialog"> <div id="new-template-dialog" class="hidden medium-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Name</div> <div class="setting-name">Name</div>

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-configuration.jsp
View File

@ -15,11 +15,12 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="port-configuration" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="port-configuration" class="hidden medium-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="port-setting"> <div class="port-setting">
<div class="setting-name">Port name</div> <div class="setting-name">Port name</div>
<div class="setting-field"> <div class="setting-field">
<div id="port-name-container">
<input type="text" id="port-name"/> <input type="text" id="port-name"/>
<div class="port-enabled-container"> <div class="port-enabled-container">
<div id="port-enabled" class="port-enabled nf-checkbox checkbox-unchecked"></div> <div id="port-enabled" class="port-enabled nf-checkbox checkbox-unchecked"></div>
@ -27,6 +28,7 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<div class="port-setting"> <div class="port-setting">
<div class="setting-name"> <div class="setting-name">
Id Id
@ -38,10 +40,10 @@
<div id="port-concurrent-task-container" class="port-setting"> <div id="port-concurrent-task-container" class="port-setting">
<div class="setting-name"> <div class="setting-name">
Concurrent tasks Concurrent tasks
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The number of tasks that should be concurrently scheduled for this port."/> <div class="fa fa-question-circle" alt="Info" title="The number of tasks that should be concurrently scheduled for this port."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="port-concurrent-tasks" class="port-field"></input> <input type="text" id="port-concurrent-tasks" class="port-field"></divnput>
</div> </div>
</div> </div>
<div class="port-setting"> <div class="port-setting">

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-details.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="port-details" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="port-details" class="hidden medium-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="port-setting"> <div class="port-setting">
<div class="setting-name">Port name</div> <div class="setting-name">Port name</div>

17
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp
View File

@ -18,17 +18,11 @@
<div id="process-group-configuration"> <div id="process-group-configuration">
<div id="process-group-configuration-header-text" class="settings-header-text">Process Group Configuration</div> <div id="process-group-configuration-header-text" class="settings-header-text">Process Group Configuration</div>
<div class="settings-container"> <div class="settings-container">
<div class="settings-tabs-container"> <div class="tab-container">
<div id="process-group-configuration-tabs" class="settings-tabs"></div> <div id="process-group-configuration-tabs" class="settings-tabs"></div>
<div id="process-group-configuration-refresh-button" class="pointer settings-refresh-button" title="Refresh"></div> <button id="add-process-group-configuration-controller-service" class="add-button fa fa-plus"></button>
<div class="settings-last-refreshed-container">
Last updated:&nbsp;<span id="process-group-configuration-last-refreshed"></span>
</div>
<div id="process-group-configuration-loading-container" class="loading-container"></div>
<div id="add-process-group-configuration-controller-service" class="add-icon-bg"></div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="settings-tab-background"></div>
<div> <div>
<div id="general-process-group-configuration-tab-content" class="configuration-tab"> <div id="general-process-group-configuration-tab-content" class="configuration-tab">
<div id="general-process-group-configuration"> <div id="general-process-group-configuration">
@ -61,4 +55,11 @@
</div> </div>
</div> </div>
</div> </div>
<div id="process-group-refresh-container">
<button id="process-group-configuration-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div class="last-refreshed-container">
Last updated:&nbsp;<span id="process-group-configuration-last-refreshed" class="last-refreshed"></span>
</div>
<div id="process-group-configuration-loading-container" class="loading-container"></div>
</div>
</div> </div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="process-group-details" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="process-group-details" class="hidden medium-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Name</div> <div class="setting-name">Name</div>

32
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp
View File

@ -15,15 +15,15 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="processor-configuration" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="processor-configuration" layout="column" class="hidden large-dialog">
<div class="processor-configuration-tab-container"> <div class="processor-configuration-tab-container dialog-content">
<div id="processor-configuration-tabs"></div> <div id="processor-configuration-tabs" class="tab-container"></div>
<div id="processor-configuration-tabs-content"> <div id="processor-configuration-tabs-content">
<div id="processor-standard-settings-tab-content" class="configuration-tab"> <div id="processor-standard-settings-tab-content" class="configuration-tab">
<div class="settings-left"> <div class="settings-left">
<div class="setting"> <div class="setting">
<div class="setting-name">Name</div> <div class="setting-name">Name</div>
<div class="setting-field"> <div id="processor-name-container" class="setting-field">
<input type="text" id="processor-name" name="processor-name"/> <input type="text" id="processor-name" name="processor-name"/>
<div class="processor-enabled-container"> <div class="processor-enabled-container">
<div id="processor-enabled" class="nf-checkbox checkbox-unchecked"></div> <div id="processor-enabled" class="nf-checkbox checkbox-unchecked"></div>
@ -47,7 +47,7 @@
<div class="penalty-duration-setting"> <div class="penalty-duration-setting">
<div class="setting-name"> <div class="setting-name">
Penalty duration Penalty duration
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The amount of time used when this processor penalizes a FlowFile."/> <div class="fa fa-question-circle" alt="Info" title="The amount of time used when this processor penalizes a FlowFile."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="penalty-duration" name="penalty-duration" class="small-setting-input"/> <input type="text" id="penalty-duration" name="penalty-duration" class="small-setting-input"/>
@ -56,7 +56,7 @@
<div class="yield-duration-setting"> <div class="yield-duration-setting">
<div class="setting-name"> <div class="setting-name">
Yield duration Yield duration
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="When a processor yields, it will not be scheduled again until this amount of time elapses."/> <div class="fa fa-question-circle" alt="Info" title="When a processor yields, it will not be scheduled again until this amount of time elapses."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="yield-duration" name="yield-duration" class="small-setting-input"/> <input type="text" id="yield-duration" name="yield-duration" class="small-setting-input"/>
@ -68,7 +68,7 @@
<div class="bulletin-setting"> <div class="bulletin-setting">
<div class="setting-name"> <div class="setting-name">
Bulletin level Bulletin level
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The level at which this processor will generate bulletins."/> <div class="fa fa-question-circle" alt="Info" title="The level at which this processor will generate bulletins."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<div id="bulletin-level-combo"></div> <div id="bulletin-level-combo"></div>
@ -82,7 +82,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Auto terminate relationships Auto terminate relationships
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Will automatically terminate FlowFiles sent to a given relationship if it is not defined elsewhere."/> <div class="fa fa-question-circle" alt="Info" title="Will automatically terminate FlowFiles sent to a given relationship if it is not defined elsewhere."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<div id="auto-terminate-relationship-names"></div> <div id="auto-terminate-relationship-names"></div>
@ -96,7 +96,7 @@
<div class="scheduling-strategy-setting"> <div class="scheduling-strategy-setting">
<div class="setting-name"> <div class="setting-name">
Scheduling strategy Scheduling strategy
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The strategy used to schedule this processor."/> <div class="fa fa-question-circle" alt="Info" title="The strategy used to schedule this processor."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<div type="text" id="scheduling-strategy-combo"></div> <div type="text" id="scheduling-strategy-combo"></div>
@ -112,7 +112,7 @@
<div class="concurrently-schedulable-tasks-setting"> <div class="concurrently-schedulable-tasks-setting">
<div class="setting-name"> <div class="setting-name">
Concurrent tasks Concurrent tasks
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The number of tasks that should be concurrently scheduled for this processor."/> <div class="fa fa-question-circle" alt="Info" title="The number of tasks that should be concurrently scheduled for this processor."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="timer-driven-concurrently-schedulable-tasks" name="timer-driven-concurrently-schedulable-tasks" class="small-setting-input"/> <input type="text" id="timer-driven-concurrently-schedulable-tasks" name="timer-driven-concurrently-schedulable-tasks" class="small-setting-input"/>
@ -121,7 +121,7 @@
<div class="scheduling-period-setting"> <div class="scheduling-period-setting">
<div class="setting-name"> <div class="setting-name">
Run schedule Run schedule
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The amount of time that should elapse between task executions."/> <div class="fa fa-question-circle" alt="Info" title="The amount of time that should elapse between task executions."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="timer-driven-scheduling-period" name="timer-driven-scheduling-period" class="small-setting-input"/> <input type="text" id="timer-driven-scheduling-period" name="timer-driven-scheduling-period" class="small-setting-input"/>
@ -133,7 +133,7 @@
<div class="concurrently-schedulable-tasks-setting"> <div class="concurrently-schedulable-tasks-setting">
<div class="setting-name"> <div class="setting-name">
Concurrent tasks Concurrent tasks
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The number of tasks that should be concurrently scheduled for this processor."/> <div class="fa fa-question-circle" alt="Info" title="The number of tasks that should be concurrently scheduled for this processor."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="event-driven-concurrently-schedulable-tasks" name="event-driven-concurrently-schedulable-tasks" class="small-setting-input"/> <input type="text" id="event-driven-concurrently-schedulable-tasks" name="event-driven-concurrently-schedulable-tasks" class="small-setting-input"/>
@ -145,7 +145,7 @@
<div class="concurrently-schedulable-tasks-setting"> <div class="concurrently-schedulable-tasks-setting">
<div class="setting-name"> <div class="setting-name">
Concurrent tasks Concurrent tasks
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The number of tasks that should be concurrently scheduled for this processor."/> <div class="fa fa-question-circle" alt="Info" title="The number of tasks that should be concurrently scheduled for this processor."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="cron-driven-concurrently-schedulable-tasks" name="cron-driven-concurrently-schedulable-tasks" class="small-setting-input"/> <input type="text" id="cron-driven-concurrently-schedulable-tasks" name="cron-driven-concurrently-schedulable-tasks" class="small-setting-input"/>
@ -154,7 +154,7 @@
<div class="scheduling-period-setting"> <div class="scheduling-period-setting">
<div class="setting-name"> <div class="setting-name">
Run schedule Run schedule
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The CRON expression that defines when this processor should run."/> <div class="fa fa-question-circle" alt="Info" title="The CRON expression that defines when this processor should run."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="cron-driven-scheduling-period" name="cron-driven-scheduling-period" class="small-setting-input"/> <input type="text" id="cron-driven-scheduling-period" name="cron-driven-scheduling-period" class="small-setting-input"/>
@ -168,8 +168,8 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Run duration Run duration
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" <div class="fa fa-question-circle" alt="Info"
title="When scheduled to run, the processor will continue running for up to this duration. A run duration of 0ms will execute once when scheduled."/> title="When scheduled to run, the processor will continue running for up to this duration. A run duration of 0ms will execute once when scheduled."></div>
</div> </div>
<div class="setting-field" style="overflow: visible;"> <div class="setting-field" style="overflow: visible;">
<div id="run-duration-container"> <div id="run-duration-container">

14
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/queue-listing.jsp
View File

@ -15,16 +15,11 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="queue-listing-container" class="hidden"> <div id="queue-listing-container" class="hidden" class="hidden medium-dialog">
<div id="queue-listing-header-container"> <div id="queue-listing-header-container">
<div id="queue-listing-header-text"></div> <div id="queue-listing-header-text"></div>
</div> </div>
<div id="queue-listing-stats-container"> <div id="queue-listing-stats-container">
<div id="queue-listing-refresh-button" class="pointer" title="Refresh"></div>
<div id="queue-listing-last-refreshed-container">
Last updated:&nbsp;<span id="queue-listing-last-refreshed"></span>
</div>
<div id="queue-listing-loading-container" class="loading-container"></div>
<div id="queue-listing-stats"> <div id="queue-listing-stats">
Displaying&nbsp;<span id="displayed-flowfiles"></span>&nbsp;of&nbsp;<span id="total-flowfiles-count"></span>&nbsp;(<span id="total-flowfiles-size"></span>) Displaying&nbsp;<span id="displayed-flowfiles"></span>&nbsp;of&nbsp;<span id="total-flowfiles-count"></span>&nbsp;(<span id="total-flowfiles-size"></span>)
</div> </div>
@ -32,4 +27,11 @@
</div> </div>
<div id="queue-listing-table"></div> <div id="queue-listing-table"></div>
<div id="queue-listing-message" class="hidden"></div> <div id="queue-listing-message" class="hidden"></div>
<div id="queue-listing-refresh-container">
<button id="queue-listing-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="queue-listing-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="queue-listing-last-refreshed"></span>
</div>
<div id="queue-listing-loading-container" class="loading-container"></div>
</div>
</div> </div>

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-port-configuration.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="remote-port-configuration"> <div id="remote-port-configuration" class="hidden medium-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Name</div> <div class="setting-name">Name</div>
@ -28,7 +28,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Concurrent tasks Concurrent tasks
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The number of tasks that should be concurrently scheduled for this port."/> <div class="fa fa-question-circle" alt="Info" title="The number of tasks that should be concurrently scheduled for this port."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input id="remote-port-concurrent-tasks" type="text"/> <input id="remote-port-concurrent-tasks" type="text"/>

54
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-configuration.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="remote-process-group-configuration" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="remote-process-group-configuration" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Name</div> <div class="setting-name">Name</div>
@ -35,31 +35,10 @@
<span id="remote-process-group-url"></span> <span id="remote-process-group-url"></span>
</div> </div>
</div> </div>
<div class="setting">
<div class="remote-process-group-timeout-setting">
<div class="setting-name">
Communications timeout
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="When communication with this remote process group takes longer than this amount of time, it will timeout."/>
</div>
<div class="setting-field">
<input type="text" class="small-setting-input" id="remote-process-group-timeout"/>
</div>
</div>
<div class="remote-process-group-yield-duration-setting">
<div class="setting-name">
Yield duration
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="When communication with this remote process group fails, it will not be scheduled again until this amount of time elapses."/>
</div>
<div class="setting-field">
<input type="text" class="small-setting-input" id="remote-process-group-yield-duration"/>
</div>
</div>
<div class="clear"></div>
</div>
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Transport Protocol Transport Protocol
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify the transport protocol to use for this Remote Process Group communication."/> <div class="fa fa-question-circle" alt="Info" title="Specify the transport protocol to use for this Remote Process Group communication."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<div id="remote-process-group-transport-protocol-combo"></div> <div id="remote-process-group-transport-protocol-combo"></div>
@ -69,7 +48,7 @@
<div class="remote-process-group-proxy-host-setting"> <div class="remote-process-group-proxy-host-setting">
<div class="setting-name"> <div class="setting-name">
HTTP Proxy server hostname HTTP Proxy server hostname
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify the proxy server's hostname to use. If not specified, HTTP traffics are sent directly to the target NiFi instance."/> <div class="fa fa-question-circle" alt="Info" title="Specify the proxy server's hostname to use. If not specified, HTTP traffics are sent directly to the target NiFi instance."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" class="small-setting-input" id="remote-process-group-proxy-host"/> <input type="text" class="small-setting-input" id="remote-process-group-proxy-host"/>
@ -78,7 +57,7 @@
<div class="remote-process-group-proxy-port-setting"> <div class="remote-process-group-proxy-port-setting">
<div class="setting-name"> <div class="setting-name">
HTTP Proxy server port HTTP Proxy server port
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify the proxy server's port number, optional. If not specified, default port 80 will be used."/> <div class="fa fa-question-circle" alt="Info" title="Specify the proxy server's port number, optional. If not specified, default port 80 will be used."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" class="small-setting-input" id="remote-process-group-proxy-port"/> <input type="text" class="small-setting-input" id="remote-process-group-proxy-port"/>
@ -90,7 +69,7 @@
<div class="remote-process-group-proxy-user-setting"> <div class="remote-process-group-proxy-user-setting">
<div class="setting-name"> <div class="setting-name">
HTTP Proxy user HTTP Proxy user
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify an user name to connect to the proxy server, optional."/> <div class="fa fa-question-circle" alt="Info" title="Specify an user name to connect to the proxy server, optional."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" class="small-setting-input" id="remote-process-group-proxy-user"/> <input type="text" class="small-setting-input" id="remote-process-group-proxy-user"/>
@ -99,7 +78,7 @@
<div class="remote-process-group-proxy-password-setting"> <div class="remote-process-group-proxy-password-setting">
<div class="setting-name"> <div class="setting-name">
HTTP Proxy password HTTP Proxy password
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify an user password to connect to the proxy server, optional."/> <div class="fa fa-question-circle" alt="Info" title="Specify an user password to connect to the proxy server, optional."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="password" class="small-setting-input" id="remote-process-group-proxy-password"/> <input type="password" class="small-setting-input" id="remote-process-group-proxy-password"/>
@ -107,5 +86,26 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="setting">
<div class="remote-process-group-timeout-setting">
<div class="setting-name">
Communications timeout
<div class="fa fa-question-circle" alt="Info" title="When communication with this remote process group takes longer than this amount of time, it will timeout."></div>
</div>
<div class="setting-field">
<input type="text" class="small-setting-input" id="remote-process-group-timeout"/>
</div>
</div>
<div class="remote-process-group-yield-duration-setting">
<div class="setting-name">
Yield duration
<div class="fa fa-question-circle" alt="Info" title="When communication with this remote process group fails, it will not be scheduled again until this amount of time elapses."></div>
</div>
<div class="setting-field">
<input type="text" class="small-setting-input" id="remote-process-group-yield-duration"/>
</div>
</div>
<div class="clear"></div>
</div>
</div> </div>
</div> </div>

54
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-details.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="remote-process-group-details" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="remote-process-group-details" class="hidden medium-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Name</div> <div class="setting-name">Name</div>
@ -35,31 +35,10 @@
<span id="read-only-remote-process-group-url"></span> <span id="read-only-remote-process-group-url"></span>
</div> </div>
</div> </div>
<div class="setting">
<div class="remote-process-group-timeout-setting">
<div class="setting-name">
Communications timeout
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="When communication with this remote process group takes longer than this amount of time, it will timeout."/>
</div>
<div class="setting-field">
<span id="read-only-remote-process-group-timeout"></span>
</div>
</div>
<div class="remote-process-group-yield-duration-setting">
<div class="setting-name">
Yield duration
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="When communication with this remote process group fails, it will not be scheduled again until this amount of time elapses."/>
</div>
<div class="setting-field">
<span id="read-only-remote-process-group-yield-duration"></span>
</div>
</div>
<div class="clear"></div>
</div>
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Transport Protocol Transport Protocol
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Transport protocol to use for this Remote Process Group communication."/> <div class="fa fa-question-circle" alt="Info" title="Transport protocol to use for this Remote Process Group communication."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<div id="read-only-remote-process-group-transport-protocol"></div> <div id="read-only-remote-process-group-transport-protocol"></div>
@ -69,7 +48,7 @@
<div class="remote-process-group-proxy-host-setting"> <div class="remote-process-group-proxy-host-setting">
<div class="setting-name"> <div class="setting-name">
HTTP Proxy server hostname HTTP Proxy server hostname
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify the proxy server's hostname to use. If not specified, HTTP traffics are sent directly to the target NiFi instance."/> <div class="fa fa-question-circle" alt="Info" title="Specify the proxy server's hostname to use. If not specified, HTTP traffics are sent directly to the target NiFi instance."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-remote-process-group-proxy-host"></span> <span id="read-only-remote-process-group-proxy-host"></span>
@ -78,7 +57,7 @@
<div class="remote-process-group-proxy-port-setting"> <div class="remote-process-group-proxy-port-setting">
<div class="setting-name"> <div class="setting-name">
HTTP Proxy server port HTTP Proxy server port
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify the proxy server's port number, optional. If not specified, default port 80 will be used."/> <div class="fa fa-question-circle" alt="Info" title="Specify the proxy server's port number, optional. If not specified, default port 80 will be used."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-remote-process-group-proxy-port"></span> <span id="read-only-remote-process-group-proxy-port"></span>
@ -90,7 +69,7 @@
<div class="remote-process-group-proxy-user-setting"> <div class="remote-process-group-proxy-user-setting">
<div class="setting-name"> <div class="setting-name">
HTTP Proxy user HTTP Proxy user
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify an user name to connect to the proxy server, optional."/> <div class="fa fa-question-circle" alt="Info" title="Specify an user name to connect to the proxy server, optional."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-remote-process-group-proxy-user"></span> <span id="read-only-remote-process-group-proxy-user"></span>
@ -99,7 +78,7 @@
<div class="remote-process-group-proxy-password-setting"> <div class="remote-process-group-proxy-password-setting">
<div class="setting-name"> <div class="setting-name">
HTTP Proxy password HTTP Proxy password
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Specify an user password to connect to the proxy server, optional."/> <div class="fa fa-question-circle" alt="Info" title="Specify an user password to connect to the proxy server, optional."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-remote-process-group-proxy-password"></span> <span id="read-only-remote-process-group-proxy-password"></span>
@ -107,5 +86,26 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="setting">
<div class="remote-process-group-timeout-setting">
<div class="setting-name">
Communications timeout
<div class="fa fa-question-circle" alt="Info" title="When communication with this remote process group takes longer than this amount of time, it will timeout."></div>
</div>
<div class="setting-field">
<span id="read-only-remote-process-group-timeout"></span>
</div>
</div>
<div class="remote-process-group-yield-duration-setting">
<div class="setting-name">
Yield duration
<div class="fa fa-question-circle" alt="Info" title="When communication with this remote process group fails, it will not be scheduled again until this amount of time elapses."></div>
</div>
<div class="setting-field">
<span id="read-only-remote-process-group-yield-duration"></span>
</div>
</div>
<div class="clear"></div>
</div>
</div> </div>
</div> </div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-ports.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="remote-process-group-ports" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="remote-process-group-ports" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content">
<span id="remote-process-group-ports-id" class="hidden"></span> <span id="remote-process-group-ports-id" class="hidden"></span>
<div class="settings-left"> <div class="settings-left">

10
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/reporting-task-configuration.jsp
View File

@ -15,9 +15,9 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="reporting-task-configuration" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div id="reporting-task-configuration" class="hidden large-dialog">
<div class="reporting-task-configuration-tab-container"> <div class="reporting-task-configuration-tab-container dialog-content">
<div id="reporting-task-configuration-tabs"></div> <div id="reporting-task-configuration-tabs" class="tab-container"></div>
<div id="reporting-task-configuration-tabs-content"> <div id="reporting-task-configuration-tabs-content">
<div id="reporting-task-standard-settings-tab-content" class="configuration-tab"> <div id="reporting-task-standard-settings-tab-content" class="configuration-tab">
<div class="settings-left"> <div class="settings-left">
@ -52,7 +52,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Scheduling strategy Scheduling strategy
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The strategy used to schedule this reporting task."/> <div class="fa fa-question-circle" alt="Info" title="The strategy used to schedule this reporting task."></div>
</div> </div>
<div class="reporting-task-editable setting-field"> <div class="reporting-task-editable setting-field">
<div id="reporting-task-scheduling-strategy-combo"></div> <div id="reporting-task-scheduling-strategy-combo"></div>
@ -64,7 +64,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Run schedule Run schedule
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The amount of time that should elapse between task executions."/> <div class="fa fa-question-circle" alt="Info" title="The amount of time that should elapse between task executions."></div>
</div> </div>
<div class="reporting-task-editable setting-field"> <div class="reporting-task-editable setting-field">
<input type="text" id="reporting-task-timer-driven-scheduling-period" class="reporting-task-scheduling-period"/> <input type="text" id="reporting-task-timer-driven-scheduling-period" class="reporting-task-scheduling-period"/>

25
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp
View File

@ -18,29 +18,23 @@
<div id="settings"> <div id="settings">
<div id="settings-header-text" class="settings-header-text">NiFi Settings</div> <div id="settings-header-text" class="settings-header-text">NiFi Settings</div>
<div class="settings-container"> <div class="settings-container">
<div class="settings-tabs-container"> <div class="tab-container">
<div id="settings-tabs" class="settings-tabs"></div> <div id="settings-tabs" class="settings-tabs"></div>
<div id="settings-refresh-button" class="pointer settings-refresh-button" title="Refresh"></div> <button id="new-service-or-task" class="add-button fa fa-plus"></button>
<div class="settings-last-refreshed-container">
Last updated:&nbsp;<span id="settings-last-refreshed"></span>
</div>
<div id="settings-loading-container" class="loading-container"></div>
<div id="new-service-or-task" class="add-icon-bg"></div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div class="settings-tab-background"></div> <div id="settings-tabs-content">
<div>
<div id="general-settings-tab-content" class="configuration-tab"> <div id="general-settings-tab-content" class="configuration-tab">
<div id="general-settings"> <div id="general-settings">
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Maximum timer driven thread count Maximum timer driven thread count
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The maximum number of threads for timer driven processors available to the system."/> <div class="fa fa-question-circle" alt="Info" title="The maximum number of threads for timer driven processors available to the system."></div>
</div> </div>
<div class="editable setting-field"> <div class="editable setting-field">
<input type="text" id="maximum-timer-driven-thread-count-field" class="setting-input"/> <input type="text" id="maximum-timer-driven-thread-count-field" class="setting-input"/>
<span id="archive-flow-link" class="link">Back-up flow</span> <span id="archive-flow-link" class="link">Back-up flow</span>
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Archives the flow configuration."/> <div class="fa fa-question-circle" alt="Info" title="Archives the flow configuration."></div>
</div> </div>
<div class="read-only setting-field"> <div class="read-only setting-field">
<span id="read-only-maximum-timer-driven-thread-count-field"></span> <span id="read-only-maximum-timer-driven-thread-count-field"></span>
@ -49,7 +43,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Maximum event driven thread count Maximum event driven thread count
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The maximum number of threads for event driven processors available to the system."/> <div class="fa fa-question-circle" alt="Info" title="The maximum number of threads for event driven processors available to the system."></div>
</div> </div>
<div class="editable setting-field"> <div class="editable setting-field">
<input type="text" id="maximum-event-driven-thread-count-field" class="setting-input"/> <input type="text" id="maximum-event-driven-thread-count-field" class="setting-input"/>
@ -72,4 +66,11 @@
</div> </div>
</div> </div>
</div> </div>
<div id="settings-refresh-container">
<button id="settings-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="settings-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="settings-last-refreshed" class="value-color"></span>
</div>
<div id="settings-loading-container" class="loading-container"></div>
</div>
</div> </div>

12
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/shell.jsp
View File

@ -15,11 +15,15 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="shell-dialog" class="dialog cancellable"> <div id="shell-dialog" class="hidden cancellable" data-nf-dialog='{"resizable": "false", "responsive": {"x": "false", "y": "false"}}'>
<div id="shell-container"> <div id="shell-container" class="dialog-content">
<div id="shell-close-container"> <div id="shell-close-container">
<div id="shell-undock-button" class="undock-normal pointer" title="Open in New Window"></div> <button id="shell-undock-button" class="undock-normal pointer " title="Open in New Window">
<div id="shell-close-button" class="close-normal pointer" title="Close"></div> <div class="fa fa-external-link-square"></div>
</button>
<button id="shell-close-button" class="close-normal pointer" title="Close">
<div class="fa fa-times"></div>
</button>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
<div id="shell"></div> <div id="shell"></div>

20
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp
View File

@ -18,22 +18,22 @@
<div id="cluster"> <div id="cluster">
<div id="cluster-header-and-filter"> <div id="cluster-header-and-filter">
<div id="cluster-header-text">NiFi Cluster</div> <div id="cluster-header-text">NiFi Cluster</div>
<div id="cluster-filter-controls"> <div id="cluster-filter-controls" class="filter-controls">
<div id="cluster-filter-container"> <div id="cluster-filter-stats" class="filter-status">
<input type="text" id="cluster-filter"/>
<div id="cluster-filter-type"></div>
</div>
<div id="cluster-filter-stats">
Displaying&nbsp;<span id="displayed-nodes"></span>&nbsp;of&nbsp;<span id="total-nodes"></span> Displaying&nbsp;<span id="displayed-nodes"></span>&nbsp;of&nbsp;<span id="total-nodes"></span>
</div> </div>
<div id="cluster-filter-container" class="filter-container">
<input type="text" id="cluster-filter" class="filter"/>
<div id="cluster-filter-type" class="filter-type"></div>
</div> </div>
</div> </div>
</div>
<div id="cluster-table"></div>
</div>
<div id="cluster-refresh-container"> <div id="cluster-refresh-container">
<div id="refresh-button" class="cluster-refresh pointer" title="Refresh"></div> <button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="cluster-last-refreshed-container"> <div id="cluster-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="cluster-last-refreshed"></span> Last updated:&nbsp;<span id="cluster-last-refreshed"></span>
</div> </div>
<div id="cluster-loading-container" class="loading-container"></div> <div id="cluster-loading-container" class="loading-container"></div>
</div> </div>
<div id="cluster-table"></div>
</div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/node-details-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="node-details-dialog"> <div id="node-details-dialog" class="hidden medium-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Address</div> <div class="setting-name">Address</div>

14
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/connection-details.jsp
View File

@ -16,8 +16,8 @@
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="connection-details"> <div id="connection-details">
<div class="connection-details-tab-container"> <div class="connection-details-tab-container dialog-content">
<div id="connection-details-tabs"></div> <div id="connection-details-tabs" class="tab-container"></div>
<div id="connection-details-tabs-content"> <div id="connection-details-tabs-content">
<div id="read-only-connection-details-tab-content" class="configuration-tab"> <div id="read-only-connection-details-tab-content" class="configuration-tab">
<div class="settings-left"> <div class="settings-left">
@ -36,7 +36,7 @@
<div id="read-only-relationship-names-container" class="setting"> <div id="read-only-relationship-names-container" class="setting">
<div class="setting-name"> <div class="setting-name">
Relationships Relationships
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Selected relationships are in bold."/> <div class="fa fa-question-circle" alt="Info" title="Selected relationships are in bold."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<div id="read-only-relationship-names"></div> <div id="read-only-relationship-names"></div>
@ -76,7 +76,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
FlowFile expiration 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>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-flow-file-expiration"></span> <span id="read-only-flow-file-expiration"></span>
@ -86,7 +86,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Back pressure object threshold 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>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-back-pressure-object-threshold"></span> <span id="read-only-back-pressure-object-threshold"></span>
@ -96,7 +96,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Back pressure data size threshold 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>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-back-pressure-data-size-threshold"></span> <span id="read-only-back-pressure-data-size-threshold"></span>
@ -109,7 +109,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Prioritizers Prioritizers
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Prioritizers that have been selected to reprioritize FlowFiles in this processors work queue."/> <div class="fa fa-question-circle" alt="Info" title="Prioritizers that have been selected to reprioritize FlowFiles in this processors work queue."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<div id="read-only-prioritizers"></div> <div id="read-only-prioritizers"></div>

24
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp
View File

@ -18,22 +18,22 @@
<div id="counters"> <div id="counters">
<div id="counters-header-and-filter"> <div id="counters-header-and-filter">
<div id="counters-header-text">NiFi Counters</div> <div id="counters-header-text">NiFi Counters</div>
<div id="counters-filter-controls"> <div id="counters-filter-controls" class="filter-controls">
<div id="counters-filter-container"> <div id="counters-filter-stats" class="filter-status">
<input type="text" id="counters-filter"/>
<div id="counters-filter-type"></div>
</div>
<div id="counters-filter-stats">
Displaying&nbsp;<span id="displayed-counters"></span>&nbsp;of&nbsp;<span id="total-counters"></span> Displaying&nbsp;<span id="displayed-counters"></span>&nbsp;of&nbsp;<span id="total-counters"></span>
</div> </div>
<div id="counters-filter-container" class="filter-container">
<input type="text" id="counters-filter" class="filter"/>
<div id="counters-filter-type" class="filter-type"></div>
</div> </div>
</div> </div>
<div id="counters-refresh-container">
<div id="refresh-button" class="counters-refresh pointer" title="Refresh"></div>
<div id="counters-last-refreshed-container">
Last updated:&nbsp;<span id="counters-last-refreshed"></span>
</div>
<div id="counters-loading-container" class="loading-container"></div>
</div> </div>
<div id="counters-table"></div> <div id="counters-table"></div>
</div> </div>
<div id="counters-refresh-container">
<button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="counters-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="counters-last-refreshed" class="value-color"></span>
</div>
<div id="counters-loading-container" class="loading-container"></div>
</div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/action-details-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="action-details-dialog"> <div id="action-details-dialog" class="hidden small-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-field"> <div class="setting-field">

20
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp
View File

@ -17,20 +17,20 @@
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="history"> <div id="history">
<div id="history-header-text">NiFi History</div> <div id="history-header-text">NiFi History</div>
<div id="history-refresh-container">
<div id="refresh-button" class="history-refresh pointer" title="Refresh"></div>
<div id="history-last-refreshed-container">
Last updated:&nbsp;<span id="history-last-refreshed"></span>
</div>
<div id="history-loading-container" class="loading-container"></div>
<div id="history-filter-container"> <div id="history-filter-container">
<div id="history-filter-overview"> <div id="history-filter-overview">
A filter has been applied.&nbsp; A filter has been applied.&nbsp;
<span id="clear-history-filter">Clear filter</span> <span id="clear-history-filter" class="link">Clear filter</span>
</div>
<div id="history-filter-button" class="button button-normal pointer">Filter</div>
<div id="history-purge-button" class="button button-normal pointer hidden">Purge</div>
</div> </div>
<button id="history-filter-button" title="Filter History" class="fa fa-filter"></button>
<button id="history-purge-button" title="Purge History" class="fa fa-eraser hidden"></button>
</div> </div>
<div id="history-table"></div> <div id="history-table"></div>
</div> </div>
<div id="history-refresh-container">
<button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="history-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="history-last-refreshed" class="value-color"></span>
</div>
<div id="history-loading-container" class="loading-container"></div>
</div>

10
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-filter-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="history-filter-dialog"> <div id="history-filter-dialog" class="hidden medium-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Filter</div> <div class="setting-name">Filter</div>
@ -31,7 +31,7 @@
<div class="start-date-setting"> <div class="start-date-setting">
<div class="setting-name"> <div class="setting-name">
Start date Start date
<img class="icon-info" src="images/iconInfo.png" alt="Info" title="The start date in the format 'mm/dd/yyyy'. Must also specify start time."/> <div class="fa fa-question-circle" alt="Info" title="The start date in the format 'mm/dd/yyyy'. Must also specify start time."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="history-filter-start-date" class="history-small-input"/> <input type="text" id="history-filter-start-date" class="history-small-input"/>
@ -40,7 +40,7 @@
<div class="start-time-setting"> <div class="start-time-setting">
<div class="setting-name"> <div class="setting-name">
Start time (<span class="timezone"></span>) Start time (<span class="timezone"></span>)
<img class="icon-info" src="images/iconInfo.png" alt="Info" title="The start time in the format 'hh:mm:ss'. Must also specify start date."/> <div class="fa fa-question-circle" alt="Info" title="The start time in the format 'hh:mm:ss'. Must also specify start date."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="history-filter-start-time" class="history-small-input"/> <input type="text" id="history-filter-start-time" class="history-small-input"/>
@ -52,7 +52,7 @@
<div class="end-date-setting"> <div class="end-date-setting">
<div class="setting-name"> <div class="setting-name">
End date End date
<img class="icon-info" src="images/iconInfo.png" alt="Info" title="The end date in the format 'mm/dd/yyyy'. Must also specify end time."/> <div class="fa fa-question-circle" alt="Info" title="The end date in the format 'mm/dd/yyyy'. Must also specify end time."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="history-filter-end-date" class="history-small-input"/> <input type="text" id="history-filter-end-date" class="history-small-input"/>
@ -61,7 +61,7 @@
<div class="end-time-setting"> <div class="end-time-setting">
<div class="setting-name"> <div class="setting-name">
End time (<span class="timezone"></span>) End time (<span class="timezone"></span>)
<img class="icon-info" src="images/iconInfo.png" alt="Info" title="The end time in the format 'hh:mm:ss'. Must also specify end date."/> <div class="fa fa-question-circle" alt="Info" title="The end time in the format 'hh:mm:ss'. Must also specify end date."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="history-filter-end-time" class="history-small-input"/> <input type="text" id="history-filter-end-time" class="history-small-input"/>

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-purge-dialog.jsp
View File

@ -15,13 +15,13 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="history-purge-dialog"> <div id="history-purge-dialog" class="hidden medium-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting" style="margin-bottom: 0px;"> <div class="setting" style="margin-bottom: 0px;">
<div class="end-date-setting"> <div class="end-date-setting">
<div class="setting-name"> <div class="setting-name">
End date End date
<img class="icon-info" src="images/iconInfo.png" alt="Info" title="The purge end date in the format 'mm/dd/yyyy'. Must also specify end time."/> <div class="fa fa-question-circle" alt="Info" title="The purge end date in the format 'mm/dd/yyyy'. Must also specify end time."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="history-purge-end-date" class="history-small-input"/> <input type="text" id="history-purge-end-date" class="history-small-input"/>
@ -30,7 +30,7 @@
<div class="end-time-setting"> <div class="end-time-setting">
<div class="setting-name"> <div class="setting-name">
End time (<span class="timezone"></span>) End time (<span class="timezone"></span>)
<img id="purge-end-time-info" class="icon-info" src="images/iconInfo.png" alt="Info" title="The end time in the format 'hh:mm:ss'. Must also specify end date."/> <div class="fa fa-question-circle" id="purge-end-time-info" alt="Info" title="The end time in the format 'hh:mm:ss'. Must also specify end date."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="history-purge-end-time" class="history-small-input"/> <input type="text" id="history-purge-end-time" class="history-small-input"/>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/ok-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="nf-ok-dialog"> <div id="nf-ok-dialog" class="hidden small-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div id="nf-ok-dialog-content"></div> <div id="nf-ok-dialog-content"></div>
</div> </div>

23
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/processor-details.jsp
View File

@ -15,9 +15,9 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="processor-details"> <div id="processor-details" class="hidden large-dialog">
<div class="processor-details-tab-container"> <div class="dialog-content">
<div id="processor-details-tabs"></div> <div id="processor-details-tabs" class="tab-container"></div>
<div id="processor-details-tabs-content"> <div id="processor-details-tabs-content">
<div id="details-standard-settings-tab-content" class="details-tab"> <div id="details-standard-settings-tab-content" class="details-tab">
<div class="settings-left"> <div class="settings-left">
@ -45,7 +45,7 @@
<div class="penalty-duration-setting"> <div class="penalty-duration-setting">
<div class="setting-name"> <div class="setting-name">
Penalty duration Penalty duration
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The amount of time used when this processor penalizes a FlowFile."/> <div class="fa fa-question-circle" alt="Info" title="The amount of time used when this processor penalizes a FlowFile."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-penalty-duration"></span> <span id="read-only-penalty-duration"></span>
@ -54,7 +54,7 @@
<div class="yield-duration-setting"> <div class="yield-duration-setting">
<div class="setting-name"> <div class="setting-name">
Yield duration Yield duration
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="When a processor yields, it will not be scheduled again until this amount of time elapses."/> <div class="fa fa-question-circle" alt="Info" title="When a processor yields, it will not be scheduled again until this amount of time elapses."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-yield-duration"></span> <span id="read-only-yield-duration"></span>
@ -66,7 +66,7 @@
<div class="bulletin-setting"> <div class="bulletin-setting">
<div class="setting-name"> <div class="setting-name">
Bulletin level Bulletin level
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The level at which this processor will generate bulletins."/> <div class="fa fa-question-circle" alt="Info" title="The level at which this processor will generate bulletins."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-bulletin-level"></span> <span id="read-only-bulletin-level"></span>
@ -80,7 +80,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Auto terminate relationships Auto terminate relationships
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Will automatically terminate FlowFiles sent to all relationships in bold."/> <div class="fa fa-question-circle" alt="Info" title="Will automatically terminate FlowFiles sent to all relationships in bold."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<div id="read-only-auto-terminate-relationship-names"></div> <div id="read-only-auto-terminate-relationship-names"></div>
@ -94,7 +94,7 @@
<div class="scheduling-strategy-setting"> <div class="scheduling-strategy-setting">
<div class="setting-name"> <div class="setting-name">
Scheduling strategy Scheduling strategy
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The strategy used to schedule this processor."/> <div class="fa fa-question-circle" alt="Info" title="The strategy used to schedule this processor."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-scheduling-strategy"></span> <span id="read-only-scheduling-strategy"></span>
@ -106,7 +106,7 @@
<div class="concurrently-schedulable-tasks-setting"> <div class="concurrently-schedulable-tasks-setting">
<div class="setting-name"> <div class="setting-name">
Concurrent tasks Concurrent tasks
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The number of tasks that should be concurrently scheduled for this processor."/> <div class="fa fa-question-circle" alt="Info" title="The number of tasks that should be concurrently scheduled for this processor."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-concurrently-schedulable-tasks"></span> <span id="read-only-concurrently-schedulable-tasks"></span>
@ -115,7 +115,7 @@
<div id="read-only-run-schedule" class="scheduling-period-setting"> <div id="read-only-run-schedule" class="scheduling-period-setting">
<div class="setting-name"> <div class="setting-name">
Run schedule Run schedule
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="The minimum number of seconds that should elapse between task executions."/> <div class="fa fa-question-circle" alt="Info" title="The minimum number of seconds that should elapse between task executions."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-scheduling-period"></span> <span id="read-only-scheduling-period"></span>
@ -129,8 +129,7 @@
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Run duration Run duration
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" <div class="fa fa-question-circle" alt="Info" title="When scheduled to run, the processor will continue running for up to this duration. A run duration of 0ms will execute once when scheduled."></div>
title="When scheduled to run, the processor will continue running for up to this duration. A run duration of 0ms will execute once when scheduled."/>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<span id="read-only-run-duration"></span> <span id="read-only-run-duration"></span>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/lineage-query-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="lineage-query-dialog"> <div id="lineage-query-dialog" class="hidden medium-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-field"> <div class="setting-field">

34
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp
View File

@ -23,36 +23,36 @@
<span id="nifi-content-viewer-url" class="hidden"></span> <span id="nifi-content-viewer-url" class="hidden"></span>
<div id="provenance-header-and-filter"> <div id="provenance-header-and-filter">
<div id="provenance-header-text">NiFi Data Provenance</div> <div id="provenance-header-text">NiFi Data Provenance</div>
<div id="provenance-filter-controls"> <div id="provenance-filter-controls" class="filter-controls">
<div id="provenance-filter-container"> <div id="provenance-filter-stats" class="filter-status">
<input type="text" id="provenance-filter"/>
<div id="provenance-filter-type"></div>
</div>
<div id="provenance-filter-stats">
Displaying&nbsp;<span id="displayed-events"></span>&nbsp;of&nbsp;<span id="total-events"></span> Displaying&nbsp;<span id="displayed-events"></span>&nbsp;of&nbsp;<span id="total-events"></span>
</div> </div>
</div>
<div id="oldest-event-message"> <div id="oldest-event-message">
Oldest event available:&nbsp;<span id="oldest-event"></span> Oldest event available:&nbsp;<span id="oldest-event" class="value-color"></span>
</div>
<div id="provenance-filter-container" class="filter-container">
<input type="text" id="provenance-filter" class="filter"/>
<div id="provenance-filter-type" class="filter-type"></div>
</div> </div>
</div> </div>
<div id="provenance-event-search" class="provenance-panel">
<div id="provenance-refresh-container">
<div id="refresh-button" class="history-refresh pointer" title="Refresh"></div>
<div id="provenance-last-refreshed-container">
Last updated:&nbsp;<span id="provenance-last-refreshed"></span>
</div>
<div id="provenance-loading-container" class="loading-container"></div>
<div id="provenance-search-container"> <div id="provenance-search-container">
<div id="provenance-search-overview"> <div id="provenance-search-overview">
<span id="provenance-query-message"></span> <span id="provenance-query-message"></span>
<span id="clear-provenance-search">Clear search</span> <span id="clear-provenance-search" class="link">Clear search</span>
</div> </div>
<div id="provenance-search-button" class="button button-normal pointer">Search</div> <button id="provenance-search-button" class="fa fa-search"></button>
</div> </div>
</div> </div>
<div id="provenance-event-search" class="provenance-panel">
<div id="provenance-table"></div> <div id="provenance-table"></div>
</div> </div>
<div id="provenance-refresh-container" class="last-refreshed-container">
<button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="provenance-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="provenance-last-refreshed" class="value-color"></span>
</div>
<div id="provenance-loading-container" class="loading-container"></div>
</div>
<div id="provenance-lineage" class="provenance-panel hidden"> <div id="provenance-lineage" class="provenance-panel hidden">
<div id="provenance-lineage-loading-container"> <div id="provenance-lineage-loading-container">
<div id="provenance-lineage-loading" class="loading-container"></div> <div id="provenance-lineage-loading" class="loading-container"></div>

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-event-details-dialog.jsp
View File

@ -15,9 +15,9 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="event-details-dialog"> <div id="event-details-dialog" class="hidden large-dialog">
<div id="event-details-dialog-content"> <div id="event-details-dialog-content"class="dialog-content">
<div id="event-details-tabs"></div> <div id="event-details-tabs" class="tab-container"></div>
<div id="event-details-tabs-content"> <div id="event-details-tabs-content">
<div id="event-details-tab-content" class="details-tab"> <div id="event-details-tab-content" class="details-tab">
<span id="provenance-event-id" class="hidden"></span> <span id="provenance-event-id" class="hidden"></span>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-query-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="provenance-query-dialog"> <div id="provenance-query-dialog" class="hidden small-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-field"> <div class="setting-field">

14
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-search-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="provenance-search-dialog"> <div id="provenance-search-dialog" class="hidden medium-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting">
<div class="setting-name">Fields</div> <div class="setting-name">Fields</div>
@ -29,7 +29,7 @@
<div class="start-date-setting"> <div class="start-date-setting">
<div class="setting-name"> <div class="setting-name">
Start date Start date
<img class="icon-info" src="images/iconInfo.png" alt="Info" title="The start date in the format 'mm/dd/yyyy'. Must also specify start time."/> <div class="fa fa-question-circle" title="The start date in the format 'mm/dd/yyyy'. Must also specify start time."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="provenance-search-start-date" class="provenance-small-input"/> <input type="text" id="provenance-search-start-date" class="provenance-small-input"/>
@ -38,7 +38,7 @@
<div class="start-time-setting"> <div class="start-time-setting">
<div class="setting-name"> <div class="setting-name">
Start time (<span class="timezone"></span>) Start time (<span class="timezone"></span>)
<img class="icon-info" src="images/iconInfo.png" alt="Info" title="The start time in the format 'hh:mm:ss'. Must also specify start date."/> <div class="fa fa-question-circle" title="The start time in the format 'hh:mm:ss'. Must also specify start date."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="provenance-search-start-time" class="provenance-time-input"/> <input type="text" id="provenance-search-start-time" class="provenance-time-input"/>
@ -50,7 +50,7 @@
<div class="end-date-setting"> <div class="end-date-setting">
<div class="setting-name"> <div class="setting-name">
End date End date
<img class="icon-info" src="images/iconInfo.png" alt="Info" title="The end date in the format 'mm/dd/yyyy'. Must also specify end time."/> <div class="fa fa-question-circle" title="The end date in the format 'mm/dd/yyyy'. Must also specify end time."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="provenance-search-end-date" class="provenance-small-input"/> <input type="text" id="provenance-search-end-date" class="provenance-small-input"/>
@ -59,7 +59,7 @@
<div class="end-time-setting"> <div class="end-time-setting">
<div class="setting-name"> <div class="setting-name">
End time (<span class="timezone"></span>) End time (<span class="timezone"></span>)
<img class="icon-info" src="images/iconInfo.png" alt="Info" title="The end time in the format 'hh:mm:ss'. Must also specify end date."/> <div class="fa fa-question-circle" title="The end time in the format 'hh:mm:ss'. Must also specify end date."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="provenance-search-end-time" class="provenance-time-input"/> <input type="text" id="provenance-search-end-time" class="provenance-time-input"/>
@ -71,7 +71,7 @@
<div class="end-date-setting"> <div class="end-date-setting">
<div class="setting-name"> <div class="setting-name">
Minimum file size Minimum file size
<img class="icon-info" src="images/iconInfo.png" alt="Info" title="The minimum file size (e.g. 2 KB)."/> <div class="fa fa-question-circle" title="The minimum file size (e.g. 2 KB)."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="provenance-search-minimum-file-size" class="provenance-small-input"/> <input type="text" id="provenance-search-minimum-file-size" class="provenance-small-input"/>
@ -80,7 +80,7 @@
<div class="end-time-setting"> <div class="end-time-setting">
<div class="setting-name"> <div class="setting-name">
Maximum file size Maximum file size
<img class="icon-info" src="images/iconInfo.png" alt="Info" title="The maximum file size (e.g. 4 GB)."/> <div class="fa fa-question-circle" title="The maximum file size (e.g. 4 GB)."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="provenance-search-maximum-file-size" class="provenance-time-input"/> <input type="text" id="provenance-search-maximum-file-size" class="provenance-time-input"/>

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp
View File

@ -15,12 +15,13 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="status-history-dialog"> <div id="status-history-dialog" class="hidden" data-nf-dialog='{"resizable": "true", "glasspane": "true", "responsive": {"x": "false", "y": "false"}}'>
<div class="dialog-content">
<div id="status-history-details"></div> <div id="status-history-details"></div>
<div id="status-history-container"> <div id="status-history-container">
<div id="status-history-refresh-container"> <div id="status-history-refresh-container">
<div id="status-history-refresh-button" class="summary-refresh pointer" title="Refresh"></div> <button id="status-history-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="status-history-last-refreshed-container"> <div id="status-history-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="status-history-last-refreshed"></span> Last updated:&nbsp;<span id="status-history-last-refreshed"></span>
</div> </div>
<div id="status-history-loading-container" class="loading-container"></div> <div id="status-history-loading-container" class="loading-container"></div>
@ -31,3 +32,4 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div>

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-connection-summary-dialog.jsp
View File

@ -15,11 +15,11 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="cluster-connection-summary-dialog"> <div id="cluster-connection-summary-dialog" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div id="cluster-connection-summary-header"> <div id="cluster-connection-summary-header">
<div id="cluster-connection-refresh-button" class="summary-refresh pointer" title="Refresh"></div> <button id="cluster-connection-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="cluster-connection-summary-last-refreshed-container"> <div id="cluster-connection-summary-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="cluster-connection-summary-last-refreshed"></span> Last updated:&nbsp;<span id="cluster-connection-summary-last-refreshed"></span>
</div> </div>
<div id="cluster-connection-summary-loading-container" class="loading-container"></div> <div id="cluster-connection-summary-loading-container" class="loading-container"></div>

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-input-port-summary-dialog.jsp
View File

@ -15,11 +15,11 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="cluster-input-port-summary-dialog"> <div id="cluster-input-port-summary-dialog" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div id="cluster-input-port-summary-header"> <div id="cluster-input-port-summary-header">
<div id="cluster-input-port-refresh-button" class="summary-refresh pointer" title="Refresh"></div> <button id="cluster-input-port-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="cluster-input-port-summary-last-refreshed-container"> <div id="cluster-input-port-summary-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="cluster-input-port-summary-last-refreshed"></span> Last updated:&nbsp;<span id="cluster-input-port-summary-last-refreshed"></span>
</div> </div>
<div id="cluster-input-port-summary-loading-container" class="loading-container"></div> <div id="cluster-input-port-summary-loading-container" class="loading-container"></div>

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-output-port-summary-dialog.jsp
View File

@ -15,11 +15,11 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="cluster-output-port-summary-dialog"> <div id="cluster-output-port-summary-dialog" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div id="cluster-output-port-summary-header"> <div id="cluster-output-port-summary-header">
<div id="cluster-output-port-refresh-button" class="summary-refresh pointer" title="Refresh"></div> <button id="cluster-output-port-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="cluster-output-port-summary-last-refreshed-container"> <div id="cluster-output-port-summary-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="cluster-output-port-summary-last-refreshed"></span> Last updated:&nbsp;<span id="cluster-output-port-summary-last-refreshed"></span>
</div> </div>
<div id="cluster-output-port-summary-loading-container" class="loading-container"></div> <div id="cluster-output-port-summary-loading-container" class="loading-container"></div>

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-process-group-summary-dialog.jsp
View File

@ -15,11 +15,11 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="cluster-process-group-summary-dialog"> <div id="cluster-process-group-summary-dialog" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div id="cluster-process-group-summary-header"> <div id="cluster-process-group-summary-header">
<div id="cluster-process-group-refresh-button" class="summary-refresh pointer" title="Refresh"></div> <button id="cluster-process-group-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="cluster-process-group-summary-last-refreshed-container"> <div id="cluster-process-group-summary-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="cluster-process-group-summary-last-refreshed"></span> Last updated:&nbsp;<span id="cluster-process-group-summary-last-refreshed"></span>
</div> </div>
<div id="cluster-process-group-summary-loading-container" class="loading-container"></div> <div id="cluster-process-group-summary-loading-container" class="loading-container"></div>

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-processor-summary-dialog.jsp
View File

@ -15,11 +15,11 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="cluster-processor-summary-dialog"> <div id="cluster-processor-summary-dialog" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div id="cluster-processor-summary-header"> <div id="cluster-processor-summary-header">
<div id="cluster-processor-refresh-button" class="summary-refresh pointer" title="Refresh"></div> <button id="cluster-processor-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="cluster-processor-summary-last-refreshed-container"> <div id="cluster-processor-summary-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="cluster-processor-summary-last-refreshed"></span> Last updated:&nbsp;<span id="cluster-processor-summary-last-refreshed"></span>
</div> </div>
<div id="cluster-processor-summary-loading-container" class="loading-container"></div> <div id="cluster-processor-summary-loading-container" class="loading-container"></div>

6
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/cluster-remote-process-group-summary-dialog.jsp
View File

@ -15,11 +15,11 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="cluster-remote-process-group-summary-dialog"> <div id="cluster-remote-process-group-summary-dialog" class="hidden large-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div id="cluster-remote-process-group-summary-header"> <div id="cluster-remote-process-group-summary-header">
<div id="cluster-remote-process-group-refresh-button" class="summary-refresh pointer" title="Refresh"></div> <button id="cluster-remote-process-group-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="cluster-remote-process-group-summary-last-refreshed-container"> <div id="cluster-remote-process-group-summary-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="cluster-remote-process-group-summary-last-refreshed"></span> Last updated:&nbsp;<span id="cluster-remote-process-group-summary-last-refreshed"></span>
</div> </div>
<div id="cluster-remote-process-group-summary-loading-container" class="loading-container"></div> <div id="cluster-remote-process-group-summary-loading-container" class="loading-container"></div>

37
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/summary-content.jsp
View File

@ -18,32 +18,21 @@
<div id="summary"> <div id="summary">
<div id="summary-header-and-filter"> <div id="summary-header-and-filter">
<div id="summary-header-text">NiFi Summary</div> <div id="summary-header-text">NiFi Summary</div>
<div id="summary-filter-controls">
<div id="summary-filter-container">
<input type="text" id="summary-filter"/>
<div id="summary-filter-type"></div>
</div> </div>
<div id="summary-filter-status"> <div id="summary-tabs" class="tab-container"></div>
<div id="summary-filter-controls" class="filter-controls">
<div id="summary-filter-status" class="filter-status">
Displaying&nbsp;<span id="displayed-items"></span>&nbsp;of&nbsp;<span id="total-items"></span> Displaying&nbsp;<span id="displayed-items"></span>&nbsp;of&nbsp;<span id="total-items"></span>
</div> </div>
<div id="summary-filter-container" class="filter-container">
<input type="text" placeholder="Filter" id="summary-filter" class="filter"/>
<div id="summary-filter-type" class="filter-type"></div>
</div>
</div> </div>
<div id="view-options-container"> <div id="view-options-container">
View:&nbsp; View:&nbsp;
<span id="view-single-node-link" class="view-summary-link">Single node</span>&nbsp;&nbsp;<span id="view-cluster-link" class="view-summary-link">Cluster</span> <span id="view-single-node-link" class="link">Single node</span>&nbsp;&nbsp;<span id="view-cluster-link" class="link">Cluster</span>
</div> </div>
</div>
<div id="flow-summary-refresh-container">
<div id="summary-tabs"></div>
<div id="refresh-button" class="summary-refresh pointer" title="Refresh"></div>
<div id="summary-last-refreshed-container">
Last updated:&nbsp;<span id="summary-last-refreshed"></span>
</div>
<div id="summary-loading-container" class="loading-container"></div>
<div id="system-diagnostics-link-container">
<span id="system-diagnostics-link" class="link">system diagnostics</span>
</div>
</div>
<div id="summary-tab-background"></div>
<div id="summary-tabs-content"> <div id="summary-tabs-content">
<div id="processor-summary-tab-content" class="configuration-tab"> <div id="processor-summary-tab-content" class="configuration-tab">
<div id="processor-summary-table" class="summary-table"></div> <div id="processor-summary-table" class="summary-table"></div>
@ -65,3 +54,13 @@
</div> </div>
</div> </div>
</div> </div>
<div id="flow-summary-refresh-container">
<button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="summary-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="summary-last-refreshed" class="value-color"></span>
</div>
<div id="summary-loading-container" class="loading-container"></div>
<div id="system-diagnostics-link-container">
<span id="system-diagnostics-link" class="link">system diagnostics</span>
</div>
</div>

92
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/system-diagnostics-dialog.jsp
View File

@ -15,68 +15,102 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="system-diagnostics-dialog"> <div id="system-diagnostics-dialog" class="hidden large-dialog">
<div id="system-diagnostics-refresh-container">
<div id="system-diagnostics-tabs"></div>
<div id="system-diagnostics-refresh-button" class="summary-refresh pointer" title="Refresh"></div>
<div id="system-diagnostics-last-refreshed-container">
Last updated:&nbsp;<span id="system-diagnostics-last-refreshed"></span>
</div>
<div id="system-diagnostics-loading-container" class="loading-container"></div>
</div>
<div class="dialog-content"> <div class="dialog-content">
<div id="system-diagnostics-tabs" class="tab-container"></div>
<div id="jvm-tab-content" class="configuration-tab"> <div id="jvm-tab-content" class="configuration-tab">
<div class="settings-left"> <div class="settings-left">
<div class="setting"> <div class="setting">
<input type="hidden" id=""/> <input type="hidden" id=""/>
<div class="setting-name">Heap <span id="utilization-heap"></span></div> <div class="setting-header">Heap <span id="utilization-heap"></span></div>
<div class="setting-field"> <div class="setting-field">
<table id="heap-table"> <table id="heap-table">
<tbody> <tbody>
<tr> <tr>
<td class="memory-header"><b>Max</b></td> <td class="memory-header setting-name">Max:</td>
</tr>
<tr>
<td><span id="max-heap"></span></td> <td><span id="max-heap"></span></td>
</tr> </tr>
<tr> <tr>
<td><b>Total</b></td> <td></td>
</tr>
<tr>
<td class="setting-name">Total:</td>
</tr>
<tr>
<td><span id="total-heap"></span></td> <td><span id="total-heap"></span></td>
</tr> </tr>
<tr> <tr>
<td><b>Used</b></td> <td></td>
</tr>
<tr>
<td class="setting-name">Used:</td>
</tr>
<tr>
<td><span id="used-heap"></span></td> <td><span id="used-heap"></span></td>
</tr> </tr>
<tr> <tr>
<td><b>Free</b></td> <td></td>
</tr>
<tr>
<td class="setting-name">Free:</td>
</tr>
<tr>
<td><span id="free-heap"></span></td> <td><span id="free-heap"></span></td>
</tr> </tr>
<tr>
<td></td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="clear"></div> <div class="clear"></div>
</div> </div>
</div> </div>
<div class="spacer"></div>
<div class="settings-right"> <div class="settings-right">
<div class="setting"> <div class="setting">
<div class="setting-name">Non heap <span id="utilization-non-heap"></span></div> <div class="setting-header">Non-heap <span id="utilization-non-heap"></span></div>
<div class="setting-field"> <div class="setting-field">
<table id="heap-table"> <table id="heap-table">
<tbody> <tbody>
<tr> <tr>
<td class="memory-header"><b>Max</b></td> <td class="memory-header setting-name">Max:</td>
</tr>
<tr>
<td><span id="max-non-heap"></span></td> <td><span id="max-non-heap"></span></td>
</tr> </tr>
<tr> <tr>
<td><b>Total</b></td> <td></td>
</tr>
<tr>
<td class="setting-name">Total:</td>
</tr>
<tr>
<td><span id="total-non-heap"></span></td> <td><span id="total-non-heap"></span></td>
</tr> </tr>
<tr> <tr>
<td><b>Used</b></td> <td></td>
</tr>
<tr>
<td class="setting-name">Used:</td>
</tr>
<tr>
<td><span id="used-non-heap"></span></td> <td><span id="used-non-heap"></span></td>
</tr> </tr>
<tr> <tr>
<td><b>Free</b></td> <td></td>
</tr>
<tr>
<td class="setting-name">Free:</td>
</tr>
<tr>
<td><span id="free-non-heap"></span></td> <td><span id="free-non-heap"></span></td>
</tr> </tr>
<tr>
<td></td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
@ -85,7 +119,7 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div class="setting"> <div class="setting">
<div class="setting-name">Garbage collection</div> <div class="setting-header">Garbage Collection</div>
<div id="garbage-collection-container" class="setting-field"> <div id="garbage-collection-container" class="setting-field">
<table id="garbage-collection-table"> <table id="garbage-collection-table">
<tbody></tbody> <tbody></tbody>
@ -96,17 +130,18 @@
<div id="system-tab-content"class="configuration-tab"> <div id="system-tab-content"class="configuration-tab">
<div class="settings-left"> <div class="settings-left">
<div class="setting"> <div class="setting">
<div class="setting-name">Available processors</div> <div class="setting-name">Available Processors:</div>
<div class="setting-field"> <div class="setting-field">
<div id="available-processors"></div> <div id="available-processors"></div>
</div> </div>
</div> </div>
</div> </div>
<div class="spacer"></div>
<div class="settings-right"> <div class="settings-right">
<div class="setting"> <div class="setting">
<div class="setting-name"> <div class="setting-name">
Processor load average Processor Load Average:
<img class="setting-icon icon-info" src="images/iconInfo.png" alt="Info" title="Processor load average for the last minute. Not available on all platforms."/> <div class="fa fa-question-circle" alt="Info" title="Processor load average for the last minute. Not available on all platforms."></div>
</div> </div>
<div class="setting-field"> <div class="setting-field">
<div id="processor-load-average"></div> <div id="processor-load-average"></div>
@ -115,17 +150,24 @@
</div> </div>
<div class="clear"></div> <div class="clear"></div>
<div class="setting"> <div class="setting">
<div class="setting-name">FlowFile repository storage usage</div> <div class="setting-header">FlowFile Repository Storage</div>
<div class="setting-field"> <div class="setting-field">
<div id="flow-file-repository-storage-usage-container"></div> <div id="flow-file-repository-storage-usage-container"></div>
</div> </div>
</div> </div>
<div class="setting"> <div class="setting">
<div class="setting-name">Content repository storage usage</div> <div class="setting-header">Content Repository Storage</div>
<div class="setting-field"> <div class="setting-field">
<div id="content-repository-storage-usage-container"></div> <div id="content-repository-storage-usage-container"></div>
</div> </div>
</div> </div>
</div> </div>
<div id="system-diagnostics-refresh-container">
<button id="system-diagnostics-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="system-diagnostics-last-refreshed-container" class="last-refreshed-container">
<span id="system-diagnostics-last-refreshed" class="value-color"></span>
</div>
<div id="system-diagnostics-loading-container" class="loading-container"></div>
</div>
</div> </div>
</div> </div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/summary/view-single-node-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="view-single-node-dialog"> <div id="view-single-node-dialog" class="hidden small-dialog">
<div class="dialog-content"> <div class="dialog-content">
<input id="cluster-search-field" type="text"/> <input id="cluster-search-field" type="text"/>
<div id="cluster-search-example">(e.g.&nbsp;my.host:80)</div> <div id="cluster-search-example">(e.g.&nbsp;my.host:80)</div>

33
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp
View File

@ -20,37 +20,29 @@
<span id="template-group-id" class="hidden"><c:out value="${param.groupId}"/></span> <span id="template-group-id" class="hidden"><c:out value="${param.groupId}"/></span>
<div id="templates-header-and-filter"> <div id="templates-header-and-filter">
<div id="templates-header-text">NiFi Templates</div> <div id="templates-header-text">NiFi Templates</div>
<div id="templates-filter-controls"> <div id="templates-filter-controls" class="filter-controls">
<div id="templates-filter-container"> <div id="templates-filter-stats" class="filter-status">
<input type="text" id="templates-filter"/>
<div id="templates-filter-type"></div>
</div>
<div id="templates-filter-stats">
Displaying&nbsp;<span id="displayed-templates"></span>&nbsp;of&nbsp;<span id="total-templates"></span> Displaying&nbsp;<span id="displayed-templates"></span>&nbsp;of&nbsp;<span id="total-templates"></span>
</div> </div>
<div id="templates-filter-container" class="filter-container">
<input type="text" id="templates-filter" class="filter"/>
<div id="templates-filter-type" class="filter-type"></div>
</div> </div>
</div> </div>
<div id="templates-refresh-container">
<div id="refresh-button" class="templates-refresh pointer" title="Refresh"></div>
<div id="templates-last-refreshed-container">
Last updated:&nbsp;<span id="templates-last-refreshed"></span>
</div>
<div id="templates-loading-container" class="loading-container"></div>
<div id="upload-template-container" class="hidden"> <div id="upload-template-container" class="hidden">
<div id="select-template-container"> <div id="select-template-container">
<div id="template-browse-container"> <div id="template-browse-container">
<div id="select-template-button" class="template-button"> <button id="select-template-button" class="fa fa-plus">
<span>Browse</span>
<form id="template-upload-form" enctype="multipart/form-data" method="post"> <form id="template-upload-form" enctype="multipart/form-data" method="post">
<input type="file" name="template" id="template-file-field"/> <input type="file" name="template" id="template-file-field"/>
</form> </form>
</div> </button>
<div id="upload-template-status" class="import-status"></div> <div id="upload-template-status" class="import-status"></div>
</div> </div>
</div> </div>
<div id="submit-template-container"> <div id="submit-template-container">
<div id="upload-template-button" class="template-button">Import</div> <button><div id="upload-template-button" title="Upload template" class="icon icon-template-import"></div></button>
<div id="cancel-upload-template-button" class="template-button">Cancel</div> <button id="cancel-upload-template-button" title="Cancel" class="fa fa-undo"></button>
<div id="selected-template-name"></div> <div id="selected-template-name"></div>
</div> </div>
<div id="template-upload-form-container"> <div id="template-upload-form-container">
@ -59,3 +51,10 @@
</div> </div>
<div id="templates-table"></div> <div id="templates-table"></div>
</div> </div>
<div id="templates-refresh-container">
<button id="refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="templates-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="templates-last-refreshed" class="value-color"></span>
</div>
<div id="templates-loading-container" class="loading-container"></div>
</div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/yes-no-dialog.jsp
View File

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="nf-yes-no-dialog"> <div id="nf-yes-no-dialog" class="hidden small-dialog">
<div class="dialog-content"> <div class="dialog-content">
<div id="nf-yes-no-dialog-content"></div> <div id="nf-yes-no-dialog-content"></div>
</div> </div>

30
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/about.css
View File

@ -15,34 +15,38 @@
* limitations under the License. * limitations under the License.
*/ */
#nf-about { #nf-about {
position: absolute;
overflow: hidden; overflow: hidden;
width: 367px; width: 450px;
height: 386px; height: 450px;
font-size: 8pt; max-height: 450px;
z-index: 1201;
display: none;
} }
#nf-about-pic { #nf-about-pic {
width: 100%; height: 50%;
height: 153px; background: url(../images/nifi-logo-about.svg) #000000 no-repeat center center;
background-image: url(../images/nifi_about.png); top: 25%;
position: relative;
}
#nf-about-pic-container {
height: 50%;
background: #000000;
} }
#nf-about-content { #nf-about-content {
background-color: #EEEEEE; margin: 10px 0px 0px 0px;
margin: 25px 15px 0px 15px;
} }
#nf-version { #nf-version {
font-weight:900; font-weight:500;
font-size: 8pt; font-size: 13px;
} }
#nf-about-content p { #nf-about-content p {
padding-top: 9px; padding-top: 9px;
padding-bottom: 9px; padding-bottom: 9px;
font-size: 15px;
line-height: 15px;
} }
#nf-about-content span.link { #nf-about-content span.link {

120
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css
View File

@ -18,43 +18,18 @@
Bulletin Board Styles Bulletin Board Styles
*/ */
#bulletin-board {
position: absolute;
top: 0px;
bottom: 0px;
left: 0px;
right: 0px;
}
#bulletin-board-header-and-filter {
height: 35px;
margin-top: 20px;
margin-left: 20px;
margin-right: 20px;
}
#bulletin-board-header-text { #bulletin-board-header-text {
float: left; font-size: 18px;
font-size: 16px;
font-weight: bold; font-weight: bold;
line-height: normal; color: #728E9B;
font-family: Roboto Slab;
margin-bottom: 30px;
} }
#bulletin-board-refresh-container { #bulletin-board-refresh-container {
height: 26px; position: absolute;
margin-left: 20px; width: 100%;
margin-right: 20px; bottom: 0px;
margin-top: 18px;
-webkit-user-select: none;
-moz-user-select: none;
}
#bulletin-board-last-refreshed-container {
float: left;
color: #666;
font-weight: normal;
margin-top: 7px;
margin-left: 3px;
} }
#bulletin-board-loading-container { #bulletin-board-loading-container {
@ -74,65 +49,8 @@
padding-top: 10px; padding-top: 10px;
} }
#refresh-button {
height: 24px;
width: 26px;
float: left;
}
div.bulletin-board-stopped {
background: transparent url(../images/iconAutoRefresh.png) no-repeat scroll 0 0;
}
div.bulletin-board-stopped-hover {
background: transparent url(../images/iconAutoRefresh.png) no-repeat scroll -52px 0;
}
div.bulletin-board-polling {
background: transparent url(../images/iconAutoRefresh.png) no-repeat scroll -26px 0;
}
div.bulletin-board-polling-hover {
background: transparent url(../images/iconAutoRefresh.png) no-repeat scroll -78px 0;
}
/* filter controls */
#bulletin-board-filter-controls {
float: right;
}
#bulletin-board-filter-container {
height: 24px;
width: 318px;
}
#bulletin-board-filter {
padding: 3px 0px 1px 3px;
font-size: 12px;
height: 18px;
line-height: 20px;
width: 173px;
border: 1px solid #ccc;
margin-right: 3px;
float: left;
}
input.bulletin-board-filter-list {
color: #888;
}
#bulletin-board-filter-type {
width: 127px;
height: 18px;
line-height: 18px;
float: left;
}
#bulletin-board-status-container { #bulletin-board-status-container {
position: absolute; float: right;
right: 20px;
top: 75px;
} }
#bulletin-error-message { #bulletin-error-message {
@ -147,33 +65,22 @@ input.bulletin-board-filter-list {
} }
#clear-bulletins-button { #clear-bulletins-button {
border: 1px solid #AAAAAA; margin-top: 8px;
color: #525252;
float: left;
font-weight: bold;
height: 20px;
line-height: 20px;
text-align: center;
width: 55px;
} }
/* bulletin board */ /* bulletin board */
#bulletin-board-container { #bulletin-board-container {
position: absolute;
top: 100px;
left: 20px;
bottom: 20px;
right: 20px;
border: 1px solid #666;
overflow-y: auto; overflow-y: auto;
padding: 3px; width: 100%;
} }
div.bulletin-action { div.bulletin-action {
font-weight: bold; font-weight: bold;
margin-top: 4px;
margin-bottom: 4px; margin-bottom: 4px;
font-family: Roboto;
font-size: 13px;
color: #728e9b;
} }
div.bulletin { div.bulletin {
@ -235,4 +142,5 @@ div.bulletin-link {
pre.bulletin-message { pre.bulletin-message {
float: left; float: left;
white-space: pre-wrap; white-space: pre-wrap;
margin-top: 2px;
} }

67
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/cluster.css
View File

@ -24,36 +24,22 @@
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
right: 0px; right: 0px;
} height: 90%;
overflow: auto;
#cluster-header-and-filter {
height: 35px;
margin-top: 20px;
margin-left: 20px;
margin-right: 20px;
} }
#cluster-header-text { #cluster-header-text {
float: left; font-size: 18px;
font-size: 16px;
font-weight: bold; font-weight: bold;
color: #728E9B;
font-family: Roboto Slab;
margin-bottom: 30px;
} }
#cluster-refresh-container { #cluster-refresh-container {
height: 26px; position: absolute;
margin-left: 20px; width: 100%;
margin-right: 20px; bottom: 0px;
margin-top: 18px;
-webkit-user-select: none;
-moz-user-select: none;
}
#cluster-last-refreshed-container {
float: left;
color: #666;
font-weight: normal;
margin-top: 6px;
margin-left: 3px;
} }
#cluster-loading-container { #cluster-loading-container {
@ -86,17 +72,12 @@
} }
#cluster-filter-container { #cluster-filter-container {
height: 24px; height: 32px;
width: 318px; width: 318px;
} }
#cluster-filter { #cluster-filter {
padding: 3px 0px 1px 3px;
font-size: 12px;
height: 18px;
line-height: 20px;
width: 173px; width: 173px;
border: 1px solid #ccc;
margin-right: 3px; margin-right: 3px;
float: left; float: left;
} }
@ -106,31 +87,16 @@ input.cluster-filter-list {
} }
#cluster-filter-type { #cluster-filter-type {
width: 127px; width: 120px;
height: 18px;
line-height: 18px;
float: left; float: left;
} }
#cluster-filter-stats {
font-size: 9px;
font-weight: bold;
color: #9f6000;
clear: left;
line-height: normal;
margin-left: 5px;
}
/* counters table */ /* counters table */
#cluster-table { #cluster-table {
position: absolute;
top: 100px;
left: 20px;
bottom: 20px;
right: 20px;
border: 1px solid #666;
overflow: hidden; overflow: hidden;
height: 80%;
width: 100%;
} }
span.sorted { span.sorted {
@ -139,13 +105,6 @@ span.sorted {
/* user details dialog */ /* user details dialog */
#node-details-dialog {
display: none;
width: 600px;
height: 400px;
z-index: 1301;
}
#node-events { #node-events {
max-height: 200px; max-height: 200px;
overflow-y: auto; overflow-y: auto;

49
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/component-state.css
View File

@ -15,26 +15,6 @@
* limitations under the License. * limitations under the License.
*/ */
/*
Component state
*/
#component-state-dialog {
position: absolute;
overflow: hidden;
width: 600px;
font-size: 10px;
z-index: 1301;
display: none;
}
#component-state-description {
width: 580px;
height: 50px;
font-size: 10px;
line-height: 12px;
}
/* /*
Component state filter Component state filter
*/ */
@ -49,29 +29,11 @@
} }
#component-state-filter-controls { #component-state-filter-controls {
float: right;
margin-top: 10px; margin-top: 10px;
margin-right: 2px;
margin-bottom: 7px;
}
#component-state-filter-status {
font-size: 9px;
font-weight: bold;
color: #9f6000;
clear: left;
line-height: normal;
margin-left: 5px;
} }
#component-state-filter { #component-state-filter {
padding: 3px 0px 1px 3px;
font-size: 12px;
height: 18px;
line-height: 20px;
width: 173px; width: 173px;
border: 1px solid #ccc;
float: left;
} }
/* /*
@ -79,9 +41,10 @@
*/ */
#component-state-table { #component-state-table {
width: 578px; overflow: hidden;
height: 235px; height: 55%;
border: 1px solid #666; width: 100%;
min-height: 150px;
} }
/* /*
@ -89,8 +52,8 @@
*/ */
#clear-link-container { #clear-link-container {
margin-top: 16px; position: absolute;
margin-bottom: 18px; bottom: 10px;
} }
#clear-link.disabled { #clear-link.disabled {

84
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-configuration.css
View File

@ -21,23 +21,8 @@
height: 400px; height: 400px;
} }
div.connection-configuration-tab-container {
margin-top: -10px;
padding: 5px 11px;
}
#connection-configuration-tabs {
background-color: transparent;
border-bottom: 3px solid #666666;
height: 21px;
width: 678px;
}
#connection-configuration div.configuration-tab { #connection-configuration div.configuration-tab {
height: 275px;
overflow: auto; overflow: auto;
padding: 10px;
background: #eee url(../images/bgTabContainer.png) repeat-x;
display: none; display: none;
} }
@ -45,16 +30,6 @@ div.connection-configuration-tab-container {
Connection details. Connection details.
*/ */
#output-port-options {
height: 18px;
width: 250px;
}
#input-port-options {
height: 18px;
width: 280px;
}
div.connection-terminal-label { div.connection-terminal-label {
height: 26px; height: 26px;
} }
@ -63,26 +38,6 @@ div.connection-terminal-label {
Connection settings. Connection settings.
*/ */
#connection-configuration div.settings-left {
float: left;
width: 280px;
}
#connection-configuration div.spacer {
float: left;
margin-right: 40px;
}
#connection-configuration div.settings-right {
float: left;
width: 330px;
}
#connection-configuration .setting-input {
font-size: 11px !important;
width: 270px;
}
#relationship-names-container { #relationship-names-container {
height: 160px; height: 160px;
padding-right: 0; padding-right: 0;
@ -126,11 +81,12 @@ div.undefined {
#prioritizer-available, #prioritizer-selected { #prioritizer-available, #prioritizer-selected {
list-style-type: none; list-style-type: none;
margin: 0px; margin: 0px;
background: #eee; background: #eaeef0;
width: 325px; width: 325px;
min-height: 28px; min-height: 32px;
margin-bottom: 5px; margin-bottom: 5px;
border: 1px dashed #aaa; width: 100%;
padding: 2px;
} }
#prioritizer-available li, #prioritizer-selected li { #prioritizer-available li, #prioritizer-selected li {
@ -143,25 +99,31 @@ div.undefined {
} }
#prioritizer-available li { #prioritizer-available li {
background: transparent url(../images/bgButton.png) repeat-x center center; background: #fff;
border-top: 1px solid #d1d1d1; border-top: 1px solid #CCDADB;
border-right: 1px solid #a7a7a7; border-right: 1px solid #CCDADB;
border-bottom: 1px solid #828282; border-bottom: 1px solid #CCDADB;
border-left: 1px solid #a7a7a7; border-left: 1px solid #CCDADB;
color: #666; color: #004849;
font-weight: bold; font-weight: 500;
} cursor: grab;
cursor: -moz-grab;
li.available-hover { cursor: -webkit-grab;
background: transparent url(../images/bgButtonOver.png) repeat-x center center; line-height: 32px;
height: 32px;
padding: 0px 10px;
box-shadow:0 1px 1px rgba(0,0,0,0.4);
} }
#prioritizer-selected li { #prioritizer-selected li {
background: transparent url(../images/bgButtonSelected.png) repeat-x center center; background: #355B6A;
border-top: 1px solid #AAC1CE; border-top: 1px solid #AAC1CE;
border-right: 1px solid #85A6B8; border-right: 1px solid #85A6B8;
border-bottom: 1px solid #618BA3; border-bottom: 1px solid #618BA3;
border-left: 1px solid #85A6B8; border-left: 1px solid #85A6B8;
color: #355B6A; color: #fff;
font-weight: bold; font-weight: bold;
line-height: 32px;
height: 32px;
padding: 0px 10px;
} }

29
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-details.css
View File

@ -25,41 +25,12 @@
height: 400px; height: 400px;
} }
div.connection-details-tab-container {
margin-top: -10px;
padding: 5px 11px;
}
#connection-details-tabs {
background-color: transparent;
border-bottom: 3px solid #666666;
height: 21px;
width: 678px;
}
#connection-details div.configuration-tab { #connection-details div.configuration-tab {
height: 275px;
overflow: auto; overflow: auto;
padding: 10px; padding: 10px;
background: #eee url(../images/bgTabContainer.png) repeat-x;
display: none; display: none;
} }
#connection-details div.settings-left {
float: left;
width: 280px;
}
#connection-details div.spacer {
float: left;
margin-right: 40px;
}
#connection-details div.settings-right {
float: left;
width: 330px;
}
#read-only-relationship-names { #read-only-relationship-names {
border: 0 solid #CCCCCC; border: 0 solid #CCCCCC;
height: 145px; height: 145px;

85
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service.css
View File

@ -29,47 +29,16 @@
display: none; display: none;
} }
div.controller-service-configuration-tab-container {
margin-top: -10px;
padding: 5px 11px;
}
#controller-service-configuration-advanced { #controller-service-configuration-advanced {
display: none; display: none;
} }
#controller-service-configuration-tabs { .controller-service-editable {
background-color: transparent; height: 32px;
width: 778px;
height: 21px;
border-bottom: 3px solid #666;
}
#controller-service-configuration div.configuration-tab {
height: 320px;
overflow: auto;
padding: 10px;
background: #eee url(../images/bgTabContainer.png) repeat-x;
display: none;
} }
/* controller-service settings */ /* controller-service settings */
#controller-service-configuration div.settings-left {
float: left;
width: 330px;
}
#controller-service-configuration div.settings-right {
float: left;
width: 382px;
}
#controller-service-configuration div.spacer {
float: left;
margin-right: 40px;
}
#controller-service-configuration .setting-input { #controller-service-configuration .setting-input {
font-size: 11px !important; font-size: 11px !important;
} }
@ -168,37 +137,12 @@ div.controller-service-canceling {
#controller-service-comments { #controller-service-comments {
height: 250px; height: 250px;
width: 748px !important;
margin-top: 10px;
} }
/* /*
Disable dialog Disable dialog
*/ */
#disable-controller-service-dialog {
z-index: 1301;
display: none;
width: 800px;
height: 450px;
line-height: normal;
}
#disable-controller-service-dialog div.settings-left {
float: left;
width: 300px;
}
#disable-controller-service-dialog div.settings-right {
float: left;
width: 435px;
}
#disable-controller-service-dialog div.spacer {
float: left;
margin-right: 40px;
}
#disable-controller-service-name { #disable-controller-service-name {
float: left; float: left;
max-width: 280px; max-width: 280px;
@ -227,27 +171,8 @@ div.controller-service-canceling {
Enable dialog Enable dialog
*/ */
#enable-controller-service-dialog { #enable-controller-service-scope-container {
z-index: 1301; height: 48px;
display: none;
width: 800px;
height: 450px;
line-height: normal;
}
#enable-controller-service-dialog div.settings-left {
float: left;
width: 300px;
}
#enable-controller-service-dialog div.settings-right {
float: left;
width: 435px;
}
#enable-controller-service-dialog div.spacer {
float: left;
margin-right: 40px;
} }
#enable-controller-service-name { #enable-controller-service-name {
@ -268,8 +193,6 @@ div.controller-service-canceling {
#enable-controller-service-scope { #enable-controller-service-scope {
float: left; float: left;
width: 225px; width: 225px;
height: 18px;
line-height: 18px;
} }
#enable-controller-service-referencing-components { #enable-controller-service-referencing-components {

86
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/counters.css
View File

@ -24,36 +24,26 @@
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
right: 0px; right: 0px;
height: 90%;
overflow: auto;
} }
#counters-header-and-filter { #counters-header-and-filter {
height: 35px; height: 32px;
margin-top: 20px;
margin-left: 20px;
margin-right: 20px;
} }
#counters-header-text { #counters-header-text {
float: left; font-size: 18px;
font-size: 16px;
font-weight: bold; font-weight: bold;
color: #728E9B;
font-family: Roboto Slab;
margin-bottom: 30px;
} }
#counters-refresh-container { #counters-refresh-container {
height: 26px; position: absolute;
margin-left: 20px; width: 100%;
margin-right: 20px; bottom: 0px;
margin-top: 18px;
-webkit-user-select: none;
-moz-user-select: none;
}
#counters-last-refreshed-container {
float: left;
color: #666;
font-weight: normal;
margin-top: 6px;
margin-left: 3px;
} }
#counters-loading-container { #counters-loading-container {
@ -73,62 +63,10 @@
padding-top: 10px; padding-top: 10px;
} }
#refresh-button {
height: 24px;
width: 26px;
float: left;
}
/* filter controls */
#counters-filter-controls {
float: right;
}
#counters-filter-container {
height: 24px;
width: 318px;
}
#counters-filter {
padding: 3px 0px 1px 3px;
font-size: 12px;
height: 18px;
line-height: 20px;
width: 173px;
border: 1px solid #ccc;
margin-right: 3px;
float: left;
}
input.counters-filter-list {
color: #888;
}
#counters-filter-type {
width: 127px;
height: 18px;
line-height: 18px;
float: left;
}
#counters-filter-stats {
font-size: 9px;
font-weight: bold;
color: #9f6000;
clear: left;
line-height: normal;
margin-left: 5px;
}
/* counters table */ /* counters table */
#counters-table { #counters-table {
position: absolute;
top: 100px;
left: 20px;
bottom: 20px;
right: 20px;
border: 1px solid #666;
overflow: hidden; overflow: hidden;
height: 80%;
width: 100%;
} }

192
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css
View File

@ -18,77 +18,12 @@
Specific dialog settings. Specific dialog settings.
*/ */
#new-port-dialog {
z-index: 1301;
display: none;
width: 350px;
height: 150px;
}
#new-port-name {
width: 320px;
}
#new-process-group-dialog {
z-index: 1301;
display: none;
width: 350px;
height: 150px;
}
#new-process-group-name {
width: 320px;
}
#new-remote-process-group-dialog {
z-index: 1301;
display: none;
width: 400px;
height: 370px;
}
#new-remote-process-group-dialog .small-setting-input {
width: 160px;
}
#new-remote-process-group-transport-protocol-combo { #new-remote-process-group-transport-protocol-combo {
width: 160px; width: 160px;
height: 18px;
line-height: 18px;
}
#new-remote-process-group-uri {
width: 370px;
}
#new-template-dialog {
z-index: 1301;
display: none;
width: 350px;
height: 300px;
}
.new-template-field {
width: 320px;
}
#alias-dialog {
z-index: 1301;
display: none;
width: 350px;
height: 195px;
}
#fill-color-dialog {
z-index: 1301;
display: none;
width: 195px;
height: 400px;
} }
#fill-color-value { #fill-color-value {
width: 165px; width: 100%;
} }
#fill-color-processor-preview { #fill-color-processor-preview {
@ -146,13 +81,6 @@
float: left; float: left;
} }
#connections-dialog {
z-index: 1301;
display: none;
height: 365px;
width: 646px;
}
div.connections-component-name { div.connections-component-name {
float: left; float: left;
width: 390px; width: 390px;
@ -253,40 +181,6 @@ div.go-to-link {
cursor: pointer; cursor: pointer;
} }
#system-diagnostics-dialog {
z-index: 1301;
display: none;
height: 450px;
width: 420px;
}
#instantiate-template-dialog {
z-index: 1301;
display: none;
width: 355px;
height: 120px;
}
#available-templates {
width: 325px;
height: 18px;
line-height: 18px;
}
#remote-port-configuration {
z-index: 1301;
display: none;
width: 350px;
height: 195px;
}
#drop-request-status-dialog {
display: none;
width: 400px;
height: 125px;
z-index: 1301;
}
#drop-request-percent-complete { #drop-request-percent-complete {
margin-top: 10px; margin-top: 10px;
width: 378px; width: 378px;
@ -297,13 +191,6 @@ div.go-to-link {
border-radius: 0; border-radius: 0;
} }
#listing-request-status-dialog {
display: none;
width: 400px;
height: 125px;
z-index: 1301;
}
#listing-request-percent-complete { #listing-request-percent-complete {
margin-top: 10px; margin-top: 10px;
width: 378px; width: 378px;
@ -319,37 +206,10 @@ div.progress-label {
display: block; display: block;
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
width: 378px; /*width: 378px;*/
margin-top: 4px; margin-top: 4px;
} }
#nf-ok-dialog {
z-index: 1302;
display: none;
height: 225px;
width: 375px;
}
#nf-ok-dialog-content {
width: 355px;
height: 130px;
overflow: auto;
}
#nf-yes-no-dialog {
z-index: 1302;
display: none;
height: 175px;
width: 350px;
}
#nf-yes-no-dialog-content {
width: 330px;
height: 180px;
overflow: auto;
margin-top: -10px;
}
/* /*
General dialog styles. General dialog styles.
*/ */
@ -368,19 +228,51 @@ ul.result li {
} }
.setting-name { .setting-name {
font-size: 10px; font-size: 12px;
font-weight: bold; font-weight: 500;
font-family: Roboto Slab;
padding-bottom: 4px; padding-bottom: 4px;
color: #527991; color: #262626;
}
.setting-name .fa {
color: #004849;
margin-left: 5px;
}
.setting-field .fa {
color: #004849;
margin-left: 5px;
} }
.setting-field { .setting-field {
overflow: hidden;
line-height: normal; line-height: normal;
width: 100%;
color: #775351;
font-size: 13px;
} }
img.icon-info { .setting-header{
position: relative; color: #728e9b;
left: 3px; font-size: 12pt;
top: 1px; font-family: 'Roboto Slab';
font-style: normal;
font-weight: bold;
line-height: 56px;
text-overflow: ellipsis;
}
.dialog-content div.settings-left {
float: left;
width: 49%;
}
.dialog-content div.settings-right {
float: left;
width: 49%;
}
.dialog-content div.spacer {
float: left;
width: 2%;
} }

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/flow-status.css
View File

@ -90,6 +90,7 @@
#bulletin-button { #bulletin-button {
background-color: #728E9B; /*base-color*/ background-color: #728E9B; /*base-color*/
cursor: default;
} }
#bulletin-button.has-bulletins { #bulletin-button.has-bulletins {
@ -124,6 +125,7 @@ div.search-result-icon {
background: #FFFFFF; background: #FFFFFF;
border: 0px; border: 0px;
padding: 0px; padding: 0px;
box-shadow: none;
} }
input.search-flow { input.search-flow {

1
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/graph.css
View File

@ -28,6 +28,7 @@
background-size: 14px 14px; background-size: 14px 14px;
background-image: linear-gradient(to right, rgba(229, 235, 237, 1) 1px, transparent 1px), linear-gradient(to bottom, rgba(229, 235, 237, 1) 1px, transparent 1px); background-image: linear-gradient(to right, rgba(229, 235, 237, 1) 1px, transparent 1px), linear-gradient(to bottom, rgba(229, 235, 237, 1) 1px, transparent 1px);
z-index: 1; z-index: 1;
overflow: hidden;
} }
.tooltip { .tooltip {

8
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/header.css
View File

@ -57,6 +57,10 @@ md-toolbar.md-small .md-toolbar-tools {
font-size: 12px; font-size: 12px;
} }
#users-link {
padding-left: 7px;
}
#nifi-logo { #nifi-logo {
height: 37px; height: 37px;
margin: 0 20px 0 15px; margin: 0 20px 0 15px;
@ -69,6 +73,8 @@ md-toolbar.md-small .md-toolbar-tools {
border-top-right-radius:2px; border-top-right-radius:2px;
margin:0 10px; margin:0 10px;
cursor: pointer; cursor: pointer;
height: 40px;
width: 40px;
} }
#global-menu-button:hover { #global-menu-button:hover {
@ -129,6 +135,8 @@ md-toolbar.md-small .md-toolbar-tools {
background-color:#AABBC3; /*tint base-color 40%*/ background-color:#AABBC3; /*tint base-color 40%*/
border-radius:2px; border-radius:2px;
border: none; border: none;
height: 40px;
width: 40px;
} }
#header .component-button:hover { #header .component-button:hover {

123
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css
View File

@ -24,31 +24,22 @@
bottom: 0px; bottom: 0px;
left: 0px; left: 0px;
right: 0px; right: 0px;
height: 90%;
overflow: auto;
} }
#history-header-text { #history-header-text {
height: 35px; font-size: 18px;
margin-top: 20px;
margin-left: 20px;
font-size: 16px;
font-weight: bold; font-weight: bold;
color: #728E9B;
font-family: Roboto Slab;
padding-bottom: 10px;
} }
#history-refresh-container { #history-refresh-container {
height: 26px; position: absolute;
margin-left: 20px; width: 100%;
margin-right: 20px; bottom: 0px;
margin-top: 18px;
-webkit-user-select: none;
-moz-user-select: none;
}
#history-last-refreshed-container {
float: left;
color: #666;
font-weight: normal;
margin-top: 6px;
margin-left: 3px;
} }
#history-loading-container { #history-loading-container {
@ -68,81 +59,40 @@
padding-top: 10px; padding-top: 10px;
} }
#refresh-button {
height: 24px;
width: 26px;
float: left;
}
/* history filter controls */ /* history filter controls */
#history-filter-container { #history-filter-container {
position: absolute; float: right;
right: 20px;
top: 75px;
} }
#history-filter-button { #history-filter-button {
height: 20px; float: right;
line-height: 20px; margin-left: 1px;
width: 55px;
text-align: center;
font-weight: bold;
border: 1px solid #AAAAAA;
color: #525252;
float: left;
margin-right: 0;
padding: 0;
} }
#history-filter-overview { #history-filter-overview {
float: left;
color: #9F6000;
font-size: 9px;
font-weight: bold;
line-height: normal;
float: left;
margin-top: 6px;
margin-right: 8px;
display: none; display: none;
} font-family: Roboto;
font-size: 13px;
#clear-history-filter { margin-bottom: 5px;
cursor: pointer; font-weight: normal;
color:#31849B;
text-decoration: underline;
} }
#history-purge-button { #history-purge-button {
height: 20px; float: right;
line-height: 20px;
width: 55px;
text-align: center;
font-weight: bold;
border: 1px solid #AAAAAA;
color: #525252;
float: left;
margin-left: 5px;
margin-right: 0;
padding: 0;
} }
/* history filter dialog */ /* history filter dialog */
#history-filter-dialog {
display: none;
width: 421px;
height: 250px;
z-index: 1301;
}
.start-date-setting, .start-time-setting, .end-date-setting, .end-time-setting { .start-date-setting, .start-time-setting, .end-date-setting, .end-time-setting {
float: left; float: left;
width: 48%;
} }
.start-date-setting, .end-date-setting { .start-date-setting, .end-date-setting {
margin-right: 15px; margin-right: 4%;
width: 48%;
} }
.history-small-input { .history-small-input {
@ -156,41 +106,22 @@
margin-right: 10px; margin-right: 10px;
font-size: 11px; font-size: 11px;
float: left; float: left;
width: 275px; width: 70% !important;
} }
#history-filter-type { #history-filter-type {
width: 96px; width: 96px;
height: 18px;
line-height: 18px;
float: left; float: left;
} }
/* history purge controls */
#history-purge-dialog {
display: none;
width: 422px;
height: 150px;
z-index: 1301;
}
/* action details dialog */ /* action details dialog */
#action-details-dialog {
display: none;
width: 400px;
height: 350px;
z-index: 1301;
}
#action-details { #action-details {
height: 250px;
overflow-y: auto; overflow-y: auto;
} }
div.action-detail { div.action-detail {
margin-bottom: 2px; margin-bottom: 5px;
} }
div.history-details-name { div.history-details-name {
@ -199,18 +130,14 @@ div.history-details-name {
font-size: 10px; font-size: 10px;
font-weight: bold; font-weight: bold;
line-height: normal; line-height: normal;
width: 115px; width: 100%;
margin-right: 10px; margin-right: 10px;
} }
/* history table */ /* history table */
#history-table { #history-table {
position: absolute;
top: 100px;
left: 20px;
bottom: 20px;
right: 20px;
border: 1px solid #666;
overflow: hidden; overflow: hidden;
height: 80%;
width: 100%;
} }

14
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/label-configuration.css
View File

@ -22,25 +22,17 @@
font-size: 10px; font-size: 10px;
z-index: 1301; z-index: 1301;
display: none; display: none;
padding: 10px;
cursor: move;
}
#label-configuration-contents {
margin-top: -50px;
} }
#label-value { #label-value {
width: 375px; width: 100%;
height: 210px; height: 189px;
resize: both; resize: vertical;
min-height: 100px; min-height: 100px;
min-width: 100px; min-width: 100px;
font-weight: bold;
} }
#label-font-size { #label-font-size {
height: 24px;
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;

254
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css
View File

@ -93,7 +93,11 @@ i[class^="fa-"]:before, i[class*=" fa-"]:before {
/*remove margin from flowfont*/ /*remove margin from flowfont*/
i[class^="icon-"]:before, i[class*=" icon-"]:before { i[class^="icon-"]:before, i[class*=" icon-"]:before {
margin: -1px; margin: -2px;
}
.value-color {
color: #775351;
} }
body { body {
@ -223,9 +227,14 @@ ul.links span.header-link-over {
} }
div.nifi-tooltip { div.nifi-tooltip {
border: 1px solid #454545; border: 0px !important;
background-color: #FFFFA3; border-radius: 2px;
color: #454545; background-color: rgba(0, 0, 0, 0.80) !important;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
font-family: Roboto;
font-weight: 500;
font-size: 13px;
color: #fff !important;
max-width: 500px; max-width: 500px;
word-wrap: break-word; word-wrap: break-word;
} }
@ -259,17 +268,47 @@ input.filter-list {
background: transparent url(../images/iconTwistArrow.png) no-repeat scroll top right; background: transparent url(../images/iconTwistArrow.png) no-repeat scroll top right;
} }
input[type=text], input[type=password], textarea { label {
background: white url(../images/bgInputText.png) repeat-x scroll top; font-family: 'Roboto Slab', serif;
border: 1px solid #ccc;
font-family: Verdana;
font-size: 12px; font-size: 12px;
padding: 4px; color: #262626; /*base-font-color*/
letter-spacing: 0.05rem;
display: block;
margin-bottom: 2px;
}
input::placeholder {
color: #728e9b; /*base-color*/
}
input, input[type=text], input[type=password], textarea {
background-color: #eaeef0;
border: 1px solid #eaeef0;
font-family: Roboto, sans-serif;
font-size: 13px;
padding: 0px 0px 0px 10px;
resize: none; resize: none;
height: 32px;
width: 100%;
-webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */
-moz-box-sizing: border-box; /* Firefox, other Gecko */
box-sizing: border-box;
color: #262626;
}
input:focus, textarea:focus {
background-color: #fff;
border: 1px solid #004849; /*link-color*/
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
outline: none;
} }
textarea { textarea {
overflow: hidden; overflow: hidden;
padding: 10px 10px;
resize: vertical;
color: #262626;
font-size: 13px !important;
} }
ul.property-info { ul.property-info {
@ -311,12 +350,8 @@ div.ajax-error {
background-image: url(../images/iconDelete.png); background-image: url(../images/iconDelete.png);
} }
div.button-refresh { .refresh-button {
background: transparent url(../images/buttonRefresh.png) no-repeat scroll top left; float: left;
}
div.button-refresh-hover {
background: transparent url(../images/buttonRefresh.png) no-repeat scroll top right;
} }
.ui-draggable .dialog-header { .ui-draggable .dialog-header {
@ -327,63 +362,43 @@ div.button-refresh-hover {
div.disabled { div.disabled {
float: left; float: left;
width: 16px;
height: 16px;
background: transparent url(../images/iconDisable.png) repeat scroll 0 0;
} }
div.enabled { div.enabled {
float: left; float: left;
width: 16px; margin-left: 3px;
height: 16px; margin-right: -3px;
background: transparent url(../images/iconEnable.png) repeat scroll 0 0;
} }
div.stopped { div.stopped {
float: left; float: left;
width: 16px;
height: 16px;
background: transparent url(../images/iconStop.png) repeat scroll 0 0;
} }
div.running { div.running {
float: left; float: left;
width: 16px;
height: 16px;
background: transparent url(../images/iconRun.png) repeat scroll 0 0;
} }
div.has-errors, div.invalid { div.has-errors, div.invalid {
float: left; float: left;
width: 18px; color: #ba554a !important;
height: 16px;
margin-left: -2px;
background: transparent url(../images/iconAlert.png) repeat scroll 0 0;
} }
div.transmitting { div.transmitting {
float: left; float: left;
width: 18px;
height: 16px;
background: transparent url(../images/iconTransmissionActive.png) no-repeat center center;
} }
div.not-transmitting { div.not-transmitting {
float: left; float: left;
width: 18px; margin-top: 0px !important;
height: 16px;
background: transparent url(../images/iconTransmissionInactive.png) no-repeat center center;
} }
div.valid { div.valid {
float: left; float: left;
width: 16px;
height: 16px;
background-color: transparent; background-color: transparent;
} }
div.has-bulletins { div.has-bulletins {
background: transparent url(../images/iconBulletin.png) repeat scroll 0 0; background: #ba554a;
} }
/* /*
@ -413,6 +428,8 @@ span.link {
font-weight: normal; font-weight: normal;
display: inline-block; display: inline-block;
border-bottom: 1px solid #CCDADB; border-bottom: 1px solid #CCDADB;
font-size: 13px;
font-family: Roboto;
} }
span.link-over { span.link-over {
@ -430,18 +447,171 @@ span.details-title {
text-decoration: underline; text-decoration: underline;
} }
.last-refreshed-container {
float: left;
font-weight: normal;
margin-top: 8px;
margin-left: 3px;
-webkit-user-select: none;
-moz-user-select: none;
font-family: Roboto;
font-size: 13px;
}
.refresh-toggle {
float: left;
margin: 0px 20px 0px 0px !important;
font-family: Roboto;
font-size: 13px;
}
button {
height: 28px;
width: 28px;
border: 1px solid #CCDADB; /*tint link-color 80%*/
background-color: rgba(249, 250, 251, 0.97);
color: #004849;
}
button.refresh-button {
font-size: 16px;
}
button:hover {
border: 1px solid #004849; /*link-color*/
}
button:disabled {
color: #CCDADB; /*tint link-color 80%*/
cursor: not-allowed;
border: 1px solid #CCDADB; /*tint link-color 80%*/
}
/* angular material override */ /* angular material override */
button:focus { button:focus {
outline: none; outline: none;
border: 0;
} }
div:focus { div:focus {
outline: none; outline: none;
border: 0;
} }
input:focus { input:focus {
background-color: #fff;
border: 1px solid #004849; /*link-color*/
box-shadow: 0 1px 1px rgba(0, 0, 0, 0.4);
outline: none; outline: none;
} }
/* filter controls */
.filter-controls {
width: 100%;
}
.filter-container {
height: 32px;
width: 318px;
float: left;
}
.filter {
margin-right: 3px;
float: left;
}
input.filter {
width: 173px;
}
.filter-type {
width: 120px;
float: left;
}
.filter-status {
margin-top: 10px;
color: #775351;
font-family: Roboto;
font-size: 13px;
font-weight: 500;
margin-bottom: 5px;
}
/* buttons */
button.fa {
color: #004849;
font-size: 16px;
}
button.icon {
color: #004849;
font-size: 16px;
}
div.button {
height: 32px;
width: 90px;
padding: 0 8px;
text-transform: uppercase;
font-weight: 500;
font-size: 11px;
line-height: 33px;
text-align: center;
border: 0px;
float: right;
position: relative;
background: #728E9B;
color: #fff;
cursor: pointer;
}
div.button:hover {
background-color: #004849;
}
div.secondary-button {
height: 32px;
width: 90px;
padding: 0 8px;
text-transform: uppercase;
font-weight: 500;
font-size: 11px;
line-height: 33px;
text-align: center;
border: 0px;
float: right;
position: relative;
background: #E3E8EB;
color: #004849;
}
div.secondary-button:hover {
background-color: #C7D2D7;
}
/* tooltips */
.qtip-nifi {
border: 0px !important;
border-radius: 2px;
background-color: rgba(0, 0, 0, 0.54) !important;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25);
font-family: Roboto;
font-weight: 500;
font-size: 13px;
color: #fff !important;
}
.scrollable {
background: rgba(255, 255, 255, 1);
background: linear-gradient(to bottom,rgba(255,255,255,1) 0,rgba(255,255,255,0.50) 95%,rgba(234,238,240,1) 100%);
}
/* progress bars */
md-progress-linear > div {
background-color: #eaeef0 !important;
}

15
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/navigation.css
View File

@ -42,11 +42,14 @@
} }
#graph-controls .icon { #graph-controls .icon {
font-size: 12px; font-size: 18px;
line-height: 23px;
margin-left: -2px;
} }
#graph-controls .fa { #graph-controls .fa {
font-size: 12px; font-size: 18px;
margin-left: -1px;
} }
#graph-controls .graph-control-icon { #graph-controls .graph-control-icon {
@ -71,9 +74,7 @@ div.graph-control {
} }
div.graph-control button { div.graph-control button {
height: 24px; line-height: 28px;
width: 24px;
line-height: 19px;
border: 1px solid #CCDADB; /*tint link-color 80%*/ border: 1px solid #CCDADB; /*tint link-color 80%*/
background-color: rgba(249,250,251,1); background-color: rgba(249,250,251,1);
color: #004849; color: #004849;
@ -89,7 +90,7 @@ div.graph-control button:disabled {
border: 1px solid #CCDADB; /*tint link-color 80%*/ border: 1px solid #CCDADB; /*tint link-color 80%*/
} }
div.graph-control i.graph-control-expansion { div.graph-control div.graph-control-expansion {
color: #004849; /*link-color*/ color: #004849; /*link-color*/
} }
@ -138,7 +139,7 @@ div.action-button {
text-transform:uppercase; text-transform:uppercase;
} }
div.graph-control i.icon-disabled { div.graph-control div.icon-disabled {
color: #ddd; color: #ddd;
} }

106
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-controller-service-dialog.css
View File

@ -20,106 +20,70 @@
*/ */
#new-controller-service-dialog { #new-controller-service-dialog {
z-index: 1301; min-height:620px;
display: none; height: 620px;
width: 800px; width: 760px;
height: 450px; min-width: 760px;
line-height: normal; }
#new-controller-service-dialog span.link {
cursor: pointer;
color: #004849;
font-weight: bold;
display: inline-block;
background-color: #E3E8EB;
border-radius: 2px;
padding: 1px 4px;
} }
#controller-service-tag-cloud-container { #controller-service-tag-cloud-container {
float: left; padding: 0px;
width: 190px;
height: 350px;
} }
#controller-service-types-container { #controller-service-types-container {
float: left; padding: 0px;
width: 588px;
height: 350px;
}
#controller-service-description-container {
width: 588px;
height: 100px;
margin-top: 10px;
} }
#controller-service-type-name { #controller-service-type-name {
font-size: 12pt; font-size: 12px;
font-weight: bold; font-weight: bold;
color: #527991; margin-bottom: 2px;
margin-bottom: 6px; min-height: 15px;
width: 588px; padding: 0px 0px 5px 0px;
}
#controller-service-type-name-title {
font-family: Roboto Slab;
padding: 20px 0px 10px 0px;
} }
#controller-service-type-description { #controller-service-type-description {
width: 588px;
height: 62px; height: 62px;
font-size: 10px; font-size: 12px;
line-height: 12px; line-height: 16px;
} }
#controller-service-types-table { #controller-service-types-table {
width: 586px; min-height: 150px;
height: 249px; overflow: hidden;
border: 1px solid #666; height: 80%;
width: 100%;
} }
#controller-service-types-table-container th { #controller-service-types-table-container th {
vertical-align: middle; vertical-align: middle;
} }
/*
Processor tag cloud
*/
#controller-service-tag-cloud ul.tag-cloud {
max-height: 257px;
}
#controller-service-tag-cloud ul.tag-cloud li {
max-width: 180px;
}
#controller-service-tag-cloud div.tag-cloud-separator {
width: 180px;
}
#controller-service-tag-cloud ul.tag-filter li {
width: 180px;
}
#controller-service-tag-cloud div.selected-tag-text {
width: 160px;
}
/* /*
Processor type table filter Processor type table filter
*/ */
#controller-service-type-filter-controls { #controller-service-type-filter-controls {
float: right; min-height: 32px;
margin-top: -35px; padding: 0px;
margin-right: 2px; margin: 0px;
margin-bottom: 7px;
}
#controller-service-type-filter-status {
font-size: 9px;
font-weight: bold;
color: #9f6000;
clear: left;
line-height: normal;
margin-left: 5px;
} }
#controller-service-type-filter { #controller-service-type-filter {
padding: 3px 0px 1px 3px; width: 200px;
font-size: 12px;
height: 18px;
line-height: 20px;
width: 173px;
border: 1px solid #ccc;
float: left;
} }

102
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css
View File

@ -14,111 +14,75 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
/* /*
New processor dialog. New processor dialog.
*/ */
#new-processor-dialog { #new-processor-dialog {
z-index: 1301; min-height:620px;
display: none; height: 620px;
width: 800px; width: 760px;
height: 450px; min-width: 760px;
line-height: normal;
} }
#processor-tag-cloud-container { #new-processor-dialog span.link{
float: left; cursor: pointer;
width: 190px; color: #004849;
height: 350px; font-weight: bold;
display: inline-block;
background-color: #E3E8EB;
border-radius: 2px;
padding: 1px 4px;
} }
#processor-types-container { #processor-types-container {
float: left; padding: 0px;
width: 588px;
height: 350px;
} }
#processor-description-container { #processor-description-container {
width: 588px; padding: 0px;
height: 100px;
margin-top: 10px;
} }
#processor-type-name { #processor-type-name {
font-size: 12pt; font-size: 12px;
font-weight: bold; font-weight: bold;
color: #527991; margin-bottom: 2px;
margin-bottom: 6px; min-height: 15px;
width: 588px; padding: 0px 0px 5px 0px;
}
#processor-type-name-title {
font-family: Roboto Slab;
padding: 20px 0px 10px 0px;
} }
#processor-type-description { #processor-type-description {
width: 588px;
height: 62px; height: 62px;
font-size: 10px; font-size: 12px;
line-height: 12px; line-height: 16px;
} }
#processor-types-table { #processor-types-table {
width: 586px; min-height: 150px;
height: 249px; overflow: hidden;
border: 1px solid #666; height: 80%;
width: 100%;
} }
#processor-types-table-container th { #processor-types-table-container th {
vertical-align: middle; vertical-align: middle;
} }
/*
Processor tag cloud
*/
#processor-tag-cloud ul.tag-cloud {
max-height: 257px;
}
#processor-tag-cloud ul.tag-cloud li {
max-width: 180px;
}
#processor-tag-cloud div.tag-cloud-separator {
width: 180px;
}
#processor-tag-cloud ul.tag-filter li {
width: 180px;
}
#processor-tag-cloud div.selected-tag-text {
width: 160px;
}
/* /*
Processor type table filter Processor type table filter
*/ */
#processor-type-filter-controls { #processor-type-filter-controls {
float: right; min-height: 32px;
margin-top: -35px; padding: 0px;
margin-right: 2px;
margin-bottom: 7px;
}
#processor-type-filter-status {
font-size: 9px;
font-weight: bold;
color: #9f6000;
clear: left;
line-height: normal;
margin-left: 5px;
} }
#processor-type-filter { #processor-type-filter {
padding: 3px 0px 1px 3px; width: 200px;
font-size: 12px;
height: 18px;
line-height: 20px;
width: 173px;
border: 1px solid #ccc;
float: left;
} }

102
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-reporting-task-dialog.css
View File

@ -20,106 +20,70 @@
*/ */
#new-reporting-task-dialog { #new-reporting-task-dialog {
z-index: 1301; min-height:620px;
display: none; height: 620px;
width: 800px; width: 760px;
height: 450px; min-width: 760px;
line-height: normal;
} }
#reporting-task-tag-cloud-container { #new-reporting-task-dialog span.link{
float: left; cursor: pointer;
width: 190px; color: #004849;
height: 350px; font-weight: bold;
display: inline-block;
background-color: #E3E8EB;
border-radius: 2px;
padding: 1px 4px;
} }
#reporting-task-types-container { #reporting-task-types-container {
float: left; padding: 0px;
width: 588px;
height: 350px;
} }
#reporting-task-description-container { #reporting-task-description-container {
width: 588px; padding: 0px;
height: 100px;
margin-top: 10px;
} }
#reporting-task-type-name { #reporting-task-type-name {
font-size: 12pt; font-size: 12px;
font-weight: bold; font-weight: bold;
color: #527991; margin-bottom: 2px;
margin-bottom: 6px; min-height: 15px;
width: 588px; padding: 0px 0px 5px 0px;
}
#reporting-task-type-name-title {
font-family: Roboto Slab;
padding: 20px 0px 10px 0px;
} }
#reporting-task-type-description { #reporting-task-type-description {
width: 588px;
height: 62px; height: 62px;
font-size: 10px; font-size: 12px;
line-height: 12px; line-height: 16px;
} }
#reporting-task-types-table { #reporting-task-types-table {
width: 586px; min-height: 150px;
height: 249px; overflow: hidden;
border: 1px solid #666; height: 80%;
width: 100%;
} }
#reporting-task-types-table-container th { #reporting-task-types-table-container th {
vertical-align: middle; vertical-align: middle;
} }
/*
Processor tag cloud
*/
#reporting-task-tag-cloud ul.tag-cloud {
max-height: 257px;
}
#reporting-task-tag-cloud ul.tag-cloud li {
max-width: 180px;
}
#reporting-task-tag-cloud div.tag-cloud-separator {
width: 180px;
}
#reporting-task-tag-cloud ul.tag-filter li {
width: 180px;
}
#reporting-task-tag-cloud div.selected-tag-text {
width: 160px;
}
/* /*
Processor type table filter Processor type table filter
*/ */
#reporting-task-type-filter-controls { #reporting-task-type-filter-controls {
float: right; min-height: 32px;
margin-top: -35px; padding: 0px;
margin-right: 2px; margin: 0px;
margin-bottom: 7px;
}
#reporting-task-type-filter-status {
font-size: 9px;
font-weight: bold;
color: #9f6000;
clear: left;
line-height: normal;
margin-left: 5px;
} }
#reporting-task-type-filter { #reporting-task-type-filter {
padding: 3px 0px 1px 3px; width: 200px;
font-size: 12px;
height: 18px;
line-height: 20px;
width: 173px;
border: 1px solid #ccc;
float: left;
} }

9
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-configuration.css
View File

@ -26,12 +26,12 @@
} }
#port-name { #port-name {
width: 300px; width: 70%;
float: left; float: left;
} }
.port-field { #port-name-container {
width: 370px; height: 32px;
} }
textarea.port-field { textarea.port-field {
@ -40,11 +40,10 @@ textarea.port-field {
div.port-setting { div.port-setting {
margin-bottom: 15px; margin-bottom: 15px;
width: 380px;
} }
div.port-enabled { div.port-enabled {
width: 12px; width: 20%;
height: 12px; height: 12px;
float: left; float: left;
margin-right: 4px; margin-right: 4px;

29
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css
View File

@ -16,21 +16,20 @@
*/ */
#process-group-configuration { #process-group-configuration {
position: absolute;
top: 0px;
right: 0px;
bottom: 0px;
left: 0px;
display: none; display: none;
padding: 20px;
} }
#add-process-group-configuration-controller-service { #add-process-group-configuration-controller-service {
float: right; float: right;
width: 19px;
height: 19px;
margin-top: 4px; margin-top: 4px;
cursor: pointer; cursor: pointer;
font-size: 16px;
text-transform: uppercase;
}
#process-group-controller-services-table {
height: 100%;
width: 100%;
} }
/* settings tabs */ /* settings tabs */
@ -39,9 +38,14 @@
float: left; float: left;
} }
#process-group-refresh-container {
position: absolute;
bottom: 10px;
left: 20px;
height: 32px;
}
#process-group-configuration-refresh-button { #process-group-configuration-refresh-button {
height: 24px;
width: 26px;
float: left; float: left;
} }
@ -60,11 +64,6 @@
/* general */ /* general */
#general-process-group-configuration {
margin-top: -190px;
margin-left: 10px;
}
#general-process-group-configuration input, #general-process-group-configuration textarea { #general-process-group-configuration input, #general-process-group-configuration textarea {
font-size: 11px !important; font-size: 11px !important;
font-family: Verdana; font-family: Verdana;

Some files were not shown because too many files have changed in this diff Show More