Repository: nifi Updated Branches: refs/heads/master 21ed55669 -> aef17f9a8
[NIFI-3170] remove action details if user does not have read perms, also update action details styles to match other dialogs. This closes #1322 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/aef17f9a Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/aef17f9a Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/aef17f9a Branch: refs/heads/master Commit: aef17f9a8b5d9ce336f208987655134b59004b9a Parents: 21ed556 Author: Scott Aslan <[email protected]> Authored: Tue Dec 13 10:45:37 2016 -0500 Committer: Matt Gilman <[email protected]> Committed: Mon Dec 19 10:07:15 2016 -0500 ---------------------------------------------------------------------- .../nifi-web-ui/src/main/webapp/css/history.css | 20 ++++++++++++-------- .../webapp/js/nf/history/nf-history-table.js | 5 ++++- 2 files changed, 16 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/aef17f9a/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 af29702..d13000d 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 @@ -128,18 +128,22 @@ overflow-y: auto; } +#action-details-dialog { + width: 300px; + height: 500px; +} + div.action-detail { - margin-bottom: 5px; + margin-bottom: 15px; } div.history-details-name { - float: left; - color: #527991; - font-size: 10px; - font-weight: bold; - line-height: normal; - width: 100%; - margin-right: 10px; + font-size: 12px; + font-weight: 500; + font-family: Roboto Slab; + text-transform: capitalize; + padding-bottom: 4px; + color: #262626; } /* history table */ http://git-wip-us.apache.org/repos/asf/nifi/blob/aef17f9a/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 f952e30..5de2440 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 @@ -272,7 +272,10 @@ nf.HistoryTable = (function () { // define a custom formatter for the more details column var moreDetailsFormatter = function (row, cell, value, columnDef, dataContext) { - return '<div title="View Details" class="pointer show-action-details fa fa-info-circle" style="margin-top: 4px;"></div>'; + if(dataContext.canRead === true) { + return '<div title="View Details" class="pointer show-action-details fa fa-info-circle" style="margin-top: 4px;"></div>'; + } + return ""; }; // define how general values are formatted
