From 32facaedb44785942a01dd392645f0f150848cdc Mon Sep 17 00:00:00 2001
From: Scott Aslan <jaslan@hortonworks.com>
Date: Wed, 22 Jun 2016 00:04:03 -0400
Subject: [PATCH] [NIFI-1879] Update dialog content scrollable styles. This
 closes #560

---
 .../WEB-INF/partials/canvas/new-controller-service-dialog.jsp | 2 +-
 .../webapp/WEB-INF/partials/canvas/new-processor-dialog.jsp   | 2 +-
 .../WEB-INF/partials/canvas/new-reporting-task-dialog.jsp     | 2 +-
 .../src/main/webapp/js/jquery/modal/jquery.modal.css          | 1 +
 .../src/main/webapp/js/jquery/modal/jquery.modal.js           | 4 +++-
 5 files changed, 7 insertions(+), 4 deletions(-)

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 a764ad979e..91b6a5ac2b 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>
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 ea0d766625..90aa7c305e 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>
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 3c0c8ab728..bb75f21696 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>
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 6b6fe1771f..106b6bbabc 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
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 10e6366f93..fef90b3e9a 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');
                     }
                 }
             };