diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp index 75c3e95ce9..65257d2c3c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/history/history-content.jsp @@ -18,12 +18,18 @@
NiFi History
-
- A filter has been applied.  - Clear filter + - - +
+
+ A filter has been applied.  + Clear filter +
+ + +
+
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 e0cfcd6633..d243f9f588 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 @@ -63,7 +63,16 @@ #history-filter-container { position: absolute; right: 0px; + left: 0px; top: 15px; + font-family: Roboto; + font-size: 13px; + font-weight: normal; +} + +#cluster-history-message { + float: left; + margin-top: 30px; } #history-filter-button { @@ -73,10 +82,7 @@ #history-filter-overview { visibility: hidden; - font-family: Roboto; - font-size: 13px; margin-bottom: 5px; - font-weight: normal; } #history-purge-button { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history.js index b82d285bdc..0f436e9d96 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/history/nf-history.js @@ -31,7 +31,8 @@ nf.History = (function () { urls: { banners: '../nifi-api/flow/banners', about: '../nifi-api/flow/about', - currentUser: '../nifi-api/flow/current-user' + currentUser: '../nifi-api/flow/current-user', + clusterSummary: '../nifi-api/flow/cluster/summary' } }; @@ -48,6 +49,26 @@ nf.History = (function () { }).fail(nf.Common.handleAjaxError); }; + /** + * Loads the flow configuration and updated the cluster state. + * + * @returns xhr + */ + var loadClusterSummary = function () { + return $.ajax({ + type: 'GET', + url: config.urls.clusterSummary, + dataType: 'json' + }).done(function (response) { + var clusterSummary = response.clusterSummary; + + // if clustered, show message to indicate location of actions + if (clusterSummary.clustered === true) { + $('#cluster-history-message').show(); + } + }); + }; + /** * Initializes the history page. */ @@ -116,6 +137,8 @@ nf.History = (function () { // load the current user loadCurrentUser().done(function () { + loadClusterSummary(); + // create the history table nf.HistoryTable.init();