[NIFI-2371] fix cluster page padding
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/da5e4684 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/da5e4684 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/da5e4684 Branch: refs/heads/master Commit: da5e468489edc2ae588ef84f6d3e231a9e6f5f5f Parents: a73c8bb Author: Scott Aslan <[email protected]> Authored: Thu Jul 28 10:55:04 2016 -0400 Committer: joewitt <[email protected]> Committed: Fri Jul 29 12:12:00 2016 -0400 ---------------------------------------------------------------------- .../nifi-web-ui/src/main/webapp/css/cluster.css | 2 +- .../src/main/webapp/js/nf/cluster/nf-cluster.js | 36 +++++++++++--------- 2 files changed, 21 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/da5e4684/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/cluster.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/cluster.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/cluster.css index f515ecf..a4224be 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/cluster.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/cluster.css @@ -41,9 +41,9 @@ #cluster-refresh-container { position: absolute; - width: 100%; bottom: 0px; left: 20px; + right: 20px; } #cluster-loading-container { http://git-wip-us.apache.org/repos/asf/nifi/blob/da5e4684/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster.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.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster.js index 5577f14..8d4da55 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/cluster/nf-cluster.js @@ -116,6 +116,26 @@ nf.Cluster = (function () { // load the current user loadCurrentUser().done(function () { + var setBodySize = function () { + //alter styles if we're not in the shell + if (top === window) { + $('body').css({ + 'height': $(window).height() + 'px', + 'width': $(window).width() + 'px' + }); + + $('#cluster').css('margin', 40); + $('#cluster-table').css('bottom', 127); + $('#cluster-refresh-container').css('margin', 40); + } + + // configure the initial grid height + nf.ClusterTable.resetTableSize(); + }; + + // set the initial size + setBodySize(); + // create the counters table nf.ClusterTable.init(); @@ -123,22 +143,6 @@ nf.Cluster = (function () { nf.ClusterTable.loadClusterTable().done(function () { // once the table is initialized, finish initializing the page initializeClusterPage().done(function () { - var setBodySize = function () { - //alter styles if we're not in the shell - if (top === window) { - $('body').css({ - 'height': $(window).height() + 'px', - 'width': $(window).width() + 'px' - }); - - $('#cluster').css('margin', 40); - $('#cluster-table').css('bottom', 127); - $('#cluster-refresh-container').css('margin', 40); - } - - // configure the initial grid height - nf.ClusterTable.resetTableSize(); - }; // get the about details $.ajax({
