Repository: nifi Updated Branches: refs/heads/master 932b5bb91 -> 4274481f1
[NIFI-3450] update upload template dialog browse button. This closes #1495 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/4274481f Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/4274481f Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/4274481f Branch: refs/heads/master Commit: 4274481f1d63f9e8ea109e02e2169e8b1f6000ae Parents: 932b5bb Author: Scott Aslan <[email protected]> Authored: Thu Feb 9 11:29:49 2017 -0500 Committer: Matt Gilman <[email protected]> Committed: Mon Feb 13 09:32:02 2017 -0500 ---------------------------------------------------------------------- .../WEB-INF/partials/canvas/upload-template-dialog.jsp | 4 ++-- .../nifi-web/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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/4274481f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/upload-template-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/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 d5c4a79..f6cbbdb 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> http://git-wip-us.apache.org/repos/asf/nifi/blob/4274481f/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/main.css ---------------------------------------------------------------------- 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 14af7ff..1554356 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 { http://git-wip-us.apache.org/repos/asf/nifi/blob/4274481f/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 ---------------------------------------------------------------------- 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 dc1ad39..ed01f10 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();
