From 12a4e18462606934674dde5a35584874345b3fe5 Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Tue, 19 Jul 2016 14:42:42 -0400 Subject: [PATCH 1/2] [NIFI-2257] [NIFI-2294] refresh updateattribute processor advanced shell and fix connection config setting tab scrolling issue --- .../nifi-web/nifi-web-ui/pom.xml | 11 + .../filters/bulletin-board-min.properties | 3 +- .../filters/bulletin-board.properties | 1 + .../resources/filters/canvas-min.properties | 3 +- .../main/resources/filters/canvas.properties | 3 +- .../resources/filters/cluster-min.properties | 3 +- .../main/resources/filters/cluster.properties | 3 +- .../resources/filters/counters-min.properties | 3 +- .../resources/filters/counters.properties | 1 + .../resources/filters/history-min.properties | 3 +- .../main/resources/filters/history.properties | 1 + .../resources/filters/login-min.properties | 3 +- .../main/resources/filters/login.properties | 1 + .../filters/provenance-min.properties | 3 +- .../resources/filters/provenance.properties | 1 + .../resources/filters/summary-min.properties | 3 +- .../main/resources/filters/summary.properties | 1 + .../filters/templates-min.properties | 3 +- .../resources/filters/templates.properties | 1 + .../resources/filters/users-min.properties | 3 +- .../main/resources/filters/users.properties | 1 + .../partials/counters/counters-content.jsp | 2 +- .../src/main/webapp/css/bulletin-board.css | 3 +- .../src/main/webapp/css/canvas.css | 1 + .../src/main/webapp/css/common-ui.css | 495 ++++++++++++++++++ .../webapp/css/connection-configuration.css | 2 - .../src/main/webapp/css/dialog.css | 39 -- .../nifi-web-ui/src/main/webapp/css/main.css | 434 --------------- .../webapp/js/jquery/combo/jquery.combo.js | 37 +- .../src/main/webapp/WEB-INF/jsp/worksheet.jsp | 56 +- .../src/main/webapp/css/main.css | 303 +++++------ .../src/main/webapp/js/application.js | 170 +++--- 32 files changed, 813 insertions(+), 784 deletions(-) create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css 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 4d2f4be339b0..a84c212e0785 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 @@ -585,6 +585,13 @@ ${staging.dir}/css/status-history.css + + true + ${project.build.directory}/${project.build.finalName}/css/nf-common-ui.css + + ${staging.dir}/css/common-ui.css + + true ${project.build.directory}/${project.build.finalName}/css/nf-history-all.css @@ -696,10 +703,14 @@ assets/**/*, css/reset.css, css/reset.css.gz, + css/common-ui.css, + css/common-ui.css.gz, css/message-page.css, css/message-page.css.gz, css/message-pane.css, css/message-pane.css.gz, + css/nf-common-ui.css, + css/nf-common-ui.css.gz, css/nf-canvas-all.css, css/nf-canvas-all.css.gz, css/nf-history-all.css, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board-min.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board-min.properties index 822c001e1aba..0cef1c6e84ae 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board-min.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board-min.properties @@ -15,4 +15,5 @@ nf.bulletin.board.script.tags= nf.bulletin.board.style.tags=\n\ - \ No newline at end of file +\n\ + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties index 72f99a5d6a7a..bdc7b150d3ee 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/bulletin-board.properties @@ -25,6 +25,7 @@ nf.bulletin.board.script.tags= nf.bulletin.board.style.tags=\n\ \n\ +\n\ \n\ \n\ \n\ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas-min.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas-min.properties index 2c34e6df81f8..194315757f51 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas-min.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/canvas-min.properties @@ -15,4 +15,5 @@ nf.canvas.script.tags= nf.canvas.style.tags=\n\ - \ No newline at end of file +\n\ + \ No newline at end of file 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 0f219d4149a4..738abc10a542 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 @@ -81,4 +81,5 @@ nf.canvas.script.tags=\n\ \n\ -nf.canvas.style.tags= \ No newline at end of file +nf.canvas.style.tags=\n\ + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster-min.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster-min.properties index 03f1fcfce52e..f16ca376a4a0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster-min.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster-min.properties @@ -15,4 +15,5 @@ nf.cluster.script.tags= nf.cluster.style.tags=\n\ - \ No newline at end of file +\n\ + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster.properties index 9061e028ff43..bce1a8e52f7d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/cluster.properties @@ -25,4 +25,5 @@ nf.cluster.style.tags=\n\ \n\ \n\ - \ No newline at end of file +\n\ + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters-min.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters-min.properties index fdb05a1fdbb6..8be3bb6c56a9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters-min.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters-min.properties @@ -15,4 +15,5 @@ nf.counters.script.tags= nf.counters.style.tags=\n\ - \ No newline at end of file +\n\ + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters.properties index 441490912006..83479a9d12db 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/counters.properties @@ -22,6 +22,7 @@ nf.counters.script.tags= nf.counters.style.tags=\n\ \n\ +\n\ \n\ \n\ \n\ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history-min.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history-min.properties index 7d7221652777..1a53f774581e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history-min.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history-min.properties @@ -15,4 +15,5 @@ nf.history.script.tags= nf.history.style.tags=\n\ - \ No newline at end of file +\n\ + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history.properties index e532204fee1a..5ab98a03bca8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/history.properties @@ -23,6 +23,7 @@ nf.history.script.tags= nf.history.style.tags=\n\ \n\ +\n\ \n\ \n\ \n\ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login-min.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login-min.properties index 4dafb0201f2c..fc60809e63e7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login-min.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login-min.properties @@ -15,4 +15,5 @@ nf.login.script.tags= nf.login.style.tags=\n\ - \ No newline at end of file +\n\ + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties index 7a1678ddcf90..03e639411260 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/login.properties @@ -21,6 +21,7 @@ nf.login.script.tags= nf.login.style.tags=\n\ \n\ +\n\ \n\ \n\ \n\ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance-min.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance-min.properties index 1be3238a4310..9eb30973ab92 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance-min.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance-min.properties @@ -15,4 +15,5 @@ nf.provenance.script.tags= nf.provenance.style.tags=\n\ - \ No newline at end of file +\n\ + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance.properties index c0fe613dd00a..0a199df494e4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/provenance.properties @@ -27,6 +27,7 @@ nf.provenance.script.tags= nf.provenance.style.tags=\n\ \n\ +\n\ \n\ \n\ \n\ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary-min.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary-min.properties index 3f079bc2962b..1ac220a12cdd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary-min.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary-min.properties @@ -15,4 +15,5 @@ nf.summary.script.tags= nf.summary.style.tags=\n\ - \ No newline at end of file +\n\ + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties index 52dfe4902fec..51dd9dfaf88e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/summary.properties @@ -30,6 +30,7 @@ nf.summary.script.tags= nf.summary.style.tags=\n\ \n\ +\n\ \n\ \n\ \n\ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates-min.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates-min.properties index 0ec2c2700312..f0b78ec3b0b0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates-min.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates-min.properties @@ -15,4 +15,5 @@ nf.templates.script.tags= nf.templates.style.tags=\n\ - \ No newline at end of file +\n\ + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates.properties index 7ad302c9aa9a..c8a357d8958b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/templates.properties @@ -22,6 +22,7 @@ nf.templates.script.tags= nf.templates.style.tags=\n\ \n\ +\n\ \n\ \n\ \n\ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users-min.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users-min.properties index 9375334eab75..e87e952c912c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users-min.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users-min.properties @@ -15,4 +15,5 @@ nf.users.script.tags= nf.users.style.tags=\n\ - \ No newline at end of file +\n\ + \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users.properties b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users.properties index b2dee8ea87c4..b0e20935735f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users.properties +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/resources/filters/users.properties @@ -23,6 +23,7 @@ nf.users.script.tags= nf.users.style.tags=\n\ \n\ +\n\ \n\ \n\ \n\ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp index 22f686fb003b..6399d0b52064 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp @@ -23,7 +23,7 @@ Displaying  of 
- +
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css index afa8af858810..253c86b59995 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css @@ -21,10 +21,9 @@ #bulletin-board { position: absolute; top: 0px; - bottom: 0px; + bottom: 40px; left: 20px; right: 20px; - height: 100%; overflow: auto; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/canvas.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/canvas.css index db9f4ce0913d..9922ebc2d566 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/canvas.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/canvas.css @@ -43,6 +43,7 @@ @import url(settings.css); @import url(about.css); @import url(message-pane.css); +@import url(common-ui.css); @import url(status-history.css); @import url(../fonts/flowfont/flowfont.css); @import url(../assets/font-awesome/css/font-awesome.css); \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css new file mode 100644 index 000000000000..52f61622496a --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/common-ui.css @@ -0,0 +1,495 @@ +/* + * 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. + */ + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 300; + src: local('Roboto Light'), + local('Roboto-Light'), + url('../fonts/Roboto/Roboto-Light.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: 300; + src: local('Roboto LightItalic'), + local('Roboto-LightItalic'), + url('../fonts/Roboto/Roboto-LightItalic.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: normal; + src: local('Roboto Regular'), + local('Roboto-Regular'), + url('../fonts/Roboto/Roboto-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: 500; + src: local('Roboto Medium'), + local('Roboto-Medium'), + url('../fonts/Roboto/Roboto-Medium.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto'; + font-style: normal; + font-weight: bold; + src: local('Roboto Bold'), + local('Roboto-Bold'), + url('../fonts/Roboto/Roboto-Bold.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto'; + font-style: italic; + font-weight: normal; + src: local('Roboto Italic'), + local('Roboto-Italic'), + url('../fonts/Roboto/Roboto-Italic.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto Slab'; + font-style: normal; + font-weight: normal; + src: local('RobotoSlab Regular'), + local('RobotoSlab-Regular'), + url('../fonts/Roboto_Slab/RobotoSlab-Regular.ttf') format('truetype'); +} + +@font-face { + font-family: 'Roboto Slab'; + font-style: normal; + font-weight: bold; + src: local('RobotoSlab Bold'), + local('RobotoSlab-Bold'), + url('../fonts/Roboto_Slab/RobotoSlab-Bold.ttf') format('truetype'); +} + +/*remove margin from font awesome*/ +i[class^="fa-"]:before, i[class*=" fa-"]:before { + margin: -1px; +} + +/*remove margin from flowfont*/ +i[class^="icon-"]:before, i[class*=" icon-"]:before { + margin: -2px; +} + +body { + display: block; + font-family: Roboto, sans-serif; + font-size: 62.5%; + overflow: hidden; + color: #262626; +} + +.value-color { + color: #775351; +} + +ul.links li { + float: left; + display: block; + margin-left: 10px; + padding: 4px; + text-align: center; + font-size: 11px; + font-weight: normal; + text-decoration: none; +} + +ul.links span.header-link-over { + color: #264c58; + text-decoration: underline; +} + +/* + General Styles +*/ + +.unselectable { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; +} + +.clear { + clear: both; +} + +.pointer { + cursor: pointer !important; +} + +.hidden { + display: none; +} + +.blank, .unset, .sensitive { + font-style: italic; + font-weight: normal; + color: #aaa; +} + +.required { + font-weight: bold !important; +} + + +.ellipsis { + white-space: nowrap; + overflow: hidden; +} + +.ellipsis.multiline { + white-space: normal; +} + +input.filter-list { + color: #888; +} + +.table-cell { + overflow: hidden; + white-space: nowrap; + line-height: normal; + float: left; + margin-top: 4px; +} + +label { + font-family: 'Roboto Slab', serif; + font-size: 12px; + color: #262626; /*base-font-color*/ + letter-spacing: 0.05rem; + display: block; + margin-bottom: 2px; +} + +input::placeholder { + color: #728e9b; /*base-color*/ +} + +input[type=text], input[type=password], textarea { + background-color: #eaeef0; + border: 1px solid #eaeef0; + font-family: Roboto, sans-serif; + font-size: 13px; + padding: 0px 0px 0px 10px; + resize: none; + height: 32px; + width: 100%; + -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ + -moz-box-sizing: border-box; /* Firefox, other Gecko */ + box-sizing: border-box; + color: #262626; +} + +input:focus, textarea:focus { + background-color: #fff; + border: 1px solid #004849; /*link-color*/ + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); + outline: none; +} + +textarea { + overflow: hidden; + padding: 10px 10px; + resize: vertical; + color: #262626; + font-size: 13px !important; +} + +ul.property-info { + list-style-type: disc; + margin-left: 10px; +} + +ul.property-info li { + padding: 0px 0px; + margin-left: 10px; +} + +div.nf-checkbox { + cursor: default; + width: 12px; + height: 12px; + float: left; + margin-right: 4px; +} + +div.checkbox-unchecked { + background: transparent url(../images/inputCheckbox.png) no-repeat scroll top left; +} + +div.checkbox-checked { + background: transparent url(../images/inputCheckbox.png) no-repeat scroll top right; +} + +div.ajax-loading { + background-image: url(../images/iconLoading.gif); +} + +div.ajax-complete { + background-image: url(../images/iconCommit.png); +} + +div.ajax-error { + background-image: url(../images/iconDelete.png); +} + +.refresh-button { + float: left; +} + +.ui-draggable .dialog-header { + cursor: move; +} + +span.link { + cursor: pointer; + color: #004849; /*link-color*/ + font-weight: normal; + display: inline-block; + border-bottom: 1px solid #CCDADB; + font-size: 13px; + font-family: Roboto; +} + +span.link-over { + border-bottom: 1px solid #004849; +} + +span.link-bold { + font-weight: bold; + border-bottom: none; +} + +button { + height: 28px; + width: 28px; + border: 1px solid #CCDADB; /*tint link-color 80%*/ + background-color: rgba(249, 250, 251, 0.97); + color: #004849; +} + +button.refresh-button { + font-size: 16px; +} + +button:hover { + border: 1px solid #004849; /*link-color*/ +} + +button:disabled { + color: #CCDADB !important; /*tint link-color 80%*/ + cursor: not-allowed; + border: 1px solid #CCDADB; /*tint link-color 80%*/ +} + +/* angular material override */ + +button:focus { + outline: none; +} + +div:focus { + outline: none; +} + +input:focus { + background-color: #fff; + border: 1px solid #004849; /*link-color*/ + box-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); + outline: none; +} + +/* filter controls */ + +.filter-controls { + position: absolute; + top: 10px; +} + +.filter-container { + height: 32px; + width: 318px; + float: left; +} + +.filter { + margin-right: 3px; + float: left; +} + +input.filter { + width: 173px; +} + +.filter-type { + width: 120px; + float: left; +} + +.filter-status { + margin-top: 10px; + color: #775351; + font-family: Roboto; + font-size: 13px; + font-weight: 500; + margin-bottom: 5px; +} + +/* buttons */ + +button.fa { + color: #004849; + font-size: 16px; + cursor: pointer; +} + +button.icon { + color: #004849; + font-size: 16px; +} + +div.button { + height: 32px; + width: 90px; + padding: 0 8px; + text-transform: uppercase; + font-weight: 500; + font-size: 11px; + line-height: 33px; + text-align: center; + border: 0px; + float: right; + position: relative; + background: #728E9B; + color: #fff; + cursor: pointer; +} + +div.button:hover { + background-color: #004849; +} + +div.secondary-button { + height: 32px; + width: 90px; + padding: 0 8px; + text-transform: uppercase; + font-weight: 500; + font-size: 11px; + line-height: 33px; + text-align: center; + border: 0px; + float: right; + position: relative; + background: #E3E8EB; + color: #004849; +} + +div.secondary-button:hover { + background-color: #C7D2D7; +} + +/* tooltips */ + +.qtip-nifi { + border: 0px !important; + border-radius: 2px; + background-color: rgba(0, 0, 0, 0.54) !important; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25); + font-family: Roboto; + font-weight: 500; + font-size: 13px; + color: #fff !important; +} + +div.nifi-tooltip { + border: 0px !important; + border-radius: 2px; + background-color: rgba(0, 0, 0, 0.80) !important; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25); + font-family: Roboto; + font-weight: 500; + font-size: 13px; + color: #fff !important; + max-width: 500px; + word-wrap: break-word; +} + +.scrollable { + border-bottom: 1px solid #d0dbe0; +} + +/* progress bars */ + +md-progress-linear > div { + background-color: #eaeef0 !important; +} + +.setting { + margin-bottom: 15px; +} + +.setting-name { + font-size: 12px; + font-weight: 500; + font-family: Roboto Slab; + padding-bottom: 4px; + color: #262626; +} + +.setting-name .fa { + color: #004849; + margin-left: 5px; +} + +.setting-field .fa { + color: #004849; + margin-left: 5px; +} + +.setting-field { + line-height: normal; + width: 100%; + color: #775351; + font-size: 13px; +} + +.setting-header{ + color: #728e9b; + font-size: 12pt; + font-family: 'Roboto Slab'; + font-style: normal; + font-weight: bold; + padding-bottom: 20px; + text-overflow: ellipsis; +} \ No newline at end of file diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-configuration.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-configuration.css index be5f71e3783f..30487f9d9f89 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-configuration.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/connection-configuration.css @@ -82,10 +82,8 @@ div.undefined { list-style-type: none; margin: 0px; background: #eaeef0; - width: 325px; min-height: 32px; margin-bottom: 5px; - width: 100%; padding: 2px; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css index 5d4f781778bf..9ec7bc531b83 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/dialog.css @@ -190,45 +190,6 @@ ul.result li { padding: 3px 0px; } -.setting { - margin-bottom: 15px; -} - -.setting-name { - font-size: 12px; - font-weight: 500; - font-family: Roboto Slab; - padding-bottom: 4px; - color: #262626; -} - -.setting-name .fa { - color: #004849; - margin-left: 5px; -} - -.setting-field .fa { - color: #004849; - margin-left: 5px; -} - -.setting-field { - line-height: normal; - width: 100%; - color: #775351; - font-size: 13px; -} - -.setting-header{ - color: #728e9b; - font-size: 12pt; - font-family: 'Roboto Slab'; - font-style: normal; - font-weight: bold; - padding-bottom: 20px; - text-overflow: ellipsis; -} - .dialog-content div.settings-left { float: left; width: 49%; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css index 024b4977a6b6..7b638740f5bb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css @@ -14,99 +14,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 300; - src: local('Roboto Light'), - local('Roboto-Light'), - url('../fonts/Roboto/Roboto-Light.ttf') format('truetype'); -} - -@font-face { - font-family: 'Roboto'; - font-style: italic; - font-weight: 300; - src: local('Roboto LightItalic'), - local('Roboto-LightItalic'), - url('../fonts/Roboto/Roboto-LightItalic.ttf') format('truetype'); -} - -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: normal; - src: local('Roboto Regular'), - local('Roboto-Regular'), - url('../fonts/Roboto/Roboto-Regular.ttf') format('truetype'); -} - -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: 500; - src: local('Roboto Medium'), - local('Roboto-Medium'), - url('../fonts/Roboto/Roboto-Medium.ttf') format('truetype'); -} - -@font-face { - font-family: 'Roboto'; - font-style: normal; - font-weight: bold; - src: local('Roboto Bold'), - local('Roboto-Bold'), - url('../fonts/Roboto/Roboto-Bold.ttf') format('truetype'); -} - -@font-face { - font-family: 'Roboto'; - font-style: italic; - font-weight: normal; - src: local('Roboto Italic'), - local('Roboto-Italic'), - url('../fonts/Roboto/Roboto-Italic.ttf') format('truetype'); -} - -@font-face { - font-family: 'Roboto Slab'; - font-style: normal; - font-weight: normal; - src: local('RobotoSlab Regular'), - local('RobotoSlab-Regular'), - url('../fonts/Roboto_Slab/RobotoSlab-Regular.ttf') format('truetype'); -} - -@font-face { - font-family: 'Roboto Slab'; - font-style: normal; - font-weight: bold; - src: local('RobotoSlab Bold'), - local('RobotoSlab-Bold'), - url('../fonts/Roboto_Slab/RobotoSlab-Bold.ttf') format('truetype'); -} - -/*remove margin from font awesome*/ -i[class^="fa-"]:before, i[class*=" fa-"]:before { - margin: -1px; -} - -/*remove margin from flowfont*/ -i[class^="icon-"]:before, i[class*=" icon-"]:before { - margin: -2px; -} - -.value-color { - color: #775351; -} - -body { - display: block; - font-family: Roboto, sans-serif; - font-size: 62.5%; - overflow: hidden; - color: #262626; -} #splash { position: absolute; @@ -187,74 +94,6 @@ div.context-menu-provenance { z-index: 1300; } -ul.links li { - float: left; - display: block; - margin-left: 10px; - padding: 4px; - text-align: center; - font-size: 11px; - font-weight: normal; - text-decoration: none; -} - -ul.links span.header-link-over { - color: #264c58; - text-decoration: underline; -} - -/* - General Styles -*/ - -.unselectable { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; -} - -.clear { - clear: both; -} - -.pointer { - cursor: pointer !important; -} - -.delete td { - text-decoration: line-through; -} - -.hidden { - display: none; -} - -.blank, .unset, .sensitive { - font-style: italic; - font-weight: normal; - color: #aaa; -} - -.required { - font-weight: bold !important; -} - -div.nifi-tooltip { - border: 0px !important; - border-radius: 2px; - background-color: rgba(0, 0, 0, 0.80) !important; - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25); - font-family: Roboto; - font-weight: 500; - font-size: 13px; - color: #fff !important; - max-width: 500px; - word-wrap: break-word; -} - .ellipsis { white-space: nowrap; overflow: hidden; @@ -264,18 +103,6 @@ div.nifi-tooltip { white-space: normal; } -input.filter-list { - color: #888; -} - -.table-cell { - overflow: hidden; - white-space: nowrap; - line-height: normal; - float: left; - margin-top: 4px; -} - .collapsed { background: transparent url(../images/iconTwistArrow.png) no-repeat scroll top left; } @@ -284,49 +111,6 @@ input.filter-list { background: transparent url(../images/iconTwistArrow.png) no-repeat scroll top right; } -label { - font-family: 'Roboto Slab', serif; - font-size: 12px; - color: #262626; /*base-font-color*/ - letter-spacing: 0.05rem; - display: block; - margin-bottom: 2px; -} - -input::placeholder { - color: #728e9b; /*base-color*/ -} - -input[type=text], input[type=password], textarea { - background-color: #eaeef0; - border: 1px solid #eaeef0; - font-family: Roboto, sans-serif; - font-size: 13px; - padding: 0px 0px 0px 10px; - resize: none; - height: 32px; - width: 100%; - -webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ - -moz-box-sizing: border-box; /* Firefox, other Gecko */ - box-sizing: border-box; - color: #262626; -} - -input:focus, textarea:focus { - background-color: #fff; - border: 1px solid #004849; /*link-color*/ - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); - outline: none; -} - -textarea { - overflow: hidden; - padding: 10px 10px; - resize: vertical; - color: #262626; - font-size: 13px !important; -} - #new-template-description { position: absolute; top: 81px; @@ -335,53 +119,6 @@ textarea { min-height: 32px; } -ul.property-info { - list-style-type: disc; - margin-left: 10px; -} - -ul.property-info li { - padding: 0px 0px; - margin-left: 10px; -} - -div.nf-checkbox { - cursor: default; - width: 12px; - height: 12px; - float: left; - margin-right: 4px; -} - -div.checkbox-unchecked { - background: transparent url(../images/inputCheckbox.png) no-repeat scroll top left; -} - -div.checkbox-checked { - background: transparent url(../images/inputCheckbox.png) no-repeat scroll top right; -} - -div.ajax-loading { - background-image: url(../images/iconLoading.gif); -} - -div.ajax-complete { - background-image: url(../images/iconCommit.png); -} - -div.ajax-error { - /*margin-left: -2px;*/ - background-image: url(../images/iconDelete.png); -} - -.refresh-button { - float: left; -} - -.ui-draggable .dialog-header { - cursor: move; -} - /* processor status styles */ div.disabled { @@ -446,25 +183,6 @@ tr.alt-row { background: #f5f5f5 none; } -span.link { - cursor: pointer; - color: #004849; /*link-color*/ - font-weight: normal; - display: inline-block; - border-bottom: 1px solid #CCDADB; - font-size: 13px; - font-family: Roboto; -} - -span.link-over { - border-bottom: 1px solid #004849; -} - -span.link-bold { - font-weight: bold; - border-bottom: none; -} - span.details-title { font-weight: bold; font-size: 12px; @@ -489,158 +207,6 @@ span.details-title { font-size: 13px; } -button { - height: 28px; - width: 28px; - border: 1px solid #CCDADB; /*tint link-color 80%*/ - background-color: rgba(249, 250, 251, 0.97); - color: #004849; -} - -button.refresh-button { - font-size: 16px; -} - -button:hover { - border: 1px solid #004849; /*link-color*/ -} - -button:disabled { - color: #CCDADB !important; /*tint link-color 80%*/ - cursor: not-allowed; - border: 1px solid #CCDADB; /*tint link-color 80%*/ -} - -/* angular material override */ - -button:focus { - outline: none; -} - -div:focus { - outline: none; -} - -input:focus { - background-color: #fff; - border: 1px solid #004849; /*link-color*/ - box-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); - outline: none; -} - -/* filter controls */ - -.filter-controls { - position: absolute; - top: 10px; -} - -.filter-container { - height: 32px; - width: 318px; - float: left; -} - -.filter { - margin-right: 3px; - float: left; -} - -input.filter { - width: 173px; -} - -.filter-type { - width: 120px; - float: left; -} - -.filter-status { - margin-top: 10px; - color: #775351; - font-family: Roboto; - font-size: 13px; - font-weight: 500; - margin-bottom: 5px; -} - -/* buttons */ - -button.fa { - color: #004849; - font-size: 16px; - cursor: pointer; -} - -button.icon { - color: #004849; - font-size: 16px; -} - -div.button { - height: 32px; - width: 90px; - padding: 0 8px; - text-transform: uppercase; - font-weight: 500; - font-size: 11px; - line-height: 33px; - text-align: center; - border: 0px; - float: right; - position: relative; - background: #728E9B; - color: #fff; - cursor: pointer; -} - -div.button:hover { - background-color: #004849; -} - -div.secondary-button { - height: 32px; - width: 90px; - padding: 0 8px; - text-transform: uppercase; - font-weight: 500; - font-size: 11px; - line-height: 33px; - text-align: center; - border: 0px; - float: right; - position: relative; - background: #E3E8EB; - color: #004849; -} - -div.secondary-button:hover { - background-color: #C7D2D7; -} - -/* tooltips */ - -.qtip-nifi { - border: 0px !important; - border-radius: 2px; - background-color: rgba(0, 0, 0, 0.54) !important; - box-shadow: 0 2px 5px rgba(0, 0, 0, 0.25); - font-family: Roboto; - font-weight: 500; - font-size: 13px; - color: #fff !important; -} - -.scrollable { - border-bottom: 1px solid #d0dbe0; -} - -/* progress bars */ - -md-progress-linear > div { - background-color: #eaeef0 !important; -} - /* new template */ #new-template-description { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js index 232fe20c8a08..6372a1682998 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/combo/jquery.combo.js @@ -231,13 +231,38 @@ } if (!isBlank(option.description)) { - $('
').appendTo(optionElement).qtip($.extend({}, nf.Common.config.tooltipConfig, { - content: option.description, - position: { - at: 'top right', - my: 'bottom left' + $('
').appendTo(optionElement).qtip($.extend({}, + { + style: { + classes: 'nifi-tooltip' + }, + show: { + solo: true, + effect: function(offset) { + $(this).slideDown(100); + } + }, + hide: { + effect: function(offset) { + $(this).slideUp(100); + } + }, + position: { + at: 'bottom center', + my: 'top center', + adjust: { + y: 5 + } + } + }, + { + content: option.description, + position: { + at: 'top right', + my: 'bottom left' + } } - })); + )); } actualHeight += 16; diff --git a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp index a92c4e08124e..544d7060d94e 100644 --- a/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp +++ b/nifi-nar-bundles/nifi-update-attribute-bundle/nifi-update-attribute-ui/src/main/webapp/WEB-INF/jsp/worksheet.jsp @@ -29,8 +29,11 @@ + + + @@ -53,7 +56,6 @@ - @@ -72,14 +74,14 @@
FlowFile Policy
- Info +
Rules
- Info - +
+
@@ -88,10 +90,10 @@
No rules found.