You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/06/22 12:11:42 UTC
nifi git commit: [NIFI-1879] Update dialog content scrollable styles.
This closes #560
Repository: nifi
Updated Branches:
refs/heads/master 27ff5f9a8 -> 32facaedb
[NIFI-1879] Update dialog content scrollable styles. This closes #560
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/32facaed
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/32facaed
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/32facaed
Branch: refs/heads/master
Commit: 32facaedb44785942a01dd392645f0f150848cdc
Parents: 27ff5f9
Author: Scott Aslan <ja...@hortonworks.com>
Authored: Wed Jun 22 00:04:03 2016 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Wed Jun 22 08:11:12 2016 -0400
----------------------------------------------------------------------
.../WEB-INF/partials/canvas/new-controller-service-dialog.jsp | 2 +-
.../main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp | 2 +-
.../webapp/WEB-INF/partials/canvas/new-reporting-task-dialog.jsp | 2 +-
.../nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css | 1 +
.../nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js | 4 +++-
5 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/32facaed/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-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/new-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/new-controller-service-dialog.jsp
index a764ad9..91b6a5a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-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/new-controller-service-dialog.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-controller-service-dialog" layout="column" class="hidden large-dialog">
- <div class="dialog-content" layout="column">
+ <div class="dialog-content">
<div layout="row" style="padding-bottom:0">
<div flex="25" layout="row" layout-align="start center">
<div class="setting-name">Tag Cloud:</div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/32facaed/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-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/new-processor-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp
index ea0d766..90aa7c3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-processor-dialog" layout="column" class="hidden large-dialog">
- <div class="dialog-content" layout="column">
+ <div class="dialog-content">
<div layout="row" style="padding-bottom:0">
<div flex="25" layout="row" layout-align="start center">
<div class="setting-name">Tag Cloud:</div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/32facaed/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-reporting-task-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/new-reporting-task-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-reporting-task-dialog.jsp
index 3c0c8ab..bb75f21 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-reporting-task-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/new-reporting-task-dialog.jsp
@@ -16,7 +16,7 @@
--%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="new-reporting-task-dialog" layout="column" class="hidden large-dialog">
- <div class="dialog-content" layout="column">
+ <div class="dialog-content">
<div layout="row" style="padding-bottom:0">
<div flex="25" layout="row" layout-align="start center">
<div class="setting-name">Tag Cloud:</div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/32facaed/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
index 6b6fe17..106b6bb 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.css
@@ -81,4 +81,5 @@
position: absolute;
bottom: 0;
width: 100%;
+ height: 32px;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/nifi/blob/32facaed/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
index 10e6366..fef90b3 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
@@ -392,7 +392,7 @@
//resize dialog content
if (!nfDialog.resizable) {
dialogContent.attr('style', 'height:' +
- (dialog.height() -
+ (dialog.outerHeight() -
dialog.find('.dialog-header').height() -
dialog.find('.dialog-buttons').height() -
parseInt(dialogContent.css('padding-top'), 10) -
@@ -401,9 +401,11 @@
if (dialogContent[0].offsetHeight < dialogContent[0].scrollHeight) {
// your element have overflow
dialogContent.addClass('scrollable');
+ dialog.find('.dialog-buttons').css('background', '#eaeef0');
} else {
// your element doesn't have overflow
dialogContent.removeClass('scrollable');
+ dialog.find('.dialog-buttons').css('background', '#fff');
}
}
};