Repository: nifi Updated Branches: refs/heads/master dedd4fcda -> 25cadf5db
[NIFI-2396] Update Bulletin Board shell header and filter control position. This closes #732 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/25cadf5d Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/25cadf5d Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/25cadf5d Branch: refs/heads/master Commit: 25cadf5db1e8b7f1a687a6630976379b357ea8c1 Parents: dedd4fc Author: Scott Aslan <[email protected]> Authored: Wed Jul 27 16:41:18 2016 -0400 Committer: Matt Gilman <[email protected]> Committed: Thu Jul 28 09:09:25 2016 -0400 ---------------------------------------------------------------------- .../src/main/webapp/css/bulletin-board.css | 18 ++++++++++-------- .../nifi-web-ui/src/main/webapp/css/counters.css | 2 +- .../nifi-web-ui/src/main/webapp/css/history.css | 2 +- .../src/main/webapp/css/policy-management.css | 4 ++-- .../src/main/webapp/css/provenance.css | 2 ++ .../nifi-web-ui/src/main/webapp/css/settings.css | 2 ++ .../nifi-web-ui/src/main/webapp/css/templates.css | 2 +- .../js/nf/bulletin-board/nf-bulletin-board.js | 17 ++++++----------- .../main/webapp/js/nf/provenance/nf-provenance.js | 4 +++- 9 files changed, 28 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/25cadf5d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css index 253c86b..7a8ffda 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css @@ -24,7 +24,6 @@ bottom: 40px; left: 20px; right: 20px; - overflow: auto; } #bulletin-board-header-text { @@ -38,7 +37,7 @@ #bulletin-board-refresh-container { position: absolute; right: 20px; - bottom: 0px; + bottom: 40px; left: 20px; } @@ -81,17 +80,20 @@ /* bulletin board */ #bulletin-board-container { - overflow-y: auto; - width: 100%; - padding-top: 20px; + position: absolute; + top: 100px; + bottom: 50px; + overflow: auto; + left: 0px; + right: 0px; } div.bulletin-action { - font-weight: bold; - margin-bottom: 4px; font-family: Roboto; font-size: 13px; - color: #728e9b; + border-bottom: 1px solid #eaeef0; + line-height: 1.3; + padding: 10px; } div.bulletin { http://git-wip-us.apache.org/repos/asf/nifi/blob/25cadf5d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/counters.css ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/counters.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/counters.css index b2f0e77..40d240e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/counters.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/counters.css @@ -41,9 +41,9 @@ #counters-refresh-container { position: absolute; - width: 100%; bottom: 0px; left: 20px; + right: 20px; } #counters-loading-container { http://git-wip-us.apache.org/repos/asf/nifi/blob/25cadf5d/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 cf1014e..e0cfcd6 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 @@ -36,9 +36,9 @@ #history-refresh-container { position: absolute; - width: 100%; bottom: 0px; left: 20px; + right: 20px; } #history-loading-container { http://git-wip-us.apache.org/repos/asf/nifi/blob/25cadf5d/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 d46d7f0..919f4c0 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 @@ -151,7 +151,7 @@ div.policy-selected-component-type { position: absolute; top: 92px; left: 0px; - bottom: 0px; + bottom: 67px; right: 0px; overflow: hidden; background-color: #fff; @@ -161,7 +161,7 @@ div.policy-selected-component-type { position: absolute; bottom: 20px; left: 0px; - height: 32px; + right: 20px; } #policy-refresh-button { http://git-wip-us.apache.org/repos/asf/nifi/blob/25cadf5d/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 f704101..a0d5ef6 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 @@ -44,6 +44,8 @@ #provenance-refresh-container { position: absolute; bottom: 0px; + right: 0px; + left: 0px; } #provenance-loading-container { http://git-wip-us.apache.org/repos/asf/nifi/blob/25cadf5d/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 f99c15e..d2f5ea4 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 @@ -49,6 +49,8 @@ div.settings-container { #settings-refresh-container { position: absolute; bottom: 20px; + right: 20px; + left: 20px; } /* settings tabs */ http://git-wip-us.apache.org/repos/asf/nifi/blob/25cadf5d/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 4f7c794..0b85a58 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 @@ -42,9 +42,9 @@ #templates-refresh-container { position: absolute; - width: 100%; bottom: 0px; left: 20px; + right: 20px; } #templates-loading-container { http://git-wip-us.apache.org/repos/asf/nifi/blob/25cadf5d/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 52c7a03..c7ee9de 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 @@ -276,24 +276,19 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) { init: function () { //alter styles if we're not in the shell if (top === window) { - $('body').css({ - 'height': $(window).height() + 'px', - 'width': $(window).width() + 'px' + $('#bulletin-board').css({ + "position": "absolute", + "bottom": "40px", + "left": "40px", + "right": "40px", + "top": "40px" }); - - $('#bulletin-board').css('margin', 40); $('#bulletin-board-refresh-container').css({ "position": "absolute", - "width": "100%", "bottom": "40px", "left": "40px", "right": "40px" }); - - $('#bulletin-board-status-container').css({ - "float": "right", - "padding-right": "80px" - }); } nf.Storage.init(); http://git-wip-us.apache.org/repos/asf/nifi/blob/25cadf5d/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance.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.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance.js index 26bd285..320278f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/provenance/nf-provenance.js @@ -228,7 +228,9 @@ nf.Provenance = (function () { $('#provenance-table').css('bottom', 127); $('#provenance-refresh-container').css({ 'margin': '0px 0px 40px 0px', - 'bottom': '40px' + 'bottom': '40px', + 'left': '0px', + 'right': '0px' }); }
