Repository: nifi Updated Branches: refs/heads/master 7ffa30d21 -> f2f070c5b
NIFI-2468: Improved UI consistency. - Addressing comments from PR. Moving new service button below the tab pane. (+2 squashed commits) Squashed commits: [f746d09] NIFI-2468: - Addressing numerous inconsistencies throughout the UI (button placement above tables, timestamp styles, etc) [7d1fb09] addressing some inconsistencies This closes #794. Signed-off-by: Andy LoPresto <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f2f070c5 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f2f070c5 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f2f070c5 Branch: refs/heads/master Commit: f2f070c5bec65d3a49afb0b9daf91823530f0e8e Parents: 7ffa30d Author: Scott Aslan <[email protected]> Authored: Wed Aug 3 17:19:50 2016 -0400 Committer: Andy LoPresto <[email protected]> Committed: Fri Aug 5 12:32:06 2016 -0700 ---------------------------------------------------------------------- .../nifi/web/api/entity/ProcessGroupEntity.java | 19 ++++++++ .../apache/nifi/web/api/dto/EntityFactory.java | 1 + .../partials/canvas/component-state-dialog.jsp | 2 +- .../canvas/new-controller-service-dialog.jsp | 2 +- .../partials/canvas/new-processor-dialog.jsp | 2 +- .../canvas/new-reporting-task-dialog.jsp | 2 +- .../canvas/process-group-configuration.jsp | 2 +- .../partials/canvas/settings-content.jsp | 6 +-- .../partials/cluster/cluster-content.jsp | 2 +- .../partials/provenance/provenance-content.jsp | 4 +- .../partials/templates/templates-content.jsp | 2 +- .../src/main/webapp/css/common-ui.css | 25 +++++++--- .../nifi-web-ui/src/main/webapp/css/history.css | 5 +- .../src/main/webapp/css/policy-management.css | 9 +++- .../webapp/css/process-group-configuration.css | 14 +++--- .../src/main/webapp/css/provenance.css | 15 ++---- .../src/main/webapp/css/settings.css | 14 +++--- .../src/main/webapp/css/status-history.css | 3 +- .../src/main/webapp/css/templates.css | 6 +-- .../nifi-web-ui/src/main/webapp/css/users.css | 5 +- .../webapp/js/jquery/combo/jquery.combo.css | 1 + .../propertytable/jquery.propertytable.css | 2 +- .../js/nf/bulletin-board/nf-bulletin-board.js | 49 +++++++------------- .../nf-ng-canvas-toolbox-controller.js | 3 -- .../components/nf-ng-processor-component.js | 20 +------- .../src/main/webapp/js/nf/canvas/nf-actions.js | 10 ++-- .../webapp/js/nf/canvas/nf-component-state.js | 28 ++--------- .../js/nf/canvas/nf-controller-services.js | 24 +--------- .../nf/canvas/nf-process-group-configuration.js | 39 +++++++++++----- .../src/main/webapp/js/nf/canvas/nf-settings.js | 25 ++-------- .../webapp/js/nf/cluster/nf-cluster-table.js | 21 +-------- .../webapp/js/nf/counters/nf-counters-table.js | 20 +------- .../webapp/js/nf/history/nf-history-table.js | 2 - .../js/nf/provenance/nf-provenance-table.js | 19 +------- .../webapp/js/nf/summary/nf-summary-table.js | 22 ++------- .../js/nf/templates/nf-templates-table.js | 21 +-------- .../main/webapp/js/nf/users/nf-users-table.js | 21 +-------- 37 files changed, 160 insertions(+), 307 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java index 4db154a..7cc30d7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-client-dto/src/main/java/org/apache/nifi/web/api/entity/ProcessGroupEntity.java @@ -19,8 +19,11 @@ package org.apache.nifi.web.api.entity; import com.wordnik.swagger.annotations.ApiModelProperty; import org.apache.nifi.web.api.dto.ProcessGroupDTO; import org.apache.nifi.web.api.dto.status.ProcessGroupStatusDTO; +import org.apache.nifi.web.api.dto.util.TimeAdapter; import javax.xml.bind.annotation.XmlRootElement; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; +import java.util.Date; /** * A serialized representation of this class can be placed in the entity body of a request or response to or from the API. This particular entity holds a reference to a ProcessGroupDTO. @@ -31,6 +34,7 @@ public class ProcessGroupEntity extends ComponentEntity { private ProcessGroupDTO component; private ProcessGroupStatusDTO status; + private Date currentTime; private Integer runningCount; private Integer stoppedCount; private Integer invalidCount; @@ -179,4 +183,19 @@ public class ProcessGroupEntity extends ComponentEntity { public void setInactiveRemotePortCount(Integer inactiveRemotePortCount) { this.inactiveRemotePortCount = inactiveRemotePortCount; } + + /** + * @return current time on the server + */ + @XmlJavaTypeAdapter(TimeAdapter.class) + @ApiModelProperty( + value = "The current time on the system." + ) + public Date getCurrentTime() { + return currentTime; + } + + public void setCurrentTime(Date currentTime) { + this.currentTime = currentTime; + } } http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java index e50df8f..565826f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/dto/EntityFactory.java @@ -110,6 +110,7 @@ public final class EntityFactory { final ProcessGroupEntity entity = new ProcessGroupEntity(); entity.setRevision(revision); + entity.setCurrentTime(new Date()); if (dto != null) { entity.setPermissions(permissions); entity.setStatus(status); http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp index 3c7c3fb..9b6b3d5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp @@ -38,7 +38,7 @@ Displaying <span id="displayed-component-state-entries"></span> of <span id="total-component-state-entries"></span> </div> <div id="component-state-filter-container"> - <input type="text" id="component-state-filter"/> + <input type="text" id="component-state-filter" placeholder="Filter"/> </div> </div> <div class="clear"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/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 3777ca6..1373a98 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 @@ -26,7 +26,7 @@ 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"/> + <input type="text" id="controller-service-type-filter" placeholder="Filter"/> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/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 22a1811..c79ef89 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 @@ -27,7 +27,7 @@ id="total-processor-types"></span> </div> <div id="processor-type-filter-container"> - <input type="text" placeholder="Filter processor list" id="processor-type-filter"/> + <input type="text" placeholder="Filter" id="processor-type-filter"/> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/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 88df206..816b02a 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 @@ -26,7 +26,7 @@ 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"/> + <input type="text" id="reporting-task-type-filter" placeholder="Filter"/> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/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 be69652..f84f050 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 @@ -20,10 +20,10 @@ <div class="settings-container"> <div> <div id="process-group-configuration-tabs" class="settings-tabs tab-container"></div> - <button id="add-process-group-configuration-controller-service" class="add-button fa fa-plus"></button> <div class="clear"></div> </div> <div id="process-group-configuration-tabs-content"> + <button id="add-process-group-configuration-controller-service" class="add-button fa fa-plus" title="Create a new controller service"></button> <div id="general-process-group-configuration-tab-content" class="configuration-tab"> <div id="general-process-group-configuration"> <div class="setting"> http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp index 48854f1..7224419 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/settings-content.jsp @@ -20,10 +20,10 @@ <div class="settings-container"> <div> <div id="settings-tabs" class="settings-tabs tab-container"></div> - <button id="new-service-or-task" class="add-button fa fa-plus"></button> <div class="clear"></div> </div> <div id="settings-tabs-content"> + <button id="new-service-or-task" class="add-button fa fa-plus" title="Create a new controller service" style="display: block;"></button> <div id="general-settings-tab-content" class="configuration-tab"> <div id="general-settings"> <div class="setting"> @@ -56,10 +56,10 @@ </div> </div> </div> - <div id="controller-services-tab-content" class="configuration-tab"> + <div id="controller-services-tab-content" class="configuration-tab controller-settings-table"> <div id="controller-services-table" class="settings-table"></div> </div> - <div id="reporting-tasks-tab-content" class="configuration-tab"> + <div id="reporting-tasks-tab-content" class="configuration-tab controller-settings-table"> <div id="reporting-tasks-table" class="settings-table"></div> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp index 392642c..3874e24 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/cluster/cluster-content.jsp @@ -23,7 +23,7 @@ Displaying <span id="displayed-nodes"></span> of <span id="total-nodes"></span> </div> <div id="cluster-filter-container" class="filter-container"> - <input type="text" id="cluster-filter" class="filter"/> + <input type="text" id="cluster-filter" class="filter" placeholder="Filter"/> <div id="cluster-filter-type" class="filter-type"></div> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp index 10bf887..6312f69 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/provenance/provenance-content.jsp @@ -31,13 +31,13 @@ Oldest event available: <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"/> + <input type="text" placeholder="Filter" id="provenance-filter" class="filter"/> <div id="provenance-filter-type" class="filter-type"></div> </div> </div> <div id="provenance-search-container"> <div id="provenance-search-overview"> - <span id="provenance-query-message"></span> + <span id="provenance-query-message"> </span> <span id="clear-provenance-search" class="link">Clear search</span> </div> <button id="provenance-search-button" class="fa fa-search"></button> http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp index 19b1f67..d55ecdb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp @@ -25,7 +25,7 @@ Displaying <span id="displayed-templates"></span> of <span id="total-templates"></span> </div> <div id="templates-filter-container" class="filter-container"> - <input type="text" id="templates-filter" class="filter"/> + <input type="text" id="templates-filter" class="filter" placeholder="Filter"/> <div id="templates-filter-type" class="filter-type"></div> </div> </div> http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css index 3a5c793..9c947d5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css @@ -168,10 +168,6 @@ ul.links span.header-link-over { white-space: normal; } -input.filter-list { - color: #888; -} - .table-cell { overflow: hidden; white-space: nowrap; @@ -189,8 +185,22 @@ label { margin-bottom: 2px; } -input::placeholder { - color: #728e9b; /*base-color*/ +/* placeholder styles */ + +*::placeholder { + color: #728e9b; +} +*::-webkit-input-placeholder { + color: #728e9b; +} +*:-moz-placeholder { + color: #728e9b; +} +*::-moz-placeholder { + color: #728e9b; +} +*:-ms-input-placeholder { + color: #728e9b; } input[type=text], input[type=password], textarea { @@ -369,6 +379,7 @@ button.fa { color: #004849; font-size: 16px; cursor: pointer; + line-height: 23px; } button.icon { @@ -530,6 +541,7 @@ md-progress-linear > div { font-size: 12px; font-weight: 500; font-family: Roboto Slab; + text-transform: capitalize; padding-bottom: 4px; color: #262626; } @@ -549,6 +561,7 @@ md-progress-linear > div { width: 100%; color: #775351; font-size: 13px; + font-weight: 500; } .setting-header{ http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css index d243f9f..af29702 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/history.css @@ -51,7 +51,7 @@ } #history-last-refreshed { - font-weight: bold; + font-weight: 500; } #history-header { @@ -87,6 +87,7 @@ #history-purge-button { float: right; + padding-left: 4px; } @@ -145,7 +146,7 @@ div.history-details-name { #history-table { position: absolute; - top: 62px; + top: 66px; left: 0px; bottom: 47px; right: 0px; http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css index 6259c4f..0124106 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/policy-management.css @@ -33,8 +33,14 @@ margin-bottom: 24px; } +#delete-policy-button { + margin-top: -4px; +} + #new-policy-user-button { + margin-top: -4px; margin-right: 5px; + padding-left: 5px; } button.policy-button { @@ -178,7 +184,8 @@ div.policy-selected-component-type { } #policy-last-refreshed { - font-weight: bold; + color: #775351; + font-weight: 500; } /* http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css index 03c49cd..520e3e0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css @@ -26,10 +26,7 @@ } #add-process-group-configuration-controller-service { - margin-top: 4px; - position: absolute; - top: 0px; - right: 0px; + float: right; } /* settings tabs */ @@ -64,18 +61,21 @@ } #process-group-configuration-last-refreshed { - font-weight: bold; + color: #775351; + font-weight: 500; } /* general */ #general-process-group-configuration input, #general-process-group-configuration textarea { - font-size: 11px !important; - font-family: Verdana; width: 350px; vertical-align: middle; } #process-group-comments { height: 100px; +} + +#process-group-controller-services-tab-content { + top: 32px; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css index 3229c4c..f65011d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/provenance.css @@ -57,7 +57,7 @@ } #provenance-last-refreshed { - font-weight: bold; + font-weight: 500; } #provenance-header { @@ -75,10 +75,6 @@ div.provenance-panel { /* filter controls */ -#provenance-filter-controls { - float: right; -} - #provenance-filter-container { height: 24px; width: 100%; @@ -90,10 +86,6 @@ div.provenance-panel { float: left; } -input.provenance-filter-list { - color: #888; -} - #provenance-filter-type { float: left; } @@ -108,10 +100,9 @@ input.provenance-filter-list { /* provenance search controls */ #provenance-search-container { - float: right; - position: relative; + position: absolute; + right: 0; top: 38px; - height: 0px; } #provenance-search-button { http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css index d2f5ea4..7af87c7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/settings.css @@ -41,9 +41,7 @@ div.settings-container { } #new-service-or-task { - position: absolute; - top: 0px; - right: 0px; + float: right; } #settings-refresh-container { @@ -60,7 +58,7 @@ div.settings-tabs { } #settings-tabs-content { - top: 53px; + top: 43px; bottom: 48px; } @@ -93,14 +91,12 @@ div.settings-refresh-button { } #settings-last-refreshed { - font-weight: bold; + font-weight: 500; } /* general */ #general-settings input { - font-size: 11px !important; - font-family: Verdana; width: 350px; vertical-align: middle; } @@ -116,3 +112,7 @@ div.settings-buttons { div.settings-buttons div.button { float: left; } + +div.controller-settings-table { + top: 32px; +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css index 27d1869..ac969c2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css @@ -42,7 +42,8 @@ } #status-history-last-refreshed { - font-weight: bold; + color:#775351; + font-weight:500; } #status-history-loading-container { http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css index 0b85a58..5dd2210 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css @@ -57,7 +57,7 @@ } #templates-last-refreshed { - font-weight: bold; + font-weight: 500; } #templates-header { @@ -77,10 +77,6 @@ float: left; } -input.templates-filter-list { - color: #888; -} - #templates-filter-type { float: left; } http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/users.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/users.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/users.css index 1810e50..1cacd2b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/users.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/users.css @@ -56,7 +56,8 @@ } #users-last-refreshed { - font-weight: bold; + color: #775351; + font-weight: 500; } #users-header { @@ -65,7 +66,7 @@ #new-user-button { float: right; - margin-top: 4px; + padding-left: 5px; } /* users table */ http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css index 8df72b9..67ad499 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.css @@ -64,6 +64,7 @@ white-space: nowrap; text-overflow: ellipsis; width: 80%; + font-weight: normal; } div.selected-disabled-option { http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css index 4797192..4128e32 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css @@ -45,7 +45,7 @@ div.add-property-text { div.property-table { position: absolute; - top: 43px; + top: 42px; bottom: 0px; left: 0px; right: 0px; http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js index 88f6c22..1f0c206 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js @@ -58,9 +58,6 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) { banners: '../nifi-api/flow/banners', about: '../nifi-api/flow/about', bulletinBoard: '../nifi-api/flow/bulletin-board' - }, - styles: { - filterList: 'bulletin-board-filter-list' } }; @@ -77,17 +74,6 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) { $('#bulletin-board-container').empty(); }); - // define the function for filtering the list - $('#bulletin-board-filter').focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList); - } - }).addClass(config.styles.filterList); - // filter type $('#bulletin-board-filter-type').combo({ options: [{ @@ -314,26 +300,23 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) { var bulletinContainer = $('#bulletin-board-container'); // get the filter text - var filterField = $('#bulletin-board-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - var filter = filterField.val(); - if (filter !== '') { - // determine which field to filter on - var filterOption = $('#bulletin-board-filter-type').combo('getSelectedOption'); - data[filterOption.value] = filter; - - // append filtering message if necessary - if (filterText !== filter || filterType !== filterOption.text) { - var filterContent = $('<div class="bulletin-action"></div>').text('Filter ' + filterOption.text + ' matching \'' + filter + '\''); - appendAndScroll(bulletinContainer, filterContent.get(0)); - filterText = filter; - filterType = filterOption.text; - } - } else if (filterText !== null) { - appendAndScroll(bulletinContainer, '<div class="bulletin-action">Filter removed</div>'); - filterText = null; - filterType = null; + var filter = $('#bulletin-board-filter').val(); + if (filter !== '') { + // determine which field to filter on + var filterOption = $('#bulletin-board-filter-type').combo('getSelectedOption'); + data[filterOption.value] = filter; + + // append filtering message if necessary + if (filterText !== filter || filterType !== filterOption.text) { + var filterContent = $('<div class="bulletin-action"></div>').text('Filter ' + filterOption.text + ' matching \'' + filter + '\''); + appendAndScroll(bulletinContainer, filterContent.get(0)); + filterText = filter; + filterType = filterOption.text; } + } else if (filterText !== null) { + appendAndScroll(bulletinContainer, '<div class="bulletin-action">Filter removed</div>'); + filterText = null; + filterType = null; } return $.ajax({ http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js index 17e2882..8bd7fcd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js @@ -59,9 +59,6 @@ nf.ng.Canvas.ToolboxCtrl = function (processorComponent, template: 'Template', label: 'Label' }, - styles: { - filterList: 'filter-list' - }, urls: { api: '../nifi-api', controller: '../nifi-api/controller', http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js index abd4402..387bfd4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/header/components/nf-ng-processor-component.js @@ -160,12 +160,7 @@ nf.ng.ProcessorComponent = function (serviceProvider) { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#processor-type-filter'); - if (!filterField.hasClass(serviceProvider.headerCtrl.toolboxCtrl.config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#processor-type-filter').val(); }; /** @@ -176,7 +171,7 @@ nf.ng.ProcessorComponent = function (serviceProvider) { $('#processor-tag-cloud').tagcloud('clearSelectedTags'); // clear any filter strings - $('#processor-type-filter').addClass(serviceProvider.headerCtrl.toolboxCtrl.config.styles.filterList); + $('#processor-type-filter').val(''); // reapply the filter applyFilter(); @@ -260,17 +255,6 @@ nf.ng.ProcessorComponent = function (serviceProvider) { * Initialize the filter. */ init: function () { - // define the function for filtering the list - $('#processor-type-filter').focus(function () { - if ($(this).hasClass(serviceProvider.headerCtrl.toolboxCtrl.config.styles.filterList)) { - $(this).removeClass(serviceProvider.headerCtrl.toolboxCtrl.config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(serviceProvider.headerCtrl.toolboxCtrl.config.styles.filterList); - } - }).addClass(serviceProvider.headerCtrl.toolboxCtrl.config.styles.filterList); - // initialize the processor type table var processorTypesColumns = [ {id: 'type', name: 'Type', field: 'label', sortable: true, resizable: true}, http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js index 781bb20..ae878f2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-actions.js @@ -57,12 +57,10 @@ nf.Actions = (function () { dataType: 'json', contentType: 'application/json' }).fail(function (xhr, status, error) { - if (xhr.status === 400 || xhr.status === 404 || xhr.status === 409) { - nf.Dialog.showOkDialog({ - headerText: 'Update Resource', - dialogContent: nf.Common.escapeHtml(xhr.responseText) - }); - } + nf.Dialog.showOkDialog({ + headerText: 'Update Resource', + dialogContent: nf.Common.escapeHtml(xhr.responseText) + }); }); }; http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js index ce659d7..8be9afd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-component-state.js @@ -22,13 +22,6 @@ */ nf.ComponentState = (function () { - var config = { - filterText: 'Filter', - styles: { - filterList: 'filter-list' - } - }; - /** * Filters the component state table. */ @@ -105,12 +98,7 @@ nf.ComponentState = (function () { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#component-state-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#component-state-filter').val(); }; /** @@ -195,7 +183,7 @@ nf.ComponentState = (function () { $('#component-state-description').text(''); // clear any filter strings - $('#component-state-filter').addClass(config.styles.filterList).val(config.filterText); + $('#component-state-filter').val(''); // reset clear link $('#clear-link').removeClass('disabled').attr('title', ''); @@ -210,17 +198,9 @@ nf.ComponentState = (function () { return { init: function () { // intialize the component state filter - $('#component-state-filter').on('focus', function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).on('blur', function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).on('keyup', function () { + $('#component-state-filter').on('keyup', function () { applyFilter(); - }).addClass(config.styles.filterList).val(config.filterText); + }); // initialize the processor configuration dialog $('#component-state-dialog').modal({ http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js index 22becbc..46c2342 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-controller-services.js @@ -23,10 +23,6 @@ nf.ControllerServices = (function () { var initialized = false; var config = { - filterText: 'Filter', - styles: { - filterList: 'filter-list' - }, urls: { api: '../nifi-api', controllerServiceTypes: '../nifi-api/flow/controller-service-types' @@ -49,12 +45,7 @@ nf.ControllerServices = (function () { * accounts for that. */ var getControllerServiceTypeFilterText = function () { - var filterText = ''; - var filterField = $('#controller-service-type-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#controller-service-type-filter').val(); }; /** @@ -261,17 +252,6 @@ nf.ControllerServices = (function () { * Initializes the new controller service dialog. */ var initNewControllerServiceDialog = function () { - // define the function for filtering the list - $('#controller-service-type-filter').focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).addClass(config.styles.filterList).val(config.filterText); - // initialize the processor type table var controllerServiceTypesColumns = [ {id: 'type', name: 'Type', field: 'label', sortable: false, resizable: true}, @@ -387,7 +367,7 @@ nf.ControllerServices = (function () { clearSelectedControllerService(); // clear any filter strings - $('#controller-service-type-filter').addClass(config.styles.filterList).val(config.filterText); + $('#controller-service-type-filter').val(''); // clear the tagcloud $('#controller-service-tag-cloud').tagcloud('clearSelectedTags'); http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js index 7701950..708b345 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js @@ -20,10 +20,6 @@ nf.ProcessGroupConfiguration = (function () { var config = { - filterText: 'Filter', - styles: { - filterList: 'filter-list' - }, urls: { api: '../nifi-api' } @@ -123,6 +119,12 @@ nf.ProcessGroupConfiguration = (function () { url: config.urls.api + '/process-groups/' + encodeURIComponent(groupId), dataType: 'json' }).done(function (response) { + // store the process group + $('#process-group-configuration').data('process-group', response); + + // update the current time + $('#process-group-configuration-last-refreshed').text(response.currentTime); + if (response.permissions.canWrite) { var processGroup = response.component; @@ -177,6 +179,9 @@ nf.ProcessGroupConfiguration = (function () { reset(); }); + //reset content to account for possible policy changes + $('#process-group-configuration-tabs').find('.selected-tab').click(); + // adjust the table size nf.ProcessGroupConfiguration.resetTableSize(); }; @@ -185,6 +190,8 @@ nf.ProcessGroupConfiguration = (function () { * Resets the process group configuration dialog. */ var reset = function () { + $('#process-group-configuration').removeData('process-group'); + // reset button state $('#process-group-configuration-save').mouseout(); @@ -211,20 +218,28 @@ nf.ProcessGroupConfiguration = (function () { tabContentId: 'process-group-controller-services-tab-content' }], select: function () { + var processGroup = $('#process-group-configuration').data('process-group'); + var canWrite = nf.Common.isDefinedAndNotNull(processGroup) ? processGroup.permissions.canWrite : false; + var tab = $(this).text(); if (tab === 'General') { $('#add-process-group-configuration-controller-service').hide(); - $('#process-group-configuration-save').show(); + + if (canWrite) { + $('#process-group-configuration-save').show(); + } else { + $('#process-group-configuration-save').hide(); + } } else { - $('#add-process-group-configuration-controller-service').show(); $('#process-group-configuration-save').hide(); - // update the tooltip on the button - $('#add-process-group-configuration-controller-service').attr('title', function () { - if (tab === 'Controller Services') { - return 'Create a new controller service'; - } - }); + if (canWrite) { + $('#add-process-group-configuration-controller-service').show(); + $('#process-group-controller-services-tab-content').css('top', '32px'); + } else { + $('#add-process-group-configuration-controller-service').hide(); + $('#process-group-controller-services-tab-content').css('top', '0'); + } // resize the table nf.ProcessGroupConfiguration.resetTableSize(); http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js index f94368d..713a2c2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js @@ -20,10 +20,6 @@ nf.Settings = (function () { var config = { - filterText: 'Filter', - styles: { - filterList: 'filter-list' - }, urls: { api: '../nifi-api', controllerConfig: '../nifi-api/controller/config', @@ -256,12 +252,7 @@ nf.Settings = (function () { * accounts for that. */ var getReportingTaskTypeFilterText = function () { - var filterText = ''; - var filterField = $('#reporting-task-type-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#reporting-task-type-filter').val(); }; /** @@ -419,15 +410,7 @@ nf.Settings = (function () { } else { applyReportingTaskTypeFilter(); } - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).addClass(config.styles.filterList).val(config.filterText); + }); // initialize the processor type table var reportingTaskTypesColumns = [ @@ -574,7 +557,7 @@ nf.Settings = (function () { clearSelectedReportingTask(); // clear any filter strings - $('#reporting-task-type-filter').addClass(config.styles.filterList).val(config.filterText); + $('#reporting-task-type-filter').val(''); // clear the tagcloud $('#reporting-task-tag-cloud').tagcloud('clearSelectedTags'); @@ -1002,6 +985,7 @@ nf.Settings = (function () { } else { if (nf.Common.canModifyController()) { $('#new-service-or-task').show(); + $('div.controller-settings-table').css('top', '32px'); // update the tooltip on the button $('#new-service-or-task').attr('title', function () { @@ -1015,6 +999,7 @@ nf.Settings = (function () { }); } else { $('#new-service-or-task').hide(); + $('div.controller-settings-table').css('top', '0'); } // resize the table http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js index ff05e1f..e9a9e0e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster-table.js @@ -25,10 +25,6 @@ nf.ClusterTable = (function () { var config = { primaryNode: 'Primary Node', clusterCoorindator: 'Cluster Coordinator', - filterText: 'Filter', - styles: { - filterList: 'cluster-filter-list' - }, urls: { cluster: '../nifi-api/controller/cluster', nodes: '../nifi-api/controller/cluster/nodes' @@ -244,12 +240,7 @@ nf.ClusterTable = (function () { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#cluster-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#cluster-filter').val(); }; /** @@ -365,15 +356,7 @@ nf.ClusterTable = (function () { // define the function for filtering the list $('#cluster-filter').keyup(function () { applyFilter(); - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).addClass(config.styles.filterList).val(config.filterText); + }); // filter type $('#cluster-filter-type').combo({ http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js index 81854ee..22bf350 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/counters/nf-counters-table.js @@ -23,9 +23,6 @@ nf.CountersTable = (function () { * Configuration object used to hold a number of configuration items. */ var config = { - styles: { - filterList: 'counters-filter-list' - }, urls: { counters: '../nifi-api/counters' } @@ -61,12 +58,7 @@ nf.CountersTable = (function () { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#counters-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#counters-filter').val(); }; /** @@ -141,15 +133,7 @@ nf.CountersTable = (function () { // define the function for filtering the list $('#counters-filter').keyup(function () { applyFilter(); - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList); - } - }).addClass(config.styles.filterList); + }); // filter type $('#counters-filter-type').combo({ http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js index 299c622..ab1e9e6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history-table.js @@ -25,9 +25,7 @@ nf.HistoryTable = (function () { var config = { defaultStartTime: '00:00:00', defaultEndTime: '23:59:59', - filterText: 'Filter', styles: { - filterList: 'filter-list', hidden: 'hidden' }, urls: { http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js index 2eb6e02..09d25e5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance-table.js @@ -27,9 +27,7 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) { maxResults: 1000, defaultStartTime: '00:00:00', defaultEndTime: '23:59:59', - filterText: 'Filter', styles: { - filterList: 'provenance-filter-list', hidden: 'hidden' }, urls: { @@ -519,15 +517,7 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) { // define the function for filtering the list $('#provenance-filter').keyup(function () { applyFilter(); - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).addClass(config.styles.filterList).val(config.filterText); + }); // filter options var filterOptions = [{ @@ -797,12 +787,7 @@ nf.ng.ProvenanceTable = function (provenanceLineageCtrl) { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#provenance-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#provenance-filter').val(); }; /** http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js index 145ae1f..2dc31c2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js @@ -22,9 +22,6 @@ nf.SummaryTable = (function () { * Configuration object used to hold a number of configuration items. */ var config = { - styles: { - filterList: 'summary-filter-list' - }, urls: { api: '../nifi-api', status: '../nifi-api/flow/process-groups/root/status', @@ -59,15 +56,7 @@ nf.SummaryTable = (function () { // define the function for filtering the list $('#summary-filter').keyup(function () { applyFilter(); - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList); - } - }).addClass(config.styles.filterList); + }); // initialize the summary tabs $('#summary-tabs').tabbs({ @@ -236,7 +225,7 @@ nf.SummaryTable = (function () { } // reset the filter - $('#summary-filter').addClass(config.styles.filterList); + $('#summary-filter').val(''); applyFilter(); } }); @@ -2299,12 +2288,7 @@ nf.SummaryTable = (function () { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#summary-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#summary-filter').val(); }; /** http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js index 6afba5e..627bc05 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/templates/nf-templates-table.js @@ -23,10 +23,6 @@ nf.TemplatesTable = (function () { * Configuration object used to hold a number of configuration items. */ var config = { - filterText: 'Filter', - styles: { - filterList: 'templates-filter-list' - }, urls: { templates: '../nifi-api/flow/templates', downloadToken: '../nifi-api/access/download-token' @@ -126,12 +122,7 @@ nf.TemplatesTable = (function () { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#templates-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#templates-filter').val(); }; /** @@ -214,15 +205,7 @@ nf.TemplatesTable = (function () { // define the function for filtering the list $('#templates-filter').keyup(function () { applyFilter(); - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).addClass(config.styles.filterList).val(config.filterText); + }); // filter type $('#templates-filter-type').combo({ http://git-wip-us.apache.org/repos/asf/nifi/blob/f2f070c5/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js index b6a73f7..96efd73 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/users/nf-users-table.js @@ -23,10 +23,6 @@ nf.UsersTable = (function () { * Configuration object used to hold a number of configuration items. */ var config = { - filterText: 'Filter', - styles: { - filterList: 'users-filter-list' - }, urls: { users: '../nifi-api/tenants/users', userGroups: '../nifi-api/tenants/user-groups' @@ -480,15 +476,7 @@ nf.UsersTable = (function () { // define the function for filtering the list $('#users-filter').keyup(function () { applyFilter(); - }).focus(function () { - if ($(this).hasClass(config.styles.filterList)) { - $(this).removeClass(config.styles.filterList).val(''); - } - }).blur(function () { - if ($(this).val() === '') { - $(this).addClass(config.styles.filterList).val(config.filterText); - } - }).addClass(config.styles.filterList).val(config.filterText); + }); // filter type $('#users-filter-type').combo({ @@ -654,12 +642,7 @@ nf.UsersTable = (function () { * accounts for that. */ var getFilterText = function () { - var filterText = ''; - var filterField = $('#users-filter'); - if (!filterField.hasClass(config.styles.filterList)) { - filterText = filterField.val(); - } - return filterText; + return $('#users-filter').val(); }; /**
