http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp index e0ec233..63ecd3a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flow-status.jsp @@ -17,16 +17,16 @@ <%@ 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-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> - <i class="icon icon-threads"><span id="active-thread-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.activeThreadCount}}</span></i> - <i class="fa fa-list"><span id="total-queued">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.totalQueued}}</span></i> - <i class="fa fa-bullseye"><span id="controller-transmitting-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerTransmittingCount}}</span></i> - <i class="icon icon-transmit-false"><span id="controller-not-transmitting-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerNotTransmittingCount}}</span></i> - <i class="fa fa-play"><span id="controller-running-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerRunningCount}}</span></i> - <i class="fa fa-stop"><span id="controller-stopped-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerStoppedCount}}</span></i> - <i class="fa fa-warning"><span id="controller-invalid-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerInvalidCount}}</span></i> - <i class="icon icon-enable-false"><span id="controller-disabled-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerDisabledCount}}</span></i> - <i class="fa fa-refresh"><span id="stats-last-refreshed">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.statsLastRefreshed}}</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> + <div class="icon icon-threads"><span id="active-thread-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.activeThreadCount}}</span></div> + <div class="fa fa-list"><span id="total-queued">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.totalQueued}}</span></div> + <div class="fa fa-bullseye"><span id="controller-transmitting-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerTransmittingCount}}</span></div> + <div class="icon icon-transmit-false"><span id="controller-not-transmitting-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerNotTransmittingCount}}</span></div> + <div class="fa fa-play"><span id="controller-running-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerRunningCount}}</span></div> + <div class="fa fa-stop"><span id="controller-stopped-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerStoppedCount}}</span></div> + <div class="fa fa-warning"><span id="controller-invalid-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerInvalidCount}}</span></div> + <div class="icon icon-enable-false"><span id="controller-disabled-count">{{appCtrl.serviceProvider.headerCtrl.flowStatusCtrl.controllerDisabledCount}}</span></div> + <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> <div layout="row" layout-align="end center">
http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flowfile-details-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flowfile-details-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flowfile-details-dialog.jsp index 848c8a6..bc4f7a5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flowfile-details-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/flowfile-details-dialog.jsp @@ -15,9 +15,9 @@ limitations under the License. --%> <%@ 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-content"> - <div id="flowfile-details-tabs"></div> +<div id="flowfile-details-dialog" layout="column" class="hidden large-dialog"> + <div id="flowfile-details-dialog-content" class="dialog-content"> + <div id="flowfile-details-tabs" class="tab-container"></div> <div id="flowfile-details-tabs-content"> <div id="flowfile-details-tab-content" class="details-tab"> <span id="flowfile-uri" class="hidden"></span> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/instantiate-template-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/instantiate-template-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/instantiate-template-dialog.jsp index f2bf713..ea7fdf9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/instantiate-template-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/instantiate-template-dialog.jsp @@ -15,8 +15,11 @@ limitations under the License. --%> <%@ 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 id="available-templates" name="available-templates"></div> + <div class="setting"> + <div class="setting-name">Choose Template:</div> + <div id="available-templates" name="available-templates"></div> + </div> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp index 5efe441..5e05914 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp @@ -15,8 +15,8 @@ limitations under the License. --%> <%@ 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-contents"> +<div id="label-configuration" class="hidden medium-dialog"> + <div id="label-configuration-contents" class="dialog-content"> <div class="setting" style="margin-top: 5px;"> <div class="setting-name">Label Value</div> <div class="setting-field"> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/listing-request-status-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/listing-request-status-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/listing-request-status-dialog.jsp index 8cbd5a5..bed88a4 100644 --- a/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 +++ b/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 @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ 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="setting"> <div class="setting-field"> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp index c74a945..9e89e58 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/navigation.jsp @@ -25,16 +25,16 @@ <div id="navigation-control" class="graph-control"> <div class="graph-control-docked pointer" title="Navigate" 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 class="graph-control-header-container hidden"> <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 class="graph-control-header">Navigate</div> <div class="graph-control-header-action" 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 class="clear"></div> </div> @@ -42,22 +42,22 @@ <div id="navigation-buttons"> <div id="naviagte-zoom-in" class="action-button" title="Zoom In" 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 class="button-spacer-small"> </div> <div id="naviagte-zoom-out" class="action-button" title="Zoom Out" 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 class="button-spacer-large"> </div> <div id="naviagte-zoom-fit" class="action-button" title="Fit" 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 class="button-spacer-small"> </div> <div id="naviagte-zoom-actual-size" class="action-button" title="Actual" 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 class="clear"></div> </div> @@ -67,16 +67,16 @@ <div id="operation-control" class="graph-control"> <div class="graph-control-docked pointer" title="Operate" 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 class="graph-control-header-container hidden"> <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 class="graph-control-header">Operate</div> <div class="graph-control-header-action" 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 class="clear"></div> </div> @@ -86,37 +86,37 @@ <div id="operate-configure" class="action-button" title="Configuration"> <button ng-click="appCtrl.nf.Actions['showConfiguration'](appCtrl.nf.CanvasUtils.getSelection());" 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 class="button-spacer-large"> </div> <div id="operate-enable" class="action-button" title="Enable"> <button ng-click="appCtrl.nf.Actions['enable'](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 class="button-spacer-small"> </div> <div id="operate-disable" class="action-button" title="Disable"> <button ng-click="appCtrl.nf.Actions['disable'](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 class="button-spacer-large"> </div> <div id="operate-start" class="action-button" title="Start"> <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());"> - <i class="graph-control-action-icon fa fa-play"></i></button> + <div class="graph-control-action-icon fa fa-play"></div></button> </div> <div class="button-spacer-small"> </div> <div id="operate-stop" class="action-button" title="Stop"> <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());"> - <i class="graph-control-action-icon fa fa-stop"></i></button> + <div class="graph-control-action-icon fa fa-stop"></div></button> </div> <div class="button-spacer-large"> </div> <div id="operate-template" class="action-button" title="Create Template"> <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())));"> - <i class="graph-control-action-icon icon icon-template"></i></button> + <div class="graph-control-action-icon icon icon-template"></div></button> </div> <div class="clear"></div> </div> @@ -124,31 +124,31 @@ <div id="operate-copy" class="action-button" title="Copy"> <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());"> - <i class="graph-control-action-icon fa fa-copy"></i></button> + <div class="graph-control-action-icon fa fa-copy"></div></button> </div> <div class="button-spacer-small"> </div> <div id="operate-paste" class="action-button" title="Paste"> <button ng-click="appCtrl.nf.Actions['paste'](appCtrl.nf.CanvasUtils.getSelection());" 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 class="button-spacer-large"> </div> <div id="operate-group" class="action-button" title="Group"> <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());"> - <i class="graph-control-action-icon icon icon-group"></i></button> + <div class="graph-control-action-icon icon icon-group"></div></button> </div> <div class="button-spacer-large"> </div> <div id="operate-color" class="action-button" title="Fill Color"> <button ng-click="appCtrl.nf.Actions['fillColor'](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 class="button-spacer-large"> </div> <div id="operate-delete" class="action-button" title="Delete"> <button ng-click="appCtrl.nf.Actions['delete'](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 class="clear"></div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-controller-service-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-controller-service-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-controller-service-dialog.jsp index 498cba6..a764ad9 100644 --- a/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 +++ b/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 @@ -15,31 +15,38 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="new-controller-service-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> - <div class="dialog-content"> - <div id="controller-service-type-filter-controls"> - <div id="controller-service-type-filter-container"> - <input type="text" id="controller-service-type-filter"/> +<div id="new-controller-service-dialog" layout="column" class="hidden large-dialog"> + <div class="dialog-content" layout="column"> + <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 id="controller-service-type-filter-status"> - Displaying <span id="displayed-controller-service-types"></span> of <span id="total-controller-service-types"></span> + <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"> + Displaying <span id="displayed-controller-service-types"></span> of <span id="total-controller-service-types"></span> + </div> + <div id="controller-service-type-filter-container"> + <input type="text" id="controller-service-type-filter"/> + </div> </div> </div> - <div id="controller-service-tag-cloud-container"> - <div class="setting"> - <div class="setting-name">Tags</div> - <div class="setting-field"> - <div id="controller-service-tag-cloud"></div> + <div flex layout="row" style="padding-top:0"> + <div flex="25" id="controller-service-tag-cloud-container"> + <div class="setting"> + <div class="setting-field"> + <div id="controller-service-tag-cloud"></div> + </div> </div> </div> - </div> - <div id="controller-service-types-container"> - <div id="controller-service-types-table" class="unselectable"></div> - <div id="controller-service-description-container" class="hidden"> + <div layout="column" flex id="controller-service-types-container"> + <div id="controller-service-types-table" class="unselectable"></div> + <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-description" class="ellipsis multiline"></div> - <span class="hidden" id="selected-controller-service-name"></span> - <span class="hidden" id="selected-controller-service-type"></span> + <div id="controller-service-description-container" class="hidden"> + <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-type"></span> + </div> </div> </div> <div class="clear"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-port-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-port-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-port-dialog.jsp index 5646cfe..7ab86d5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-port-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-port-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ 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="setting"> <div class="setting-name"><span id="new-port-type">Input</span> port name</div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-process-group-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-process-group-dialog.jsp b/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 index ccaa836..cb538c6 100644 --- a/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 +++ b/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 @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ 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="setting"> <div class="setting-name">Process group name</div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp index 1fd16ba..ea0d766 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp @@ -15,33 +15,40 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="new-processor-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> - <div class="dialog-content"> - <div id="processor-type-filter-controls"> - <div id="processor-type-filter-container"> - <input type="text" id="processor-type-filter"/> +<div id="new-processor-dialog" layout="column" class="hidden large-dialog"> + <div class="dialog-content" layout="column"> + <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 id="processor-type-filter-status"> - Displaying <span id="displayed-processor-types"></span> of <span id="total-processor-types"></span> + <div flex layout="row" layout-align="space-between center" id="processor-type-filter-controls"> + <div id="processor-type-filter-status" class="filter-status"> + Displaying <span id="displayed-processor-types"></span> of <span + id="total-processor-types"></span> + </div> + <div id="processor-type-filter-container"> + <input type="text" placeholder="Filter processor list" id="processor-type-filter"/> + </div> </div> </div> - <div id="processor-tag-cloud-container"> - <div class="setting"> - <div class="setting-name">Tags</div> - <div class="setting-field"> - <div id="processor-tag-cloud"></div> + <div flex layout="row" style="padding-top:0"> + <div flex="25" id="processor-tag-cloud-container"> + <div class="setting"> + <div class="setting-field"> + <div id="processor-tag-cloud"></div> + </div> </div> </div> - </div> - <div id="processor-types-container"> - <div id="processor-types-table" class="unselectable"></div> - <div id="processor-description-container"> + <div layout="column" flex id="processor-types-container"> + <div id="processor-types-table" class="unselectable"></div> + <div id="processor-type-name-title" class="ellipsis">Selected Processor:</div> <div id="processor-type-name" class="ellipsis"></div> - <div id="processor-type-description" class="ellipsis multiline"></div> - <span class="hidden" id="selected-processor-name"></span> - <span class="hidden" id="selected-processor-type"></span> + <div id="processor-description-container"> + <div id="processor-type-description" class="ellipsis multiline"></div> + <span class="hidden" id="selected-processor-name"></span> + <span class="hidden" id="selected-processor-type"></span> + </div> </div> </div> - <div class="clear"></div> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-remote-process-group-dialog.jsp b/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 index 6d256d8..ab6c3ae 100644 --- a/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 +++ b/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 @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ 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="setting"> <div class="setting-name">URL</div> @@ -24,30 +24,9 @@ </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-name"> 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 class="setting-field"> <div id="new-remote-process-group-transport-protocol-combo"></div> @@ -57,7 +36,7 @@ <div class="remote-process-group-proxy-host-setting"> <div class="setting-name"> 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 class="setting-field"> <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="setting-name"> 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 class="setting-field"> <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="setting-name"> 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 class="setting-field"> <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="setting-name"> 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 class="setting-field"> <input type="password" class="small-setting-input" id="new-remote-process-group-proxy-password"/> @@ -95,5 +74,26 @@ </div> <div class="clear"></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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-reporting-task-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-reporting-task-dialog.jsp b/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 index 2939ca4..3c0c8ab 100644 --- a/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 +++ b/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 @@ -15,31 +15,39 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="new-reporting-task-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> - <div class="dialog-content"> - <div id="reporting-task-type-filter-controls"> - <div id="controller-service-type-filter-container"> - <input type="text" id="reporting-task-type-filter"/> +<div id="new-reporting-task-dialog" layout="column" class="hidden large-dialog"> + <div class="dialog-content" layout="column"> + <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 id="reporting-task-type-filter-status"> - Displaying <span id="displayed-reporting-task-types"></span> of <span id="total-reporting-task-types"></span> + <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"> + Displaying <span id="displayed-reporting-task-types"></span> of <span id="total-reporting-task-types"></span> + </div> + <div id="controller-service-type-filter-container"> + <input type="text" id="reporting-task-type-filter"/> + </div> </div> </div> - <div id="reporting-task-tag-cloud-container"> - <div class="setting"> - <div class="setting-name">Tags</div> - <div class="setting-field"> - <div id="reporting-task-tag-cloud"></div> + <div flex layout="row" style="padding-top:0"> + <div flex="25" id="reporting-task-tag-cloud-container"> + <div class="setting"> + <div class="setting-name">Tags</div> + <div class="setting-field"> + <div id="reporting-task-tag-cloud"></div> + </div> </div> </div> - </div> - <div id="reporting-task-types-container"> - <div id="reporting-task-types-table" class="unselectable"></div> - <div id="reporting-task-description-container" class="hidden"> + <div layout="column" flex id="reporting-task-types-container"> + <div id="reporting-task-types-table" class="unselectable"></div> + <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-description" class="ellipsis multiline"></div> - <span class="hidden" id="selected-reporting-task-name"></span> - <span class="hidden" id="selected-reporting-task-type"></span> + <div id="reporting-task-description-container" class="hidden"> + <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-type"></span> + </div> </div> </div> <div class="clear"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-template-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-template-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-template-dialog.jsp index 8795be5..0aaa8d6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-template-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-template-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ 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="setting"> <div class="setting-name">Name</div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-configuration.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-configuration.jsp index 0c90ac7..f805792 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-configuration.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-configuration.jsp @@ -15,15 +15,17 @@ limitations under the License. --%> <%@ 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="port-setting"> <div class="setting-name">Port name</div> <div class="setting-field"> - <input type="text" id="port-name"/> - <div class="port-enabled-container"> - <div id="port-enabled" class="port-enabled nf-checkbox checkbox-unchecked"></div> - <span> Enabled</span> + <div id="port-name-container"> + <input type="text" id="port-name"/> + <div class="port-enabled-container"> + <div id="port-enabled" class="port-enabled nf-checkbox checkbox-unchecked"></div> + <span> Enabled</span> + </div> </div> </div> </div> @@ -38,10 +40,10 @@ <div id="port-concurrent-task-container" class="port-setting"> <div class="setting-name"> 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 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 class="port-setting"> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-details.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-details.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-details.jsp index 8b0028f..df3deef 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-details.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/port-details.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ 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="port-setting"> <div class="setting-name">Port name</div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp index f8e8126..d4da03e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-configuration.jsp @@ -18,17 +18,11 @@ <div id="process-group-configuration"> <div id="process-group-configuration-header-text" class="settings-header-text">Process Group Configuration</div> <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-refresh-button" class="pointer settings-refresh-button" title="Refresh"></div> - <div class="settings-last-refreshed-container"> - Last updated: <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> + <button id="add-process-group-configuration-controller-service" class="add-button fa fa-plus"></button> <div class="clear"></div> </div> - <div class="settings-tab-background"></div> <div> <div id="general-process-group-configuration-tab-content" class="configuration-tab"> <div id="general-process-group-configuration"> @@ -61,4 +55,11 @@ </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: <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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp index 534e8d6..a2fae86 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/process-group-details.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ 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="setting"> <div class="setting-name">Name</div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp index 3d24e5a..c3a44e6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/processor-configuration.jsp @@ -15,15 +15,15 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="processor-configuration" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> - <div class="processor-configuration-tab-container"> - <div id="processor-configuration-tabs"></div> +<div id="processor-configuration" layout="column" class="hidden large-dialog"> + <div class="processor-configuration-tab-container dialog-content"> + <div id="processor-configuration-tabs" class="tab-container"></div> <div id="processor-configuration-tabs-content"> <div id="processor-standard-settings-tab-content" class="configuration-tab"> <div class="settings-left"> <div class="setting"> <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"/> <div class="processor-enabled-container"> <div id="processor-enabled" class="nf-checkbox checkbox-unchecked"></div> @@ -47,7 +47,7 @@ <div class="penalty-duration-setting"> <div class="setting-name"> 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 class="setting-field"> <input type="text" id="penalty-duration" name="penalty-duration" class="small-setting-input"/> @@ -56,7 +56,7 @@ <div class="yield-duration-setting"> <div class="setting-name"> 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 class="setting-field"> <input type="text" id="yield-duration" name="yield-duration" class="small-setting-input"/> @@ -68,7 +68,7 @@ <div class="bulletin-setting"> <div class="setting-name"> 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 class="setting-field"> <div id="bulletin-level-combo"></div> @@ -82,7 +82,7 @@ <div class="setting"> <div class="setting-name"> 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 class="setting-field"> <div id="auto-terminate-relationship-names"></div> @@ -96,7 +96,7 @@ <div class="scheduling-strategy-setting"> <div class="setting-name"> 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 class="setting-field"> <div type="text" id="scheduling-strategy-combo"></div> @@ -112,7 +112,7 @@ <div class="concurrently-schedulable-tasks-setting"> <div class="setting-name"> 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 class="setting-field"> <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="setting-name"> 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 class="setting-field"> <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="setting-name"> 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 class="setting-field"> <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="setting-name"> 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 class="setting-field"> <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="setting-name"> 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 class="setting-field"> <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-name"> Run duration - <img class="setting-icon icon-info" src="images/iconInfo.png" 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 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> </div> <div class="setting-field" style="overflow: visible;"> <div id="run-duration-container"> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/queue-listing.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/queue-listing.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/queue-listing.jsp index b7d4622..c81a7a9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/queue-listing.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/queue-listing.jsp @@ -15,16 +15,11 @@ limitations under the License. --%> <%@ 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-text"></div> </div> <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: <span id="queue-listing-last-refreshed"></span> - </div> - <div id="queue-listing-loading-container" class="loading-container"></div> <div id="queue-listing-stats"> Displaying <span id="displayed-flowfiles"></span> of <span id="total-flowfiles-count"></span> (<span id="total-flowfiles-size"></span>) </div> @@ -32,4 +27,11 @@ </div> <div id="queue-listing-table"></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: <span id="queue-listing-last-refreshed"></span> + </div> + <div id="queue-listing-loading-container" class="loading-container"></div> + </div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-port-configuration.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-port-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-port-configuration.jsp index d3ac0c0..46701b4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-port-configuration.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-port-configuration.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ 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="setting"> <div class="setting-name">Name</div> @@ -28,7 +28,7 @@ <div class="setting"> <div class="setting-name"> 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 class="setting-field"> <input id="remote-port-concurrent-tasks" type="text"/> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-configuration.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-configuration.jsp b/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 index c54874a..8ad6a73 100644 --- a/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 +++ b/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 @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ 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="setting"> <div class="setting-name">Name</div> @@ -36,30 +36,9 @@ </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-name"> 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 class="setting-field"> <div id="remote-process-group-transport-protocol-combo"></div> @@ -69,7 +48,7 @@ <div class="remote-process-group-proxy-host-setting"> <div class="setting-name"> 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 class="setting-field"> <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="setting-name"> 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 class="setting-field"> <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="setting-name"> 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 class="setting-field"> <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="setting-name"> 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 class="setting-field"> <input type="password" class="small-setting-input" id="remote-process-group-proxy-password"/> @@ -107,5 +86,26 @@ </div> <div class="clear"></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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-details.jsp ---------------------------------------------------------------------- diff --git a/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 b/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 index 2f27987..e368d46 100644 --- a/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 +++ b/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 @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ 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="setting"> <div class="setting-name">Name</div> @@ -36,30 +36,9 @@ </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-name"> 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 class="setting-field"> <div id="read-only-remote-process-group-transport-protocol"></div> @@ -69,7 +48,7 @@ <div class="remote-process-group-proxy-host-setting"> <div class="setting-name"> 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 class="setting-field"> <span id="read-only-remote-process-group-proxy-host"></span> @@ -78,7 +57,7 @@ <div class="remote-process-group-proxy-port-setting"> <div class="setting-name"> 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 class="setting-field"> <span id="read-only-remote-process-group-proxy-port"></span> @@ -90,7 +69,7 @@ <div class="remote-process-group-proxy-user-setting"> <div class="setting-name"> 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 class="setting-field"> <span id="read-only-remote-process-group-proxy-user"></span> @@ -99,7 +78,7 @@ <div class="remote-process-group-proxy-password-setting"> <div class="setting-name"> 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 class="setting-field"> <span id="read-only-remote-process-group-proxy-password"></span> @@ -107,5 +86,26 @@ </div> <div class="clear"></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> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/remote-process-group-ports.jsp ---------------------------------------------------------------------- diff --git a/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 b/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 index b77e2e3..8899f33 100644 --- a/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 +++ b/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 @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ 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"> <span id="remote-process-group-ports-id" class="hidden"></span> <div class="settings-left"> http://git-wip-us.apache.org/repos/asf/nifi/blob/8b27ed90/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/reporting-task-configuration.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/reporting-task-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/reporting-task-configuration.jsp index 7f542cb..8e780c0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/reporting-task-configuration.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/reporting-task-configuration.jsp @@ -15,9 +15,9 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="reporting-task-configuration" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> - <div class="reporting-task-configuration-tab-container"> - <div id="reporting-task-configuration-tabs"></div> +<div id="reporting-task-configuration" class="hidden large-dialog"> + <div class="reporting-task-configuration-tab-container dialog-content"> + <div id="reporting-task-configuration-tabs" class="tab-container"></div> <div id="reporting-task-configuration-tabs-content"> <div id="reporting-task-standard-settings-tab-content" class="configuration-tab"> <div class="settings-left"> @@ -52,7 +52,7 @@ <div class="setting"> <div class="setting-name"> 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 class="reporting-task-editable setting-field"> <div id="reporting-task-scheduling-strategy-combo"></div> @@ -64,7 +64,7 @@ <div class="setting"> <div class="setting-name"> 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 class="reporting-task-editable setting-field"> <input type="text" id="reporting-task-timer-driven-scheduling-period" class="reporting-task-scheduling-period"/>
