Repository: incubator-nifi Updated Branches: refs/heads/NIFI-250 94d112b6e -> 448121384
NIFI-250: - Updating dialogs to address issues when showing the borders within the modal plugin (especially in the controller service configuration dialog). - Fixing availability when creating a controller service in standalone. Project: http://git-wip-us.apache.org/repos/asf/incubator-nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-nifi/commit/44812138 Tree: http://git-wip-us.apache.org/repos/asf/incubator-nifi/tree/44812138 Diff: http://git-wip-us.apache.org/repos/asf/incubator-nifi/diff/44812138 Branch: refs/heads/NIFI-250 Commit: 4481213849cee69537c23d54871c4dc07bd7fb87 Parents: 94d112b Author: Matt Gilman <matt.c.gil...@gmail.com> Authored: Mon Feb 9 13:28:20 2015 -0500 Committer: Matt Gilman <matt.c.gil...@gmail.com> Committed: Mon Feb 9 13:28:20 2015 -0500 ---------------------------------------------------------------------- .../partials/canvas/new-property-dialog.jsp | 34 ------ .../nifi-web-ui/src/main/webapp/css/about.css | 1 - .../webapp/css/connection-configuration.css | 1 - .../src/main/webapp/css/connection-details.css | 1 - .../css/controller-service-configuration.css | 1 - .../nifi-web-ui/src/main/webapp/css/dialog.css | 13 --- .../css/disable-controller-service-dialog.css | 1 - .../src/main/webapp/css/label-configuration.css | 1 - .../css/new-controller-service-dialog.css | 1 - .../main/webapp/css/new-processor-dialog.css | 1 - .../src/main/webapp/css/port-configuration.css | 2 - .../src/main/webapp/css/port-details.css | 2 - .../webapp/css/process-group-configuration.css | 1 - .../main/webapp/css/process-group-details.css | 1 - .../main/webapp/css/processor-configuration.css | 1 - .../src/main/webapp/css/processor-details.css | 1 - .../css/remote-process-group-configuration.css | 3 - .../nifi-web-ui/src/main/webapp/css/shell.css | 2 +- .../src/main/webapp/css/status-history.css | 1 - .../webapp/js/jquery/modal/jquery.modal.css | 13 ++- .../main/webapp/js/jquery/modal/jquery.modal.js | 108 ++++++++----------- .../propertytable/jquery.propertytable.css | 1 - .../src/main/webapp/js/nf/canvas/nf-settings.js | 4 +- .../src/main/webapp/js/nf/nf-dialog.js | 15 ++- 24 files changed, 63 insertions(+), 147 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-property-dialog.jsp ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-property-dialog.jsp b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-property-dialog.jsp deleted file mode 100644 index ca332b4..0000000 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-property-dialog.jsp +++ /dev/null @@ -1,34 +0,0 @@ -<%-- - Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to You under the Apache License, Version 2.0 - (the "License"); you may not use this file except in compliance with - the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---%> -<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> -<div id="new-property-dialog" class="dialog"> - <div> - <div class="setting-name">Property name</div> - <div class="setting-field" id="new-property-name-container"> - <input id="new-property-name" name="new-property-name" type="text"/> - </div> - <div class="setting-name" style="margin-top: 36px;">Property value</div> - <div class="setting-field"> - <div id="new-property-value"></div> - </div> - </div> - <div id="new-property-button-container"> - <div id="new-property-ok" class="button button-normal">Ok</div> - <div id="new-property-cancel" class="button button-normal">Cancel</div> - <div class="clear"></div> - </div> -</div> http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/about.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/about.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/about.css index 5fd923b..df48ee8 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/about.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/about.css @@ -22,7 +22,6 @@ font-size: 8pt; z-index: 1201; display: none; - border: 1px solid #eee; } #nf-about-pic { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-configuration.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-configuration.css index 0e8ae66..5bcf010 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-configuration.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-configuration.css @@ -19,7 +19,6 @@ display: none; width: 700px; height: 400px; - border: 1px solid #eee; } div.connection-configuration-tab-container { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-details.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-details.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-details.css index 8d84cc4..3a3fdb9 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-details.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-details.css @@ -23,7 +23,6 @@ display: none; width: 700px; height: 400px; - border: 1px solid #eee; } div.connection-details-tab-container { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service-configuration.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service-configuration.css index 30a7747..2978cd8 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service-configuration.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/controller-service-configuration.css @@ -27,7 +27,6 @@ font-size: 10px; z-index: 1301; display: none; - border: 1px solid #eee; } div.controller-service-configuration-tab-container { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css index b7bc388..aa92b17 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css @@ -23,7 +23,6 @@ display: none; width: 350px; height: 150px; - border: 1px solid #eee; } #new-port-name { @@ -35,7 +34,6 @@ display: none; width: 350px; height: 150px; - border: 1px solid #eee; } #new-process-group-name { @@ -47,7 +45,6 @@ display: none; width: 350px; height: 150px; - border: 1px solid #eee; } #new-remote-process-group-uri { @@ -59,7 +56,6 @@ display: none; width: 350px; height: 300px; - border: 1px solid #eee; } .new-template-field { @@ -71,7 +67,6 @@ display: none; width: 350px; height: 195px; - border: 1px solid #eee; } #fill-color-dialog { @@ -79,7 +74,6 @@ display: none; width: 195px; height: 345px; - border: 1px solid #eee; } #fill-color-processor-preview { @@ -142,7 +136,6 @@ display: none; height: 365px; width: 646px; - border: 1px solid #eee; } div.connections-component-name { @@ -250,7 +243,6 @@ div.go-to-link { display: none; height: 450px; width: 420px; - border: 1px solid #eee; } #instantiate-template-dialog { @@ -258,7 +250,6 @@ div.go-to-link { display: none; width: 355px; height: 120px; - border: 1px solid #eee; } #available-templates { @@ -272,7 +263,6 @@ div.go-to-link { display: none; width: 350px; height: 195px; - border: 1px solid #eee; } #nf-ok-dialog { @@ -280,14 +270,12 @@ div.go-to-link { display: none; height: 225px; width: 375px; - border: 1px solid #eee; } #nf-ok-dialog-content { width: 355px; height: 130px; overflow: auto; - margin-top: -10px; } #nf-yes-no-dialog { @@ -295,7 +283,6 @@ div.go-to-link { display: none; height: 175px; width: 350px; - border: 1px solid #eee; } #nf-yes-no-dialog-content { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/disable-controller-service-dialog.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/disable-controller-service-dialog.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/disable-controller-service-dialog.css index 1da8f09..6a16e17 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/disable-controller-service-dialog.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/disable-controller-service-dialog.css @@ -24,6 +24,5 @@ display: none; width: 500px; height: 450px; - border: 1px solid #eee; line-height: normal; } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/label-configuration.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/label-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/label-configuration.css index 1b4850b..30af32a 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/label-configuration.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/label-configuration.css @@ -20,7 +20,6 @@ #label-configuration { font-size: 10px; - border: 1px solid #eee; z-index: 1301; display: none; padding: 10px; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-controller-service-dialog.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-controller-service-dialog.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-controller-service-dialog.css index 16ba47a..ff8d19e 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-controller-service-dialog.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-controller-service-dialog.css @@ -24,7 +24,6 @@ display: none; width: 800px; height: 450px; - border: 1px solid #eee; line-height: normal; } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css index a1c77f8..d5871ac 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/new-processor-dialog.css @@ -23,7 +23,6 @@ display: none; width: 800px; height: 450px; - border: 1px solid #eee; line-height: normal; } http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-configuration.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-configuration.css index b8fc87c..ce1f00a 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-configuration.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-configuration.css @@ -23,7 +23,6 @@ display: none; width: 400px; height: 375px; - border: 1px solid #eee; } #port-name { @@ -66,7 +65,6 @@ div.port-enabled-container { display: none; width: 400px; height: 450px; - border: 1px solid #eee; } #secure-port-configuration div.dialog-content { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-details.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-details.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-details.css index 2cd8505..831c5ee 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-details.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/port-details.css @@ -23,7 +23,6 @@ display: none; width: 400px; height: 300px; - border: 1px solid #eee; } /* @@ -35,7 +34,6 @@ display: none; height: 425px; width: 400px; - border: 1px solid #eee; } #secure-port-details-tabs { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css index cfa3ce4..f0d781d 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-configuration.css @@ -19,7 +19,6 @@ display: none; width: 400px; height: 300px; - border: 1px solid #eee; } #process-group-configuration div.dialog-content { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css index ada6af9..af7c382 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/process-group-details.css @@ -19,7 +19,6 @@ display: none; width: 400px; height: 270px; - border: 1px solid #eee; } #process-group-details div.dialog-content { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css index ed53ac5..1dc52f3 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-configuration.css @@ -26,7 +26,6 @@ font-size: 10px; z-index: 1201; display: none; - border: 1px solid #eee; } div.processor-configuration-tab-container { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-details.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-details.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-details.css index 47849eb..c259a30 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-details.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/processor-details.css @@ -26,7 +26,6 @@ font-size: 10px; z-index: 1301; display: none; - border: 1px solid #eee; } div.processor-details-tab-container { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css index fdbe745..ead5714 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/remote-process-group-configuration.css @@ -26,7 +26,6 @@ font-size: 10px; z-index: 1201; display: none; - border: 1px solid #eee; } #remote-process-group-details { @@ -37,7 +36,6 @@ font-size: 10px; z-index: 1201; display: none; - border: 1px solid #eee; } #remote-process-group-ports { @@ -48,7 +46,6 @@ font-size: 10px; z-index: 1201; display: none; - border: 1px solid #eee; } /* remote process group settings */ http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css index 48e3d66..2cc8cfc 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/shell.css @@ -20,7 +20,7 @@ #shell-dialog { display: none; - z-index: 1250; + z-index: 1201; position: absolute; top: 20px; left: 20px; http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css index 0590ec8..e6d477c 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css @@ -19,7 +19,6 @@ #status-history-dialog { display: none; z-index: 1301; - border: 1px solid #eee; padding: 10px; border: 3px solid #365C6A; box-shadow: 4px 4px 6px rgba(0, 0, 0, 0.9); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css index 555698d..9cfbe7c 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css @@ -24,11 +24,14 @@ background-color: #eee; } -.dialog-border { - background-color: #294c58; - z-index: 1300; - opacity: 0.65; - filter: alpha(opacity=65); +.show-border { + padding: 10px; + border: 3px solid #365C6A; + box-shadow: 4px 4px 6px rgba(0, 0, 0, 0.9); +} + +.overlay { + border: 1px solid #eee; } .dialog-header { http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js index 9091db8..2f9d166 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js @@ -14,6 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + /** * Create a new dialog. The options are specified in the following * format: @@ -36,11 +37,14 @@ * close: closeHandler * } * } + * + * The content of the dialog should be in a element with the class dialog-content + * directly under the dialog. + * + * @argument {jQuery} $ */ (function ($) { - var overlayBackground = 'overlay-background'; - var isUndefined = function (obj) { return typeof obj === 'undefined'; }; @@ -73,20 +77,12 @@ } }; - // private function for adding the border - var addBorder = function (dialog) { - var dialogParent = dialog.parent(); - - // detach the dialog - dialog.detach(); - - // create the wrapper - $('<div/>').append('<div class="dialog-border"></div>').append(dialog).appendTo(dialogParent); - }; - var methods = { + /** * Initializes the dialog. + * + * @argument {object} options The options for the plugin */ init: function (options) { return this.each(function () { @@ -110,8 +106,10 @@ dialog.prepend(dialogHeader); // determine whether a dialog border is necessary - if (options.overlayBackground === false) { - addBorder(dialog); + if (options.overlayBackground === true) { + dialog.addClass('overlay'); + } else { + dialog.addClass('show-border'); } // add the buttons @@ -119,44 +117,44 @@ } }); }, + /** * Sets the handler that is used when the dialog is closed. + * + * @argument {function} handler The function to call when hiding the dialog */ setHandler: function (handler) { return this.each(function () { $(this).data('handler', handler); }); }, + /** * Sets whether to overlay the background or if a border should be shown around the dialog. + * + * @argument {boolean} overlayBackground Whether or not to overlay the background */ setOverlayBackground: function (overlayBackground) { return this.each(function () { if (isDefinedAndNotNull(overlayBackground)) { var dialog = $(this); - var prev = dialog.prev(); // if we should overlay the background if (overlayBackground === true) { - // if we're currently configured for a border - if (prev.hasClass('dialog-border')) { - // detach the dialog - dialog.detach(); - - // reinsert appropriately - prev.parent().replaceWith(dialog); - } + dialog.addClass('overlay'); + dialog.removeClass('show-border'); } else { - // if we're currently configured to overlay the background - if (!prev.hasClass('dialog-border')) { - addBorder(dialog); - } + dialog.addClass('show-border'); + dialog.removeClass('overlay'); } } }); }, + /** * Updates the button model for the selected dialog. + * + * @argument {array} buttons The new button model */ setButtonModel: function (buttons) { return this.each(function () { @@ -171,14 +169,18 @@ } }); }, + /** * Sets the header text of the dialog. + * + * @argument {string} text Text to use a as a header */ setHeaderText: function (text) { return this.each(function () { $(this).find('span.dialog-header-text').text(text); }); }, + /** * Shows the dialog. */ @@ -187,33 +189,19 @@ // show the dialog var dialog = $(this); if (!dialog.is(':visible')) { - // position the background/border - var background; - var prev = dialog.prev(); - if (!prev.hasClass('dialog-border')) { - // add a marker style so we know how to remove the style when hiding the dialog - dialog.addClass(overlayBackground); - - // get the faded background - background = $('#faded-background'); + var title = dialog.find('span.dialog-header-text').text(); + if (isBlank(title)) { + dialog.find('.dialog-content').css('margin-top', '-20px'); } else { - // get the dialog border - background = prev; - - // get the width and the height of the dialog container - var width = parseInt(dialog.css('width')); - var height = parseInt(dialog.css('height')); - - // set the width and height and center the dialog border - background.css({ - 'width': (width + 20) + 'px', - 'height': (height + 20) + 'px' - }).center(); - - // show the glass pane + dialog.find('.dialog-content').css('margin-top', '0'); + } + + // show the appropriate background + if (dialog.hasClass('show-border')) { $('#glass-pane').show(); + } else { + $('#faded-background').show(); } - background.show(); // show the centered dialog - performing these operation in the // opposite order one might expect. for some reason, the call to @@ -223,6 +211,7 @@ } }); }, + /** * Hides the dialog. */ @@ -230,18 +219,11 @@ return this.each(function () { var dialog = $(this); if (dialog.is(':visible')) { - // determine how to hide the dialog - if (dialog.hasClass(overlayBackground)) { - dialog.removeClass(overlayBackground); - - // hide the faded background - $('#faded-background').hide(); - } else { - // hide the dialog border - dialog.prev().hide(); - - // hide the glass pane + // hide the appropriate backgroun + if (dialog.hasClass('show-border')) { $('#glass-pane').hide(); + } else { + $('#faded-background').hide(); } var handler = dialog.data('handler'); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css index 64f5638..19a1a55 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.css @@ -73,7 +73,6 @@ div.property-table { div.new-property-dialog { z-index: 1301; display: none; - border: 1px solid #eee; padding: 10px; border: 3px solid #365C6A; box-shadow: 4px 4px 6px rgba(0, 0, 0, 0.9); http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js index f3c884f..87560dd 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js @@ -375,7 +375,7 @@ nf.Settings = (function () { // get the desired availability var availability; if (nf.Canvas.isClustered()) { - availability = $('#controller-service-availability-combo').combo('getSelectedOption'); + availability = $('#controller-service-availability-combo').combo('getSelectedOption').value; } else { availability = config.node; } @@ -383,7 +383,7 @@ nf.Settings = (function () { // add the new controller service var addService = $.ajax({ type: 'POST', - url: config.urls.controllerServices + '/' + encodeURIComponent(availability.value), + url: config.urls.controllerServices + '/' + encodeURIComponent(availability), data: { version: revision.version, clientId: revision.clientId, http://git-wip-us.apache.org/repos/asf/incubator-nifi/blob/44812138/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-dialog.js ---------------------------------------------------------------------- diff --git a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-dialog.js b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-dialog.js index 174f8bd..e7ecca1 100644 --- a/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-dialog.js +++ b/nifi/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-dialog.js @@ -35,6 +35,9 @@ $(document).ready(function () { $('#nf-ok-dialog-content').empty(); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); // configure the yes/no dialog @@ -45,6 +48,9 @@ $(document).ready(function () { $('#nf-yes-no-dialog-content').empty(); } } + }).draggable({ + containment: 'parent', + handle: '.dialog-header' }); }); @@ -68,13 +74,6 @@ nf.Dialog = (function () { var content = $('<p></p>').append(options.dialogContent); $('#nf-ok-dialog-content').append(content); - // conditionally show the header text - if (nf.Common.isBlank(options.headerText)) { - $('#nf-ok-dialog-content').css('margin-top', '-10px'); - } else { - $('#nf-ok-dialog-content').css('margin-top', '0px'); - } - // show the dialog $('#nf-ok-dialog').modal('setHeaderText', options.headerText).modal('setOverlayBackground', options.overlayBackground).modal('show'); }, @@ -122,7 +121,7 @@ nf.Dialog = (function () { }]); // show the dialog - $('#nf-yes-no-dialog').modal('setOverlayBackground', options.overlayBackground).modal('show'); + $('#nf-yes-no-dialog').modal('setHeaderText', options.headerText).modal('setOverlayBackground', options.overlayBackground).modal('show'); } }; }()); \ No newline at end of file
