Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[NIFI-1757] remove iframe from shell dialog to prevent reoccurring requests, update fill color and label config dialog content margins to fit into their respective dialogs. This closes #1069

This commit is contained in:
Scott Aslan 2016-09-26 21:51:29 -04:00 committed by Matt Gilman
parent d674cdfc79
commit c4826cac54
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/fill-color-dialog.jsp
View File

@ -17,7 +17,7 @@
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="fill-color-dialog" class="hidden"> <div id="fill-color-dialog" class="hidden">
<div class="dialog-content"> <div class="dialog-content">
<div class="setting"> <div class="setting" style="margin-bottom: 0px;">
<div class="setting-name">Color</div> <div class="setting-name">Color</div>
<div class="setting-field"> <div class="setting-field">
<input type="text" id="fill-color" value="#FFFFFF"/> <input type="text" id="fill-color" value="#FFFFFF"/>

4
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/label-configuration.jsp
View File

@ -17,13 +17,13 @@
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="label-configuration" class="hidden medium-dialog"> <div id="label-configuration" class="hidden medium-dialog">
<div id="label-configuration-contents" class="dialog-content"> <div id="label-configuration-contents" class="dialog-content">
<div class="setting" style="margin-top: 5px;"> <div class="setting">
<div class="setting-name">Label Value</div> <div class="setting-name">Label Value</div>
<div class="setting-field"> <div class="setting-field">
<textarea cols="30" rows="4" id="label-value" class="setting-input"></textarea> <textarea cols="30" rows="4" id="label-value" class="setting-input"></textarea>
</div> </div>
</div> </div>
<div class="setting" style="margin-top: 5px; margin-bottom: 40px;"> <div class="setting">
<div class="setting-name">Font Size</div> <div class="setting-name">Font Size</div>
<div class="setting-field"> <div class="setting-field">
<div id="label-font-size"></div> <div id="label-font-size"></div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
View File

@ -196,7 +196,7 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) {
*/ */
var poll = function () { var poll = function () {
// if the page is no longer open, stop polling // if the page is no longer open, stop polling
var isOpen = $('body').is(':visible'); var isOpen = $('#bulletin-board').is(':visible');
if (!isOpen) { if (!isOpen) {
bulletinBoardCtrl.polling = false; bulletinBoardCtrl.polling = false;
} }

5
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-shell.js
View File

@ -94,11 +94,10 @@ nf.Shell = (function () {
canUndock = true; canUndock = true;
} }
// remove the previous contents of the shell
shell.empty();
// register a new close handler // register a new close handler
$('#shell-dialog').modal('setCloseHandler', function () { $('#shell-dialog').modal('setCloseHandler', function () {
// remove the previous contents of the shell
shell.empty();
deferred.resolve(); deferred.resolve();
}); });