Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 8cc58fe80 -> d5a9a1a62
NIFI-250: - Updating button visibility to always show the enable/run buttons when the service/task is disabled/stopped. Previously the enable/run buttons were only visible the component did not have any validation errors. However, this caused the buttons to shift and the alignment to be off. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/d5a9a1a6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/d5a9a1a6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/d5a9a1a6 Branch: refs/heads/NIFI-250 Commit: d5a9a1a625e28f3d0a7d6ed72019e84088a05794 Parents: 8cc58fe Author: Matt Gilman <[email protected]> Authored: Thu Mar 12 12:36:17 2015 -0400 Committer: Matt Gilman <[email protected]> Committed: Thu Mar 12 12:36:17 2015 -0400 ---------------------------------------------------------------------- .../src/main/webapp/js/nf/canvas/nf-settings.js | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/d5a9a1a6/nifi/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/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js index 9263a9c..2659d90 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js @@ -756,12 +756,7 @@ nf.Settings = (function () { markup += '<img src="images/iconDisable.png" title="Disable" class="pointer disable-controller-service" style="margin-top: 2px;" /> '; } else if (dataContext.state === 'DISABLED') { markup += '<img src="images/iconEdit.png" title="Edit" class="pointer edit-controller-service" style="margin-top: 2px;" /> '; - - // only enable the enable icon if the service has no validation errors - if (nf.Common.isEmpty(dataContext.validationErrors)) { - markup += '<img src="images/iconEnable.png" title="Enable" class="pointer enable-controller-service" style="margin-top: 2px;"/> '; - } - + markup += '<img src="images/iconEnable.png" title="Enable" class="pointer enable-controller-service" style="margin-top: 2px;"/> '; markup += '<img src="images/iconDelete.png" title="Remove" class="pointer delete-controller-service" style="margin-top: 2px;" /> '; } } @@ -1314,12 +1309,7 @@ nf.Settings = (function () { markup += '<img src="images/iconStop.png" title="Stop" class="pointer stop-reporting-task" style="margin-top: 2px;" /> '; } else if (dataContext.state === 'STOPPED' || dataContext.state === 'DISABLED') { markup += '<img src="images/iconEdit.png" title="Edit" class="pointer edit-reporting-task" style="margin-top: 2px;" /> '; - - // only enable the start icon if the reporting task is stopped and has no validation errors - if (dataContext.state === 'STOPPED' && nf.Common.isEmpty(dataContext.validationErrors)) { - markup += '<img src="images/iconRun.png" title="Start" class="pointer start-reporting-task" style="margin-top: 2px;"/> '; - } - + markup += '<img src="images/iconRun.png" title="Start" class="pointer start-reporting-task" style="margin-top: 2px;"/> '; markup += '<img src="images/iconDelete.png" title="Remove" class="pointer delete-reporting-task" style="margin-top: 2px;" /> '; } }
