You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2016/07/11 11:25:42 UTC
nifi git commit: [NIFI-2198] Fix Ctrl Service GoTo [NIFI-1879] Update
component state dialog styles to support large description texts [NIFI-2197]
Update some shell styles This closes #619
Repository: nifi
Updated Branches:
refs/heads/master 59ad51af6 -> b836db21a
[NIFI-2198] Fix Ctrl Service GoTo
[NIFI-1879] Update component state dialog styles to support large description texts
[NIFI-2197] Update some shell styles
This closes #619
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/b836db21
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/b836db21
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/b836db21
Branch: refs/heads/master
Commit: b836db21a604871f1f40abddb70ef066083b73a1
Parents: 59ad51a
Author: Scott Aslan <ja...@hortonworks.com>
Authored: Fri Jul 8 12:14:46 2016 -0400
Committer: Matt Gilman <ma...@gmail.com>
Committed: Mon Jul 11 07:15:48 2016 -0400
----------------------------------------------------------------------
.../bulletin-board/bulletin-board-content.jsp | 2 +-
.../WEB-INF/partials/counters/counters-content.jsp | 2 +-
.../partials/templates/templates-content.jsp | 2 +-
.../src/main/webapp/css/bulletin-board.css | 16 +++++++++++-----
.../src/main/webapp/css/component-state.css | 9 +++++++--
.../nifi-web-ui/src/main/webapp/css/templates.css | 6 +-----
.../js/jquery/propertytable/jquery.propertytable.js | 12 +++++++++---
.../js/nf/bulletin-board/nf-bulletin-board.js | 3 ++-
.../js/nf/canvas/nf-process-group-configuration.js | 9 +++++++++
9 files changed, 42 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/b836db21/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
index cdfe102..39fa055 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/bulletin-board/bulletin-board-content.jsp
@@ -18,7 +18,7 @@
<div id="bulletin-board">
<div id="bulletin-board-header-and-filter">
<div id="bulletin-board-header-text">NiFi Templates</div>
- <div id="bulletin-board-filter-controls" class="filter-controls">
+ <div id="bulletin-board-filter-controls">
<div id="bulletin-board-filter-container" class="filter-container">
<input type="text" placeholder="Filter" id="bulletin-board-filter" class="filter"/>
<div id="bulletin-board-filter-type" class="filter-type"></div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/b836db21/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp
index 0472332..22f686f 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/counters/counters-content.jsp
@@ -18,7 +18,7 @@
<div id="counters">
<div id="counters-header-and-filter">
<div id="counters-header-text">NiFi Counters</div>
- <div id="counters-filter-controls" class="filter-controls">
+ <div id="counters-filter-controls">
<div id="counters-filter-stats" class="filter-status">
Displaying <span id="displayed-counters"></span> of <span id="total-counters"></span>
</div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/b836db21/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp
index 00b4e5e..19b1f67 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/templates/templates-content.jsp
@@ -20,7 +20,7 @@
<span id="template-group-id" class="hidden"><c:out value="${param.groupId}"/></span>
<div id="templates-header-and-filter">
<div id="templates-header-text">NiFi Templates</div>
- <div id="templates-filter-controls" class="filter-controls">
+ <div id="templates-filter-controls">
<div id="templates-filter-stats" class="filter-status">
Displaying <span id="displayed-templates"></span> of <span id="total-templates"></span>
</div>
http://git-wip-us.apache.org/repos/asf/nifi/blob/b836db21/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css
index a43de40..afa8af8 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/bulletin-board.css
@@ -19,7 +19,13 @@
*/
#bulletin-board {
- margin: 20px;
+ position: absolute;
+ top: 0px;
+ bottom: 0px;
+ left: 20px;
+ right: 20px;
+ height: 100%;
+ overflow: auto;
}
#bulletin-board-header-text {
@@ -32,10 +38,9 @@
#bulletin-board-refresh-container {
position: absolute;
- right: 0px;
- bottom: 20px;
- margin: 20px;
- left: 0px;
+ right: 20px;
+ bottom: 0px;
+ left: 20px;
}
#bulletin-board-loading-container {
@@ -79,6 +84,7 @@
#bulletin-board-container {
overflow-y: auto;
width: 100%;
+ padding-top: 20px;
}
div.bulletin-action {
http://git-wip-us.apache.org/repos/asf/nifi/blob/b836db21/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/component-state.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/component-state.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/component-state.css
index ee4407d..99b427e 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/component-state.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/component-state.css
@@ -43,20 +43,25 @@
#component-state-table {
overflow: hidden;
position: absolute;
- top: 142px;
+ top: 202px;
left: 0px;
right: 0px;
bottom: 0px;
min-height: 150px;
}
+#component-state-description{
+ height: 75px;
+ overflow: auto;
+}
+
/*
Clear
*/
#clear-link-container {
position: absolute;
- top: 120px;
+ top: 180px;
right: 20px;
}
http://git-wip-us.apache.org/repos/asf/nifi/blob/b836db21/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css
index a7a980b..2893d8a 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/css/templates.css
@@ -66,10 +66,6 @@
/* filter controls */
-#templates-filter-controls {
- float: right;
-}
-
#templates-filter-container {
height: 32px;
width: 318px;
@@ -94,7 +90,7 @@ input.templates-filter-list {
#templates-table {
position: absolute;
- top: 108px;
+ top: 98px;
left: 0px;
bottom: 47px;
right: 0px;
http://git-wip-us.apache.org/repos/asf/nifi/blob/b836db21/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
index 122e998..5b48a65 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/jquery/propertytable/jquery.propertytable.js
@@ -1219,9 +1219,15 @@
var controllerService = controllerServiceEntity.component;
$.Deferred(function (deferred) {
if (nf.Common.isDefinedAndNotNull(controllerService.parentGroupId)) {
- nf.ProcessGroupConfiguration.showConfiguration(controllerService.parentGroupId).done(function () {
- deferred.resolve();
- });
+ if ($('#process-group-configuration').is(':visible')) {
+ nf.ProcessGroupConfiguration.loadConfiguration(controllerService.parentGroupId).done(function () {
+ deferred.resolve();
+ });
+ } else {
+ nf.ProcessGroupConfiguration.showConfiguration(controllerService.parentGroupId).done(function () {
+ deferred.resolve();
+ });
+ }
} else {
if ($('#settings').is(':visible')) {
// reload the settings
http://git-wip-us.apache.org/repos/asf/nifi/blob/b836db21/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
index be8f2d6..52c7a03 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/bulletin-board/nf-bulletin-board.js
@@ -286,7 +286,8 @@ nf.ng.BulletinBoardCtrl = function (serviceProvider) {
"position": "absolute",
"width": "100%",
"bottom": "40px",
- "margin": "40px"
+ "left": "40px",
+ "right": "40px"
});
$('#bulletin-board-status-container').css({
http://git-wip-us.apache.org/repos/asf/nifi/blob/b836db21/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
index 790c9f5..26d253d 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-process-group-configuration.js
@@ -266,6 +266,15 @@ nf.ProcessGroupConfiguration = (function () {
},
/**
+ * Loads the configuration for the specified process group.
+ *
+ * @param groupId
+ */
+ loadConfiguration: function (groupId) {
+ return loadConfiguration(groupId);
+ },
+
+ /**
* Selects the specified controller service.
*
* @param {string} controllerServiceId