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

[NIFI-2599] Enhance Status History Dialog. This closes #894

This commit is contained in:
Scott Aslan 2016-08-23 10:40:23 -04:00 committed by Matt Gilman
parent 23350543ff
commit 3f60eac544
6 changed files with 670 additions and 700 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/status-history-dialog.jsp
View File

@ -16,16 +16,16 @@
--%> --%>
<%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %> <%@ page contentType="text/html" pageEncoding="UTF-8" session="false" %>
<div id="status-history-dialog" class="hidden large-dialog"> <div id="status-history-dialog" class="hidden large-dialog">
<div id="status-history-refresh-container">
<button id="status-history-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="status-history-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="status-history-last-refreshed"></span>
</div>
<div id="status-history-loading-container" class="loading-container"></div>
</div>
<div class="dialog-content"> <div class="dialog-content">
<div id="status-history-details"></div> <div id="status-history-details"></div>
<div id="status-history-refresh-container"> <div id="status-history-metric-combo"></div>
<button id="status-history-refresh-button" class="refresh-button pointer fa fa-refresh" title="Refresh"></button>
<div id="status-history-last-refreshed-container" class="last-refreshed-container">
Last updated:&nbsp;<span id="status-history-last-refreshed"></span>
</div>
<div id="status-history-loading-container" class="loading-container"></div>
<div id="status-history-metric-combo"></div>
</div>
<div id="status-history-container"> <div id="status-history-container">
<div id="status-history-chart-container"></div> <div id="status-history-chart-container"></div>
<div id="status-history-chart-control-container"></div> <div id="status-history-chart-control-container"></div>

2
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/header.css
View File

@ -190,7 +190,7 @@ md-toolbar.md-small .md-toolbar-tools {
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;
font-size: 12px; font-size: 12px;
max-width: 250px; max-width: 130px;
text-overflow: ellipsis; text-overflow: ellipsis;
line-height: normal; line-height: normal;
overflow: hidden; overflow: hidden;

14
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/status-history.css
View File

@ -27,9 +27,9 @@
#status-history-refresh-container { #status-history-refresh-container {
position: absolute; position: absolute;
top: 0px; left: 20px;
left: 40%; bottom: 20px;
right: 0px; z-index: 1;
} }
#status-history-loading-container { #status-history-loading-container {
@ -57,6 +57,7 @@
#status-history-metric-combo { #status-history-metric-combo {
float: right; float: right;
width: 250px;
} }
#status-history-container { #status-history-container {
@ -68,7 +69,6 @@
} }
#status-history-chart-container { #status-history-chart-container {
height: 265px;
background-color: #fff; background-color: #fff;
overflow: hidden; overflow: hidden;
cursor: default; cursor: default;
@ -86,6 +86,11 @@
left: 0px; left: 0px;
right: 60%; right: 60%;
bottom: 0px; bottom: 0px;
overflow-y: auto;
}
#status-history-dialog > .dialog-content {
overflow: visible;
} }
div.status-history-detail { div.status-history-detail {
@ -132,7 +137,6 @@ div.legend-entry {
div.legend-label { div.legend-label {
font-weight: bold; font-weight: bold;
width: 240px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
line-height: normal; line-height: normal;

14
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/modal/jquery.modal.js
View File

@ -463,13 +463,13 @@
nfDialog.glasspane = glasspane = 'transparent'; nfDialog.glasspane = glasspane = 'transparent';
} }
//create glass pane overlay if (!$('body').find("[data-nf-dialog-parent='" + dialog.attr('id') + "']").is(':visible')) {
var modalGlassMarkup = '<div data-nf-dialog-parent="' + //create glass pane overlay
dialog.attr('id') + '" class="modal-glass" style="background-color: ' + glasspane + ';"></div>'; $('<div></div>').attr('data-nf-dialog-parent', dialog.attr('id')).addClass("modal-glass").css({
"background-color": glasspane,
var modalGlass = $(modalGlassMarkup); "z-index": zIndex - 1
}).appendTo($('body'));
modalGlass.css('z-index', zIndex - 1).appendTo($('body')); }
//persist data attribute //persist data attribute
dialog.data('nfDialog', nfDialog); dialog.data('nfDialog', nfDialog);

1323
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/nf-status-history.js
View File

File diff suppressed because it is too large Load Diff

1
nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/summary/nf-summary-table.js
View File

@ -276,6 +276,7 @@ nf.SummaryTable = (function () {
break; break;
case 'disabled': case 'disabled':
classes += ' icon icon-enable-false'; classes += ' icon icon-enable-false';
break;
case 'invalid': case 'invalid':
classes += ' fa fa-warning'; classes += ' fa fa-warning';
break; break;