[NIFI-1782] update toolbox, new global menu, and new pallattes...also introduced frontend-maven-plugin to allow bower to manage pulling in 3rd party libs at build time and not shipped with the source. This closes #395
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/1df8fe44 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/1df8fe44 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/1df8fe44 Branch: refs/heads/master Commit: 1df8fe44c4aaa3eb51246a1a2804050b412ee123 Parents: 50c02ee Author: Scott Aslan <[email protected]> Authored: Tue May 3 13:54:00 2016 -0400 Committer: Matt Gilman <[email protected]> Committed: Tue May 3 14:20:46 2016 -0400 ---------------------------------------------------------------------- LICENSE | 131 +- nifi-assembly/LICENSE | 97 +- nifi-assembly/NOTICE | 7 + .../src/main/resources/META-INF/LICENSE | 192 + .../src/main/resources/META-INF/NOTICE | 7 + .../nifi-framework/nifi-web/nifi-web-ui/pom.xml | 66 +- .../nifi-web-ui/src/main/frontend/bower.json | 18 + .../src/main/resources/META-INF/LICENSE | 44 + .../src/main/resources/META-INF/NOTICE | 12 + .../main/resources/filters/canvas.properties | 20 +- .../src/main/webapp/WEB-INF/pages/canvas.jsp | 21 +- .../WEB-INF/partials/canvas/canvas-header.jsp | 168 +- .../partials/canvas/component-state-dialog.jsp | 2 +- .../canvas/connection-configuration.jsp | 2 +- .../canvas/controller-service-configuration.jsp | 2 +- .../disable-controller-service-dialog.jsp | 2 +- .../canvas/drop-request-status-dialog.jsp | 2 +- .../canvas/enable-controller-service-dialog.jsp | 2 +- .../partials/canvas/fill-color-dialog.jsp | 2 +- .../WEB-INF/partials/canvas/flow-status.jsp | 53 +- .../partials/canvas/flowfile-details-dialog.jsp | 2 +- .../canvas/instantiate-template-dialog.jsp | 2 +- .../partials/canvas/label-configuration.jsp | 2 +- .../canvas/listing-request-status-dialog.jsp | 2 +- .../WEB-INF/partials/canvas/navigation.jsp | 170 +- .../canvas/new-controller-service-dialog.jsp | 2 +- .../WEB-INF/partials/canvas/new-port-dialog.jsp | 2 +- .../canvas/new-process-group-dialog.jsp | 2 +- .../partials/canvas/new-processor-dialog.jsp | 2 +- .../canvas/new-remote-process-group-dialog.jsp | 2 +- .../canvas/new-reporting-task-dialog.jsp | 2 +- .../partials/canvas/port-configuration.jsp | 2 +- .../WEB-INF/partials/canvas/port-details.jsp | 2 +- .../canvas/process-group-configuration.jsp | 2 +- .../partials/canvas/process-group-details.jsp | 2 +- .../partials/canvas/processor-configuration.jsp | 2 +- .../remote-process-group-configuration.jsp | 2 +- .../canvas/remote-process-group-details.jsp | 2 +- .../canvas/remote-process-group-ports.jsp | 2 +- .../canvas/reporting-task-configuration.jsp | 2 +- .../nifi-web-ui/src/main/webapp/css/banner.css | 32 +- .../nifi-web-ui/src/main/webapp/css/canvas.css | 4 +- .../src/main/webapp/css/flow-status.css | 171 +- .../nifi-web-ui/src/main/webapp/css/graph.css | 6 +- .../nifi-web-ui/src/main/webapp/css/header.css | 681 +- .../nifi-web-ui/src/main/webapp/css/main.css | 27 + .../src/main/webapp/css/navigation.css | 283 +- .../src/main/webapp/fonts/flowfont/flowfont.css | 74 + .../src/main/webapp/fonts/flowfont/flowfont.eot | Bin 0 -> 16668 bytes .../src/main/webapp/fonts/flowfont/flowfont.svg | 44 + .../src/main/webapp/fonts/flowfont/flowfont.ttf | Bin 0 -> 16500 bytes .../main/webapp/fonts/flowfont/flowfont.woff | Bin 0 -> 8544 bytes .../main/webapp/fonts/flowfont/flowfont.woff2 | Bin 0 -> 7248 bytes .../src/main/webapp/images/bgBannerFoot.png | Bin 189 -> 0 bytes .../src/main/webapp/images/bgBannerHead.png | Bin 422 -> 0 bytes .../src/main/webapp/images/bgNifiToolbar.png | Bin 2123 -> 0 bytes .../main/webapp/images/bgNifiToolbarEdge.png | Bin 541 -> 0 bytes .../src/main/webapp/images/bgStatusPanel.png | Bin 229 -> 0 bytes .../nifi-web-ui/src/main/webapp/images/grid.gif | Bin 135 -> 0 bytes .../main/webapp/images/iconBulletinBoard.png | Bin 2523 -> 0 bytes .../src/main/webapp/images/iconCluster.png | Bin 2112 -> 0 bytes .../src/main/webapp/images/iconCounter.png | Bin 1369 -> 0 bytes .../src/main/webapp/images/iconFlowSettings.png | Bin 2624 -> 0 bytes .../src/main/webapp/images/iconHistory.png | Bin 2347 -> 0 bytes .../src/main/webapp/images/iconReporting.png | Bin 803 -> 0 bytes .../src/main/webapp/images/iconSmallFunnel.png | Bin 455 -> 0 bytes .../main/webapp/images/iconSmallInputPort.png | Bin 216 -> 0 bytes .../main/webapp/images/iconSmallOutputPort.png | Bin 264 -> 0 bytes .../webapp/images/iconSmallProcessGroup.png | Bin 479 -> 0 bytes .../images/iconSmallRemoteProcessGroup.png | Bin 402 -> 0 bytes .../src/main/webapp/images/iconTemplates.png | Bin 2659 -> 0 bytes .../src/main/webapp/images/nifi-drop.svg | 17 + .../src/main/webapp/images/nifi-logo.svg | 17 + .../main/webapp/images/toolboxIconFunnel.png | Bin 2409 -> 0 bytes .../main/webapp/images/toolboxIconInputPort.png | Bin 2680 -> 0 bytes .../src/main/webapp/images/toolboxIconLabel.png | Bin 2871 -> 0 bytes .../webapp/images/toolboxIconOutputPort.png | Bin 2209 -> 0 bytes .../webapp/images/toolboxIconProcessGroup.png | Bin 4176 -> 0 bytes .../main/webapp/images/toolboxIconProcessor.png | Bin 4426 -> 0 bytes .../images/toolboxIconRemoteProcessGroup.png | Bin 5653 -> 0 bytes .../main/webapp/images/toolboxIconTemplate.png | Bin 2913 -> 0 bytes .../src/main/webapp/js/angular/LICENSE | 21 - .../angular-animate/angular-animate.min.js | 56 - .../js/angular/angular-aria/angular-aria.min.js | 14 - .../webapp/js/angular/angular-material/LICENSE | 21 - .../angular-material/angular-material.css | 23185 ----------------- .../angular-material/angular-material.min.js | 15 - .../angular-messages/angular-messages.min.js | 12 - .../angular-resource/angular-resource.min.js | 15 - .../angular/angular-route/angular-route.min.js | 15 - .../angular-sanitize/angular-sanitize.min.js | 15 - .../src/main/webapp/js/angular/angular.min.js | 311 - .../controllers/nf-ng-breadcrumbs-controller.js | 14 +- .../controllers/nf-ng-canvas-app-controller.js | 14 +- .../nf-ng-canvas-global-menu-controller.js | 344 + .../nf-ng-canvas-graph-controls-controller.js | 185 + .../nf-ng-canvas-header-controller.js | 119 + .../nf-ng-canvas-navigate-controller.js | 85 + .../nf-ng-canvas-operate-controller.js | 284 + .../nf-ng-canvas-toolbox-controller.js | 169 + .../directives/nf-ng-breadcrumbs-directive.js | 7 +- .../directives/nf-ng-draggable-directive.js | 34 + .../header/components/nf-ng-funnel-component.js | 107 + .../header/components/nf-ng-group-component.js | 221 + .../components/nf-ng-input-port-component.js | 214 + .../header/components/nf-ng-label-component.js | 109 + .../components/nf-ng-output-port-component.js | 205 + .../components/nf-ng-processor-component.js | 573 + .../nf-ng-remote-process-group-component.js | 212 + .../components/nf-ng-template-component.js | 221 + .../src/main/webapp/js/nf/canvas/nf-actions.js | 31 +- .../src/main/webapp/js/nf/canvas/nf-birdseye.js | 219 +- .../webapp/js/nf/canvas/nf-canvas-header.js | 303 - .../webapp/js/nf/canvas/nf-canvas-toolbar.js | 171 - .../webapp/js/nf/canvas/nf-canvas-toolbox.js | 1175 - .../src/main/webapp/js/nf/canvas/nf-canvas.js | 75 +- .../webapp/js/nf/canvas/nf-component-state.js | 3 - .../js/nf/canvas/nf-connection-configuration.js | 3 - .../main/webapp/js/nf/canvas/nf-context-menu.js | 4 +- .../js/nf/canvas/nf-controller-service.js | 9 - .../webapp/js/nf/canvas/nf-graph-control.js | 140 - .../src/main/webapp/js/nf/canvas/nf-graph.js | 6 +- .../js/nf/canvas/nf-ng-canvas-app-config.js | 83 +- .../js/nf/canvas/nf-port-configuration.js | 3 - .../main/webapp/js/nf/canvas/nf-port-details.js | 3 - .../nf/canvas/nf-process-group-configuration.js | 3 - .../js/nf/canvas/nf-process-group-details.js | 3 - .../js/nf/canvas/nf-processor-configuration.js | 6 +- .../webapp/js/nf/canvas/nf-queue-listing.js | 6 - .../nf-remote-process-group-configuration.js | 3 - .../canvas/nf-remote-process-group-details.js | 3 - .../nf/canvas/nf-remote-process-group-ports.js | 3 - .../webapp/js/nf/canvas/nf-reporting-task.js | 3 - .../src/main/webapp/js/nf/canvas/nf-search.js | 16 +- .../main/webapp/js/nf/canvas/nf-selectable.js | 4 +- .../src/main/webapp/js/nf/canvas/nf-settings.js | 9 +- .../webapp/js/nf/canvas/nf-toolbar-action.js | 96 - .../src/main/webapp/js/nf/nf-ng-bridge.js | 32 +- 138 files changed, 4588 insertions(+), 27038 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index cda3e86..8ea8b3c 100644 --- a/LICENSE +++ b/LICENSE @@ -517,9 +517,9 @@ For details see https://github.com/svenkubiak/jBCrypt/blob/0.4.1/LICENSE ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -This product bundles 'Angular' which is available under an MIT license. +This product bundles 'Fontello' which is available under an MIT license. - Copyright (c) 2010-2016 Google, Inc. http://angularjs.org + Copyright (C) 2011 by Vitaly Puzrin Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -538,130 +538,3 @@ This product bundles 'Angular' which is available under an MIT license. LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -This product bundles 'Angular Material' which is available under an MIT license. - - Copyright (c) 2014-2016 Google, Inc. http://angularjs.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - -This product bundles 'Angular Aria' which is available under an MIT license. - - Copyright (c) 2010-2016 Google, Inc. http://angularjs.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - -This product bundles 'Angular Animate' which is available under an MIT license. - - Copyright (c) 2010-2016 Google, Inc. http://angularjs.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - -This product bundles 'Angular Route' which is available under an MIT license. - - Copyright (c) 2010-2016 Google, Inc. http://angularjs.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - -This product bundles 'Angular Resource' which is available under an MIT license. - - Copyright (c) 2010-2016 Google, Inc. http://angularjs.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - -This product bundles 'Angular Sanitize' which is available under an MIT license. - - Copyright (c) 2010-2016 Google, Inc. http://angularjs.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-assembly/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-assembly/LICENSE b/nifi-assembly/LICENSE index a89e33f..d923dde 100644 --- a/nifi-assembly/LICENSE +++ b/nifi-assembly/LICENSE @@ -533,7 +533,7 @@ This product bundles 'Angular' which is available under an MIT license. This product bundles 'Angular Material' which is available under an MIT license. - Copyright (c) 2014 Google, Inc. http://angularjs.org + Copyright (c) 2014-2016 Google, Inc. http://angularjs.org Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -637,93 +637,7 @@ This product bundles 'Angular Resource' which is available under an MIT license. LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -This product bundles 'Angular' which is available under an MIT license. - - Copyright (c) 2010-2016 Google, Inc. http://angularjs.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - -This product bundles 'Angular Material' which is available under an MIT license. - - Copyright (c) 2014-2016 Google, Inc. http://angularjs.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - -This product bundles 'Angular Aria' which is available under an MIT license. - - Copyright (c) 2010-2016 Google, Inc. http://angularjs.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - -This product bundles 'Angular Animate' which is available under an MIT license. - - Copyright (c) 2010-2016 Google, Inc. http://angularjs.org - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - -This product bundles 'Angular Route' which is available under an MIT license. +This product bundles 'Angular Sanitize' which is available under an MIT license. Copyright (c) 2010-2016 Google, Inc. http://angularjs.org @@ -744,7 +658,7 @@ This product bundles 'Angular Route' which is available under an MIT license. LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -This product bundles 'Angular Resource' which is available under an MIT license. +This product bundles 'Angular Messages' which is available under an MIT license. Copyright (c) 2010-2016 Google, Inc. http://angularjs.org @@ -765,9 +679,9 @@ This product bundles 'Angular Resource' which is available under an MIT license. LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -This product bundles 'Angular Sanitize' which is available under an MIT license. +This product bundles 'Fontello' which is available under an MIT license. - Copyright (c) 2010-2016 Google, Inc. http://angularjs.org + Copyright (C) 2011 by Vitaly Puzrin Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -785,6 +699,7 @@ This product bundles 'Angular Sanitize' which is available under an MIT license. AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. This product bundles HexViewJS available under an MIT License http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-assembly/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-assembly/NOTICE b/nifi-assembly/NOTICE index cfa667a..293088a 100644 --- a/nifi-assembly/NOTICE +++ b/nifi-assembly/NOTICE @@ -924,3 +924,10 @@ The following binary components are provided under the Creative Commons Zero lic (CC0v1.0) JSR166e for Twitter (com.twitter:jsr166e:jar:1.1.0 - https://github.com/twitter/jsr166e) +****************** +SIL OFL 1.1 +****************** + +The following binary components are provided under the SIL Open Font License 1.1 + (SIL OFL 1.1) FontAwesome (4.6.1 - http://fortawesome.github.io/Font-Awesome/license/) + http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE index 1d4b537..b8929d9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/LICENSE @@ -260,5 +260,197 @@ licenses. OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +This product bundles 'Angular' which is available under an MIT license. + + Copyright (c) 2010-2016 Google, Inc. http://angularjs.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +This product bundles 'Angular Material' which is available under an MIT license. + + Copyright (c) 2014-2016 Google, Inc. http://angularjs.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + +This product bundles 'Angular Aria' which is available under an MIT license. + + Copyright (c) 2010-2016 Google, Inc. http://angularjs.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + +This product bundles 'Angular Animate' which is available under an MIT license. + + Copyright (c) 2010-2016 Google, Inc. http://angularjs.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + +This product bundles 'Angular Route' which is available under an MIT license. + + Copyright (c) 2010-2016 Google, Inc. http://angularjs.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + +This product bundles 'Angular Resource' which is available under an MIT license. + + Copyright (c) 2010-2016 Google, Inc. http://angularjs.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + +This product bundles 'Angular Sanitize' which is available under an MIT license. + + Copyright (c) 2010-2016 Google, Inc. http://angularjs.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + +This product bundles 'Angular Messages' which is available under an MIT license. + + Copyright (c) 2010-2016 Google, Inc. http://angularjs.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + +This product bundles 'Fontello' which is available under an MIT license. + + Copyright (C) 2011 by Vitaly Puzrin + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE index 7d75d86..ac7f0b7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework-nar/src/main/resources/META-INF/NOTICE @@ -139,4 +139,11 @@ The following binary components are provided under the Eclipse Public License 1. (EPL 1.0)(LGPL 2.1) Logback Classic (ch.qos.logback:logback-classic:jar:1.1.3 - http://logback.qos.ch/) (EPL 1.0)(LGPL 2.1) Logback Core (ch.qos.logback:logback-core:jar:1.1.3 - http://logback.qos.ch/) +****************** +SIL OFL 1.1 +****************** + +The following binary components are provided under the SIL Open Font License 1.1 + (SIL OFL 1.1) FontAwesome (4.6.1 - http://fortawesome.github.io/Font-Awesome/license/) + http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml index ab2fa80..1d276c1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/pom.xml @@ -215,6 +215,49 @@ </webResources> </configuration> </plugin> + <plugin> + <groupId>com.github.eirslett</groupId> + <artifactId>frontend-maven-plugin</artifactId> + <version>1.0</version> + <configuration> + <workingDirectory>src/main/frontend</workingDirectory> + <installDirectory>${project.build.directory}/${project.build.finalName}/assets</installDirectory> + </configuration> + + <executions> + <execution> + <id>install node and npm</id> + <goals> + <goal>install-node-and-npm</goal> + </goals> + <phase>generate-resources</phase> + <configuration> + <nodeVersion>v0.10.18</nodeVersion> + <npmVersion>1.3.8</npmVersion> + </configuration> + </execution> + <execution> + <id>install bower</id> + <goals> + <goal>npm</goal> + </goals> + <configuration> + <arguments>install bower</arguments> + <workingDirectory>${project.build.directory}/${project.build.finalName}/assets</workingDirectory> + </configuration> + </execution> + <execution> + <id>bower install</id> + <goals> + <goal>bower</goal> + </goals> + <configuration> + <arguments>install ../../../src/main/frontend --config.directory=${project.build.directory}/${project.build.finalName}/assets</arguments> + <workingDirectory>${project.build.directory}/${project.build.finalName}/assets</workingDirectory> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <profiles> @@ -270,7 +313,6 @@ <include>${staging.dir}/js/nf/nf-storage.js</include> <include>${staging.dir}/js/nf/nf-ajax-setup.js</include> <include>${staging.dir}/js/nf/canvas/nf-snippet.js</include> - <include>${staging.dir}/js/nf/canvas/nf-canvas-toolbox.js</include> <include>${staging.dir}/js/nf/canvas/nf-custom-ui.js</include> <include>${staging.dir}/js/nf/canvas/nf-queue-listing.js</include> <include>${staging.dir}/js/nf/canvas/nf-component-state.js</include> @@ -300,10 +342,6 @@ <include>${staging.dir}/js/nf/canvas/nf-selectable.js</include> <include>${staging.dir}/js/nf/canvas/nf-connectable.js</include> <include>${staging.dir}/js/nf/canvas/nf-birdseye.js</include> - <include>${staging.dir}/js/nf/canvas/nf-toolbar-action.js</include> - <include>${staging.dir}/js/nf/canvas/nf-canvas-toolbar.js</include> - <include>${staging.dir}/js/nf/canvas/nf-graph-control.js</include> - <include>${staging.dir}/js/nf/canvas/nf-canvas-header.js</include> <include>${staging.dir}/js/nf/canvas/nf-search.js</include> <include>${staging.dir}/js/nf/canvas/nf-settings.js</include> <include>${staging.dir}/js/nf/canvas/nf-go-to.js</include> @@ -315,7 +353,22 @@ <include>${staging.dir}/js/nf/canvas/nf-ng-canvas-app-config.js</include> <include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-app-controller.js</include> <include>${staging.dir}/js/nf/canvas/controllers/nf-ng-breadcrumbs-controller.js</include> + <include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-header-controller.js</include> + <include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js</include> + <include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-global-menu-controller.js</include> + <include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-graph-controls-controller.js</include> + <include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-navigate-controller.js</include> + <include>${staging.dir}/js/nf/canvas/controllers/nf-ng-canvas-operate-controller.js</include> + <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-processor-component.js</include> + <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-input-port-component.js</include> + <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-output-port-component.js</include> + <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-group-component.js</include> + <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-remote-process-group-component.js</include> + <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-funnel-component.js</include> + <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-template-component.js</include> + <include>${staging.dir}/js/nf/canvas/header/components/nf-ng-label-component.js</include> <include>${staging.dir}/js/nf/canvas/directives/nf-ng-breadcrumbs-directive.js</include> + <include>${staging.dir}/js/nf/canvas/directives/nf-ng-draggable-directive.js</include> <include>${staging.dir}/js/nf/nf-ng-bridge.js</include> <include>${staging.dir}/js/nf/nf-ng-service-provider.js</include> </includes> @@ -568,6 +621,7 @@ <version>2.5</version> <configuration> <packagingIncludes> + assets/**/*, css/reset.css, css/reset.css.gz, css/message-page.css, @@ -596,7 +650,6 @@ js/d3/**/*, js/codemirror/**/*, js/jquery/**/*, - js/angular/**/*, js/nf/nf-namespace.js, js/nf/nf-namespace.js.gz, js/nf/nf-ng-namespace.js, @@ -646,6 +699,7 @@ <configuration> <excludes combine.children="append"> <exclude>nbactions.xml</exclude> + <exclude>src/main/frontend/bower.json</exclude> <exclude>src/main/webapp/js/json2.js</exclude> <exclude>src/main/webapp/js/jquery/</exclude> <exclude>src/main/webapp/js/d3/d3.min.js</exclude> http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/bower.json ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/bower.json b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/bower.json new file mode 100644 index 0000000..d9f5795 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/frontend/bower.json @@ -0,0 +1,18 @@ +{ + "name": "apache-nifi", + "private": true, + "ignore": [ + "**/.*", + "node_modules", + "bower_components", + "test", + "tests" + ], + "dependencies": { + "font-awesome": "fontawesome#^4.6.1", + "angular-material": "^1.0.8", + "angular-resource": "^1.5.5", + "angular-route": "^1.5.5", + "angular-sanitize": "^1.5.5" + } +} http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/LICENSE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/LICENSE b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/LICENSE index 9bb5fc5..5fa073f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/LICENSE +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/LICENSE @@ -603,3 +603,47 @@ This product bundles 'Angular Sanitize' which is available under an MIT license. LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +This product bundles 'Angular Messages' which is available under an MIT license. + + Copyright (c) 2010-2016 Google, Inc. http://angularjs.org + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + +This product bundles 'Fontello' which is available under an MIT license. + + Copyright (C) 2011 by Vitaly Puzrin + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + THE SOFTWARE. + + http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/NOTICE ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/NOTICE b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/NOTICE new file mode 100644 index 0000000..f777afc --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/META-INF/NOTICE @@ -0,0 +1,12 @@ +Apache NiFi +Copyright 2014-2016 The Apache Software Foundation +This product includes software developed at +The Apache Software Foundation (http://www.apache.org/). + +****************** +SIL OFL 1.1 +****************** + +The following binary components are provided under the SIL Open Font License 1.1 + (SIL OFL 1.1) FontAwesome (4.6.1 - http://fortawesome.github.io/Font-Awesome/license/) + http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties index 67a02f4..70cff30 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas.properties @@ -25,7 +25,6 @@ nf.canvas.script.tags=<script type="text/javascript" src="js/nf/nf-namespace.js? <script type="text/javascript" src="js/nf/canvas/nf-snippet.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-queue-listing.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-component-state.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/canvas/nf-canvas-toolbox.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-custom-ui.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-controller-service.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-reporting-task.js?${project.version}"></script>\n\ @@ -54,10 +53,6 @@ nf.canvas.script.tags=<script type="text/javascript" src="js/nf/nf-namespace.js? <script type="text/javascript" src="js/nf/canvas/nf-connectable.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-selectable.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-birdseye.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/canvas/nf-toolbar-action.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/canvas/nf-canvas-toolbar.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/canvas/nf-graph-control.js?${project.version}"></script>\n\ -<script type="text/javascript" src="js/nf/canvas/nf-canvas-header.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-search.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-settings.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-go-to.js?${project.version}"></script>\n\ @@ -68,7 +63,22 @@ nf.canvas.script.tags=<script type="text/javascript" src="js/nf/nf-namespace.js? <script type="text/javascript" src="js/nf/nf-ng-bridge.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/nf-ng-service-provider.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/controllers/nf-ng-breadcrumbs-controller.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/controllers/nf-ng-canvas-header-controller.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/controllers/nf-ng-canvas-toolbox-controller.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/controllers/nf-ng-canvas-global-menu-controller.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/controllers/nf-ng-canvas-graph-controls-controller.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/controllers/nf-ng-canvas-navigate-controller.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/controllers/nf-ng-canvas-operate-controller.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-processor-component.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-input-port-component.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-output-port-component.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-group-component.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-remote-process-group-component.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-funnel-component.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-template-component.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/header/components/nf-ng-label-component.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/directives/nf-ng-breadcrumbs-directive.js?${project.version}"></script>\n\ +<script type="text/javascript" src="js/nf/canvas/directives/nf-ng-draggable-directive.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/controllers/nf-ng-canvas-app-controller.js?${project.version}"></script>\n\ <script type="text/javascript" src="js/nf/canvas/nf-ng-canvas-app-config.js?${project.version}"></script> nf.canvas.style.tags=<link rel="stylesheet" href="css/canvas.css?${project.version}" type="text/css" /> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp index 6015e18..dac5032 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/pages/canvas.jsp @@ -37,6 +37,9 @@ <link rel="stylesheet" href="js/jquery/minicolors/jquery.minicolors.css" type="text/css" /> <link rel="stylesheet" href="js/jquery/slickgrid/css/slick.grid.css" type="text/css" /> <link rel="stylesheet" href="js/jquery/slickgrid/css/slick-default-theme.css" type="text/css" /> + <link rel="stylesheet" href="fonts/flowfont/flowfont.css" type="text/css" /> + <link rel="stylesheet" href="assets/angular-material/angular-material.css" type="text/css" /> + <link rel="stylesheet" href="assets/font-awesome/css/font-awesome.min.css" type="text/css" /> <script type="text/javascript" src="js/codemirror/lib/codemirror-compressed.js"></script> <script type="text/javascript" src="js/d3/d3.min.js"></script> <script type="text/javascript" src="js/jquery/jquery-2.1.1.min.js"></script> @@ -63,14 +66,14 @@ <script type="text/javascript" src="js/jquery/slickgrid/slick.dataview.js"></script> <script type="text/javascript" src="js/jquery/slickgrid/slick.core.js"></script> <script type="text/javascript" src="js/jquery/slickgrid/slick.grid.js"></script> - <script type="text/javascript" src="js/angular/angular.min.js"></script> - <script type="text/javascript" src="js/angular/angular-messages/angular-messages.min.js"></script> - <script type="text/javascript" src="js/angular/angular-resource/angular-resource.min.js"></script> - <script type="text/javascript" src="js/angular/angular-route/angular-route.min.js"></script> - <script type="text/javascript" src="js/angular/angular-aria/angular-aria.min.js"></script> - <script type="text/javascript" src="js/angular/angular-animate/angular-animate.min.js"></script> - <script type="text/javascript" src="js/angular/angular-material/angular-material.min.js"></script> - <script type="text/javascript" src="js/angular/angular-sanitize/angular-sanitize.min.js"></script> + <script type="text/javascript" src="assets/angular/angular.min.js"></script> + <script type="text/javascript" src="assets/angular-messages/angular-messages.min.js"></script> + <script type="text/javascript" src="assets/angular-resource/angular-resource.min.js"></script> + <script type="text/javascript" src="assets/angular-route/angular-route.min.js"></script> + <script type="text/javascript" src="assets/angular-aria/angular-aria.min.js"></script> + <script type="text/javascript" src="assets/angular-animate/angular-animate.min.js"></script> + <script type="text/javascript" src="assets/angular-material/angular-material.min.js"></script> + <script type="text/javascript" src="assets/angular-sanitize/angular-sanitize.min.js"></script> <script type="text/javascript" src="js/json2.js"></script> <script type="text/javascript" src="js/nf/nf-namespace.js?${project.version}"></script> <script type="text/javascript" src="js/nf/nf-ng-namespace.js?${project.version}"></script> @@ -86,6 +89,7 @@ <jsp:include page="/WEB-INF/partials/message-pane.jsp"/> <jsp:include page="/WEB-INF/partials/banners-main.jsp"/> <jsp:include page="/WEB-INF/partials/canvas/canvas-header.jsp"/> + <jsp:include page="/WEB-INF/partials/canvas/flow-status.jsp"/> <jsp:include page="/WEB-INF/partials/canvas/about-dialog.jsp"/> <jsp:include page="/WEB-INF/partials/ok-dialog.jsp"/> <jsp:include page="/WEB-INF/partials/yes-no-dialog.jsp"/> @@ -102,7 +106,6 @@ <jsp:include page="/WEB-INF/partials/canvas/instantiate-template-dialog.jsp"/> <jsp:include page="/WEB-INF/partials/canvas/fill-color-dialog.jsp"/> <jsp:include page="/WEB-INF/partials/canvas/connections-dialog.jsp"/> - <jsp:include page="/WEB-INF/partials/canvas/flow-status.jsp"/> <div id="canvas-container" class="unselectable"></div> <div id="canvas-tooltips"> <div id="processor-tooltips"></div> http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp index ed93e43..f129d91 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/canvas-header.jsp @@ -15,52 +15,128 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="header"> - <div id="nf-logo"></div> - <div id="nf-logo-name"></div> - <div id="toolbox-container"> - <div id="toolbox"></div> - <div id="toolbox-right-edge"></div> - </div> - <div id="toolbar"> - <div id="global-controls"></div> - <div id="utilities-container"> - <div id="utilities-border"></div> - <div id="utility-buttons"> - <div id="reporting-link" class="utility-button" title="Summary"></div> - <div id="counters-link" class="utility-button" title="Counters"></div> - <div id="history-link" class="utility-button" title="Flow Configuration History"></div> - <div id="provenance-link" class="utility-button" title="Data Provenance"></div> - <div id="flow-settings-link" class="utility-button" title="Controller Settings"></div> - <div id="templates-link" class="utility-button" title="Templates"></div> - <div id="cluster-link" class="utility-button" title="Cluster"></div> - <div id="bulletin-board-link" class="utility-button" title="Bulletin Board"></div> - </div> +<md-toolbar id="header" layout-align="space-between center" layout="row" class="md-small md-accent md-hue-1"> + <img id="nifi-logo" src="images/nifi-logo.svg"> + <div flex layout="row" layout-align="space-between center"> + <div id="component-container"> + <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.processor}}" + id="processor-component" class="component-button" + nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.processorComponent);"> + <i class="icon icon-processor"></i></button> + <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.inputPort}}" + id="port-in-component" class="component-button" + nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.inputPortComponent);"> + <i class="icon icon-port-in"></i></button> + <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.outputPort}}" + id="port-out-component" class="component-button" + nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.outputPortComponent);"> + <i class="icon icon-port-out"></i></button> + <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.processGroup}}" + id="group-component" class="component-button" + nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.groupComponent);"> + <i class="icon icon-group"></i></button> + <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.remoteProcessGroup}}" hide + show-gt-sm id="group-remote-component" class="component-button" + nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.remoteGroupComponent);"> + <i class="icon icon-group-remote"></i></button> + <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.funnel}}" + id="funnel-component" class="component-button" + nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.funnelComponent);"> + <i class="icon icon-funnel"></i></button> + <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.template}}" + id="template-component" class="component-button" + nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.templateComponent);"> + <i class="icon icon-template"></i></button> + <button title="{{appCtrl.serviceProvider.headerCtrl.toolboxCtrl.config.type.label}}" + id="label-component" class="component-button" + nf-draggable="appCtrl.serviceProvider.headerCtrl.toolboxCtrl.draggableComponentConfig(appCtrl.serviceProvider.headerCtrl.toolboxCtrl.labelComponent);"> + <i class="icon icon-label"></i></button> </div> - <div id="search-container"> - <input id="search-field" type="text"/> + <div layout="row" layout-align="space-between center"> + <div layout-align="space-between end" layout="column"> + <div layout="row" layout-align="space-between center" id="current-user-container"> + <span id="anonymous-user-alert" class="hidden fa fa-warning"></span> + <div></div> + <div id="current-user"></div> + </div> + <div id="login-link-container"> + <span id="login-link" class="link" + ng-click="appCtrl.serviceProvider.headerCtrl.loginLink.shell.launch();">login</span> + </div> + <div id="logout-link-container" style="display: none;"> + <span id="logout-link" class="link" + ng-click="appCtrl.serviceProvider.headerCtrl.logoutLink.logout();">logout</span> + </div> + </div> + <md-menu md-position-mode="target-right target" md-offset="-1 44"> + <button md-menu-origin id="global-menu-button" ng-click="$mdOpenMenu()"><i class="fa fa-navicon"></i> + </button> + <md-menu-content id="global-menu-content"> + <md-menu-item layout-align="space-around center"> + <a id="reporting-link" + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.summary.shell.launch();"><i + class="fa fa-table"></i>Summary</a> + </md-menu-item> + <md-menu-item layout-align="space-around center"> + <a id="counters-link" + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.counters.shell.launch();"><i + class="icon icon-counter"></i>Counters</a> + </md-menu-item> + <md-menu-item layout-align="space-around center"> + <a id="bulletin-board-link" + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.bulletinBoard.shell.launch();"><i + class="icon icon-bulletin"></i>Bulletin Board</a> + </md-menu-item> + <md-menu-divider></md-menu-divider> + <md-menu-item + ng-if="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.dataProvenance.enabled();" + layout-align="space-around center"> + <a id="provenance-link" + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.dataProvenance.shell.launch();"><i + class="icon icon-provenance"></i>Data Provenance</a> + </md-menu-item> + <md-menu-divider></md-menu-divider> + <md-menu-item layout-align="space-around center"> + <a id="flow-settings-link" + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.controllerSettings.shell.launch();"><i + class="fa fa-wrench"></i>Controller Settings</a> + </md-menu-item> + <md-menu-item ng-if="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.cluster.enabled();" + layout-align="space-around center"> + <a id="cluster-link" + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.cluster.shell.launch();"><i + class="fa fa-cubes"></i>Cluster</a> + </md-menu-item> + <md-menu-item layout-align="space-around center"> + <a id="history-link" + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.flowConfigHistory.shell.launch();"><i + class="fa fa-history"></i>Flow Configuration History</a> + </md-menu-item> + <md-menu-item ng-if="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.users.enabled();" + layout-align="space-around center"> + <a id="users-link" + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.users.shell.launch();;"><i + class="fa fa-users"></i>Users</a> + </md-menu-item> + <md-menu-divider></md-menu-divider> + <md-menu-item layout-align="space-around center"> + <a id="templates-link" + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.templates.shell.launch();"><i + class="icon icon-template"></i>Templates</a> + </md-menu-item> + <md-menu-divider></md-menu-divider> + <md-menu-item layout-align="space-around center"> + <a id="help-link" + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.help.shell.launch();"><i + class="fa fa-question-circle"></i>Help</a> + </md-menu-item> + <md-menu-item layout-align="space-around center"> + <a id="about-link" + ng-click="appCtrl.serviceProvider.headerCtrl.globalMenuCtrl.about.modal.show();"><i + class="fa fa-info-circle"></i>About</a> + </md-menu-item> + </md-menu-content> + </md-menu> </div> </div> - <div id="header-links-container"> - <ul class="links"> - <li id="current-user-container"> - <div id="anonymous-user-alert" class="hidden"></div> - <div id="current-user"></div> - <div class="clear"></div> - </li> - <li id="login-link-container"> - <span id="login-link" class="link">login</span> - </li> - <li id="logout-link-container" style="display: none;"> - <span id="logout-link" class="link">logout</span> - </li> - <li> - <span id="help-link" class="link">help</span> - </li> - <li> - <span id="about-link" class="link">about</span> - </li> - </ul> - </div> -</div> -<div id="search-flow-results"></div> +</md-toolbar> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp index 5338756..fa16eb1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/component-state-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="component-state-dialog"> +<div id="component-state-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div class="dialog-content"> <div class="setting"> <div class="setting-name">Name</div> http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp index 045b9e9..1e487c5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/connection-configuration.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="connection-configuration"> +<div id="connection-configuration" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div class="connection-configuration-tab-container"> <div id="connection-configuration-tabs"></div> <div id="connection-configuration-tabs-content"> http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp index 7a0f992..fefb0f3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/controller-service-configuration.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="controller-service-configuration"> +<div id="controller-service-configuration" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div class="controller-service-configuration-tab-container"> <div id="controller-service-configuration-tabs"></div> <div id="controller-service-configuration-tabs-content"> http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp index 0c77a10..0315064 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/disable-controller-service-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="disable-controller-service-dialog"> +<div id="disable-controller-service-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div class="dialog-content"> <div class="settings-left"> <div id="disable-controller-service-service-container" class="setting"> http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/drop-request-status-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/drop-request-status-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/drop-request-status-dialog.jsp index b001a1a..506ffac 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/drop-request-status-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/drop-request-status-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="drop-request-status-dialog"> +<div id="drop-request-status-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div class="dialog-content"> <div class="setting"> <div class="setting-field"> http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp index 0121e21..5f5a800 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/enable-controller-service-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="enable-controller-service-dialog"> +<div id="enable-controller-service-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div class="dialog-content"> <div class="settings-left"> <div id="enable-controller-service-service-container" class="setting"> http://git-wip-us.apache.org/repos/asf/nifi/blob/1df8fe44/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp index 8a7cb4e..fedfd96 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp @@ -15,7 +15,7 @@ limitations under the License. --%> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="fill-color-dialog"> +<div id="fill-color-dialog" nf-draggable="{containment: 'parent', handle: '.dialog-header'}"> <div class="dialog-content"> <div class="setting"> <div class="setting-name">Color</div>
