NIFI-85: - Using draggable on all dialogs that are applicable at the moment.
Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/9c08118f Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/9c08118f Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/9c08118f Branch: refs/heads/nifi-27 Commit: 9c08118f5718d21320c35e63144cd4eb0de78a9e Parents: 621b7f4 Author: Matt Gilman <[email protected]> Authored: Wed Dec 17 09:11:25 2014 -0500 Committer: Matt Gilman <[email protected]> Committed: Wed Dec 17 09:11:25 2014 -0500 ---------------------------------------------------------------------- .../framework/web/nifi-web-ui/src/main/webapp/css/main.css | 4 ++++ .../main/webapp/js/nf/canvas/nf-connection-configuration.js | 3 +++ .../src/main/webapp/js/nf/canvas/nf-port-configuration.js | 3 +++ .../src/main/webapp/js/nf/canvas/nf-port-details.js | 3 +++ .../webapp/js/nf/canvas/nf-process-group-configuration.js | 3 +++ .../src/main/webapp/js/nf/canvas/nf-process-group-details.js | 3 +++ .../main/webapp/js/nf/canvas/nf-processor-configuration.js | 3 ++- .../js/nf/canvas/nf-remote-process-group-configuration.js | 3 +++ .../webapp/js/nf/canvas/nf-remote-process-group-details.js | 3 +++ .../main/webapp/js/nf/canvas/nf-remote-process-group-ports.js | 3 +++ .../main/webapp/js/nf/canvas/nf-secure-port-configuration.js | 3 +++ .../src/main/webapp/js/nf/canvas/nf-secure-port-details.js | 3 +++ .../src/main/webapp/js/nf/nf-connection-details.js | 7 +++++++ .../nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js | 7 +++++++ 14 files changed, 50 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css index 2b93141..862db6e 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/css/main.css @@ -170,6 +170,10 @@ div.button-refresh-hover { background: transparent url(../images/buttonRefresh.png) no-repeat scroll top right; } +.ui-draggable .dialog-header { + cursor: move; +} + /* processor status styles */ div.disabled { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js index a8e4acc..ef387d6 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-connection-configuration.js @@ -1108,6 +1108,9 @@ nf.ConnectionConfiguration = (function () { resetDialog(); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); // initialize the properties tabs http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-configuration.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-configuration.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-configuration.js index 189f19f..49d2b01 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-configuration.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-configuration.js @@ -121,6 +121,9 @@ nf.PortConfiguration = (function () { $('#port-comments').val(''); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); }; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-details.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-details.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-details.js index 6b4bd8f..a2cba44 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-details.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-port-details.js @@ -39,6 +39,9 @@ nf.PortDetails = (function () { nf.Common.clearField('read-only-port-comments'); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); }, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js index de7a2d8..3603976 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js @@ -78,6 +78,9 @@ nf.ProcessGroupConfiguration = (function () { $('#process-group-comments').val(''); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); }, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js index 7c6badd..2f88c12 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-details.js @@ -38,6 +38,9 @@ nf.ProcessGroupDetails = (function () { nf.Common.clearField('read-only-process-group-comments'); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); }, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js index e755de2..31bd79e 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-processor-configuration.js @@ -427,7 +427,8 @@ nf.ProcessorConfiguration = (function () { } } }).draggable({ - handle: ".modal-header" + containment: 'parent', + handle: '.dialog-header' }); // initialize the bulletin combo http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js index 8920bdd..8e0ea8e 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-configuration.js @@ -91,6 +91,9 @@ nf.RemoteProcessGroupConfiguration = (function () { $('#remote-process-group-yield-duration').val(''); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); }, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js index 296652b..c75c244 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-details.js @@ -37,6 +37,9 @@ nf.RemoteProcessGroupDetails = (function () { $('#read-only-remote-process-group-yield-duration').val(''); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); }, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js index 3d68fe5..7cce907 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-remote-process-group-ports.js @@ -167,6 +167,9 @@ nf.RemoteProcessGroupPorts = (function () { $('#remote-process-group-output-ports-container').empty(); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); }; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js index 54e2bb2..7c119c8 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-configuration.js @@ -128,6 +128,9 @@ nf.SecurePortConfiguration = (function () { $('#allowed-groups').empty(); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); // listen for removal requests http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-details.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-details.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-details.js index 9b66b09..fec4229 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-details.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-secure-port-details.js @@ -83,6 +83,9 @@ nf.SecurePortDetails = (function () { $('#read-only-allowed-groups').empty(); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); }, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js index 4ba2a1d..ca3304f 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-connection-details.js @@ -345,6 +345,13 @@ nf.ConnectionDetails = (function () { } } }); + + if (overlayBackground) { + $('#connection-details').draggable({ + containment: 'parent', + handle: '.dialog-header' + }); + } }, /** http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/9c08118f/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js ---------------------------------------------------------------------- diff --git a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js index 480a380..da7c6e9 100644 --- a/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js +++ b/nar-bundles/framework-bundle/framework/web/nifi-web-ui/src/main/webapp/js/nf/nf-processor-details.js @@ -249,6 +249,13 @@ nf.ProcessorDetails = (function () { } } }); + + if (overlayBackground) { + $('#processor-details').draggable({ + containment: 'parent', + handle: '.dialog-header' + }); + } // function for formatting the property name var nameFormatter = function (row, cell, value, columnDef, dataContext) {
