From 4274481f1d63f9e8ea109e02e2169e8b1f6000ae Mon Sep 17 00:00:00 2001
From: Scott Aslan <scottyaslan@gmail.com>
Date: Thu, 9 Feb 2017 11:29:49 -0500
Subject: [PATCH] [NIFI-3450] update upload template dialog browse button. This
 closes #1495

---
 .../partials/canvas/upload-template-dialog.jsp      |  4 ++--
 .../nifi-web-ui/src/main/webapp/css/main.css        | 13 ++-----------
 .../controllers/nf-ng-canvas-operate-controller.js  |  4 ++++
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/upload-template-dialog.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/upload-template-dialog.jsp
index d5c4a79593..f6cbbdb4d0 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/upload-template-dialog.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/upload-template-dialog.jsp
@@ -21,9 +21,9 @@
             <div id="template-browse-container">
                 <span id="select-template-label">Select Template</span>
                 <div id="select-template-button">
-                    <button class="fa fa-search"></button>
+                    <button class="fa fa-search" id="template-file-field-button" title="Browse"></button>
                     <form id="template-upload-form" enctype="multipart/form-data" method="post">
-                        <input type="file" name="template" id="template-file-field" title="Browse"/>
+                        <input type="file" name="template" id="template-file-field"/>
                     </form>
                 </div>
             </div>
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 14af7ff61f..1554356a92 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
@@ -239,20 +239,11 @@ span.details-title {
     position: absolute;
     top: 0px;
     left: 135px;
-    cursor: pointer;
-    overflow: hidden;
+    height: 28px;
 }
 
 #template-file-field {
-    height: 28px;
-    display: inline;
-    position: absolute;
-    top: 0;
-    left: 0;
-    opacity: 0;
-    filter: alpha(opacity = 0);
-    z-index: 3000;
-    cursor: pointer;
+    display: none;
 }
 
 #submit-template-container {
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-operate-controller.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-operate-controller.js
index dc1ad39293..ed01f105b5 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-operate-controller.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/controllers/nf-ng-canvas-operate-controller.js
@@ -241,6 +241,10 @@
                             }
                         });
 
+                        $('#template-file-field-button').on('click', function (e) {
+                            $('#template-file-field').click();
+                        });
+
                         // add a handler for the change file input chain event
                         $('#template-file-field').on('change', function (e) {
                             var filename = $(this).val();